From 93120eec9d23da0bad671acc3f5b7a0133733e02 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Thu, 8 Oct 2026 19:14:39 +0300 Subject: [PATCH 001/108] feat(dashpay): sign in to an app with one DashConnect QR from protocol 14 From protocol version 14 the wallet answers a `dash-key:` request by itself: it derives the request's session key (DIP-13 application session authentication, leaf `hash256` of the app's ephemeral key), registers it on the identity as an AUTHENTICATION / HIGH / ECDSA_HASH160 key bound to the requested contract with a budget and an expiry, and only then publishes the encrypted key to the App Connect system contract. The app no longer sends a `dash-st:` key registration. Earlier responses for the same app are deleted by their values first; the published values are recorded for that. Below protocol 14 the two-QR flow runs unchanged. Testnet's SDK is pinned to protocol 13, so testnet stays on it until that pin moves. Also ports the `dash-st:` parser to the SDK's `ParsedStateTransition` summary (dashpay/platform#4844): a key registration maps as before, and a batch is accepted only as a lone, complete token direct purchase. Needs dashpay/platform#4844 and the delete-by-values entry point. The budget and lifetime are placeholders. Mainnet is still gated off, the approval sheet and disconnect are unchanged. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 242 +++++++++++++++ .../PlatformDashConnectDataSource.swift | 236 ++++++++++++++- .../PlatformDashConnectDataSourceTests.swift | 280 +++++++++++++++++- 3 files changed, 739 insertions(+), 19 deletions(-) create mode 100644 DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift new file mode 100644 index 0000000000..097e916401 --- /dev/null +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -0,0 +1,242 @@ +import CryptoKit +import Foundation +import os +import SwiftDashSDK + +/// The one-QR login (DashConnect v2): the wallet derives a session key for +/// the request, registers it on the identity, and only then publishes the +/// encrypted key to the App Connect system contract. There is no `dash-st:` +/// step. +/// +/// Everything here is pure; `PlatformDashConnectDataSource` owns the Platform +/// calls and their order. +enum AppConnect { + /// The protocol version that registers the App Connect system contract. + /// Below it the contract does not exist and the two-QR login is the only + /// one that can work. + static let minimumProtocolVersion: UInt32 = 14 + + /// Same id on every network (`docs/protocol/app-connect.md` in + /// dashpay/platform). + static let contractId = "H8F9mP1BM55TE1ShsxPZHzhyinaMdY9bMmP85mkDhcJJ" + static let documentType = "loginKeyResponse" + + /// Limits put on every session key. + /// TODO(app-connect-limits): the protocol leaves both values to the + /// wallet and nothing has fixed them yet; they are not user-selectable. + static let sessionKeyBudgetCredits: UInt64 = 5_000_000_000 // 0.05 DASH + static let sessionKeyLifetime: TimeInterval = 90 * 24 * 60 * 60 + + static func isAvailable(protocolVersion: UInt32) -> Bool { + protocolVersion >= minimumProtocolVersion + } + + /// The DIP-13 leaf of the session key: `hash256` of the app's ephemeral + /// public key. Not the lookup key of the response, which is `hash160` of + /// the same bytes. + static func requestId(appEphemeralPubKey: Data) -> Data { + Data(SHA256.hash(data: Data(SHA256.hash(data: appEphemeralPubKey)))) + } + + static func expiresAt(from now: Date) -> UInt64 { + UInt64((now.addingTimeInterval(sessionKeyLifetime).timeIntervalSince1970 * 1000).rounded()) + } + + /// What the identity already holds for a derived session key. + enum SessionKeyState: Equatable { + /// Not on the identity: register it. + case absent + /// Registered and able to sign: publish without an identity update. + case usable(keyId: UInt32) + /// Registered but disabled or expired. Platform never re-adds a key, + /// so this request cannot be answered; the app has to ask again. + case unusable + } + + static func sessionKeyState( + publicKeyHash160: Data, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + now: Date + ) -> SessionKeyState { + guard let key = currentIdentityPublicKeys.first(where: { + $0.keyType == .ecdsaHash160 && $0.data == publicKeyHash160 + }) else { + return .absent + } + let nowMilliseconds = Int64((now.timeIntervalSince1970 * 1000).rounded()) + guard key.purpose == .authentication, + key.securityLevel == .high, + key.disabledAt == nil, + key.expiresAt.map({ $0 > nowMilliseconds }) ?? true else { + return .unusable + } + return .usable(keyId: UInt32(bitPattern: key.keyId)) + } + + static func nextKeyId( + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> UInt32 { + (currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }.max() ?? 0) + 1 + } + + /// The key an app is given: it can only sign for the contract the request + /// named, spend up to `totalBudget`, and stops working at `expiresAt`. + static func sessionIdentityPubkey( + keyId: UInt32, + publicKeyHash160: Data, + appContractId: Data, + totalBudget: UInt64, + expiresAt: UInt64 + ) -> ManagedPlatformWallet.IdentityPubkey { + ManagedPlatformWallet.IdentityPubkey( + keyId: keyId, + keyType: .ecdsaHash160, + purpose: .authentication, + securityLevel: .high, + pubkeyBytes: publicKeyHash160, + contractBounds: .singleContract(id: appContractId), + totalBudget: totalBudget, + expiresAt: expiresAt + ) + } + + /// The three values of a `loginKeyResponse`, as hex. + struct ResponseValues: Codable, Equatable { + let appEphemeralPubKeyHash: String + let walletEphemeralPubKey: String + let encryptedPayload: String + + /// The document's properties in the form `createDocument` and + /// delete-by-values take. + func propertiesJSON() throws -> String { + let data = try JSONSerialization.data( + withJSONObject: [ + "appEphemeralPubKeyHash": appEphemeralPubKeyHash, + "walletEphemeralPubKey": walletEphemeralPubKey, + "encryptedPayload": encryptedPayload, + ], + options: [.sortedKeys]) + return String(decoding: data, as: UTF8.self) + } + } + + /// Encrypts the session private key to the app. `walletEphemeralPrivateKey` + /// is wiped before returning. + static func responseValues( + sessionPrivateKey: Data, + appEphemeralPubKey: Data, + walletEphemeralPrivateKey: inout Data, + encrypt: (Data, Data, Data) throws -> Data = { key, walletPriv, appPub in + try KeyExchangeCrypto.encryptLoginKey( + key, + walletEphemeralPriv: walletPriv, + appEphemeralPub: appPub + ) + } + ) throws -> ResponseValues { + defer { PlatformDashConnectDataSource.zero(&walletEphemeralPrivateKey) } + + let appEphemeralPubKeyHash = try KeyExchangeCrypto.hash160(appEphemeralPubKey) + guard appEphemeralPubKeyHash.count == 20 else { + throw DashConnectPlatformError.invalidHash160 + } + let walletEphemeralPublicKey = try Secp256k1.compressedPublicKey(privateKey: walletEphemeralPrivateKey) + let encryptedPayload = try encrypt(sessionPrivateKey, walletEphemeralPrivateKey, appEphemeralPubKey) + + return ResponseValues( + appEphemeralPubKeyHash: appEphemeralPubKeyHash.toHexString(), + walletEphemeralPubKey: walletEphemeralPublicKey.toHexString(), + encryptedPayload: encryptedPayload.toHexString() + ) + } +} + +/// A response this wallet published and has not deleted yet, with the key it +/// granted. The type is index-only on Platform: there is no lookup by app and +/// a delete has to carry the original values, so this record is the only way +/// back to the entry. +struct AppConnectPublishedResponse: Codable, Equatable { + /// Base58 ids. + let identityId: String + let appContractId: String + let documentId: String + let values: AppConnect.ResponseValues + let sessionKeyId: UInt32 + /// `nil` when the key was found already registered and its limits were + /// not read back. + let totalBudget: UInt64? + let expiresAt: UInt64? + let publishedAt: Date +} + +protocol AppConnectResponseStore { + func load() -> [AppConnectPublishedResponse] + func save(_ responses: [AppConnectPublishedResponse]) +} + +/// Wallet- and network-scoped, like `UserDefaultsDashConnectStore`, whose +/// scope it borrows. Nothing stored is secret: the values are public on +/// chain and the key ids are visible on the identity. +final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { + private let defaults: UserDefaults + private let scopeKeyProvider: () -> String? + private let encoder: JSONEncoder + private let decoder: JSONDecoder + + private static let logger = Logger( + subsystem: "org.dashfoundation.dash", + category: "dashconnect.app-connect-store") + + init( + defaults: UserDefaults = .standard, + network: DashConnectNetwork, + scopeKeyProvider: (() -> String?)? = nil + ) { + self.defaults = defaults + if let scopeKeyProvider { + self.scopeKeyProvider = scopeKeyProvider + } else { + let connections = UserDefaultsDashConnectStore(defaults: defaults, network: network) + self.scopeKeyProvider = { connections.storageKey } + } + + let encoder = JSONEncoder() + encoder.dateEncodingStrategy = .millisecondsSince1970 + self.encoder = encoder + + let decoder = JSONDecoder() + decoder.dateDecodingStrategy = .millisecondsSince1970 + self.decoder = decoder + } + + private var storageKey: String? { + scopeKeyProvider().map { "\($0).app-connect-responses.v1" } + } + + func load() -> [AppConnectPublishedResponse] { + guard let storageKey, let data = defaults.data(forKey: storageKey) else { return [] } + do { + return try decoder.decode([AppConnectPublishedResponse].self, from: data) + } catch { + // Losing the records is survivable: the next login still creates a + // fresh response, and the old entries stay until deleted by value. + Self.logger.warning( + "AppConnectResponseStore: stored responses could not be decoded: \(error.localizedDescription, privacy: .public)") + return [] + } + } + + func save(_ responses: [AppConnectPublishedResponse]) { + guard let storageKey else { return } + guard !responses.isEmpty else { + defaults.removeObject(forKey: storageKey) + return + } + do { + defaults.set(try encoder.encode(responses), forKey: storageKey) + } catch { + Self.logger.error( + "AppConnectResponseStore: failed to encode responses: \(error.localizedDescription, privacy: .public)") + } + } +} diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 54b48d4883..8f3c70d3e2 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -70,6 +70,8 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case keyRegistrationMismatchedDerivedKey(KeyPurpose) case tokenPurchaseWrongIdentity case tokenPurchaseTokenIdMismatch + case unsupportedStateTransition(String) + case sessionKeyUnusable case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -117,6 +119,12 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return "The scanned token purchase targets a different identity." case .tokenPurchaseTokenIdMismatch: return "The scanned token purchase names a token that does not belong to the contract and position it would buy from." + case .sessionKeyUnusable: + return NSLocalizedString( + "This sign-in request can no longer be approved. Ask the app for a new code.", + comment: "DashConnect") + case .unsupportedStateTransition(let kindName): + return "This wallet cannot approve the scanned request (\(kindName))." case .devnetLoginContractNotConfigured: return NSLocalizedString( "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings.", @@ -230,7 +238,8 @@ struct PlatformWalletDashConnectStateTransitionParser: DashConnectStateTransitio } func parse(_ transitionBytes: Data) throws -> DashConnectParsedStateTransition { - switch try parseTransition(transitionBytes) { + let transition = try parseTransition(transitionBytes) + switch transition.kind { case .identityUpdate(let parsed): return .keyRegistration( DashConnectKeyRegistrationTransition( @@ -270,19 +279,40 @@ struct PlatformWalletDashConnectStateTransitionParser: DashConnectStateTransitio disablePublicKeyIds: parsed.disablePublicKeyIds ) ) - case .tokenPurchase(let parsed): + case .batch(let batch): + // The SDK now describes every batch, where it used to refuse all + // but a lone token direct purchase. The approval sheet and the + // rebuild in `approveTokenPurchase` still cover exactly that one + // case, so everything else is refused here: more than one row + // would be signed without being shown, and an incomplete summary + // (a note, group-action info) carries fields the rebuild drops. + guard transition.complete, + batch.transitions.count == 1, + case .token(let row) = batch.transitions[0], + row.action == Self.tokenDirectPurchaseAction, + row.complete, + let tokenCount = row.tokenCount, + let totalAgreedPrice = row.amount else { + throw DashConnectPlatformError.unsupportedStateTransition(transition.kindName) + } return .tokenPurchase( DashConnectTokenPurchaseTransition( - ownerId: parsed.ownerId, - dataContractId: parsed.dataContractId, - tokenId: parsed.tokenId, - tokenContractPosition: parsed.tokenContractPosition, - tokenCount: parsed.tokenCount, - totalAgreedPrice: parsed.totalAgreedPrice + ownerId: batch.ownerId, + dataContractId: row.dataContractId, + tokenId: row.tokenId, + tokenContractPosition: row.tokenContractPosition, + tokenCount: tokenCount, + totalAgreedPrice: totalAgreedPrice ) ) + case .creditTransfer, .dataContractCreate, .dataContractUpdate, .other: + throw DashConnectPlatformError.unsupportedStateTransition(transition.kindName) } } + + /// rs-dpp's action name for a token direct purchase, as the SDK reports + /// it on a batch row. + private static let tokenDirectPurchaseAction = "DirectPurchase" } final class PlatformDashConnectDataSource: DashConnectDataSource { @@ -321,6 +351,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private let supportedNetwork: DashConnectNetwork private let store: any DashConnectStore + private let responseStore: any AppConnectResponseStore private let subject: CurrentValueSubject<[DAppConnection], Never> private let authorizer: DWIdentityAuthorizer private let stateTransitionParser: any DashConnectStateTransitionParsing @@ -341,6 +372,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { init( supportedNetwork: DashConnectNetwork = PlatformDashConnectDataSource.currentEnvironmentNetwork(), store: (any DashConnectStore)? = nil, + responseStore: (any AppConnectResponseStore)? = nil, authorizer: DWIdentityAuthorizer = DWIdentityAuthorizer(), stateTransitionParser: any DashConnectStateTransitionParsing = PlatformWalletDashConnectStateTransitionParser(), now: @escaping () -> Date = Date.init @@ -350,6 +382,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { "DashConnect Platform publish runs on testnet and devnet only.") self.supportedNetwork = supportedNetwork self.store = store ?? UserDefaultsDashConnectStore(network: supportedNetwork) + self.responseStore = responseStore ?? UserDefaultsAppConnectResponseStore(network: supportedNetwork) self.authorizer = authorizer self.stateTransitionParser = stateTransitionParser self.now = now @@ -417,12 +450,30 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.error("🔗 DASHCONNECT :: no context — \(error.localizedDescription, privacy: .public)") throw error } + // Which login this network can answer is decided before the PIN + // prompt: from protocol version 14 the response goes to the App + // Connect system contract and the wallet registers the key itself; + // below it that contract does not exist and the two-QR flow runs. + // A pinned SDK reports its pin (testnet is pinned to 13 in + // `SwiftDashSDKHost.platformVersion(for:)`), so testnet stays on the + // two-QR flow until that pin moves. + let protocolVersion: UInt32 + do { + protocolVersion = try context.sdk.refreshProtocolVersion() + } catch { + Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") + throw error + } do { try await authorize() } catch { Self.logger.error("🔗 DASHCONNECT :: authorization failed — \(error.localizedDescription, privacy: .public)") throw error } + if AppConnect.isAvailable(protocolVersion: protocolVersion) { + Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") + return try await approveAppConnectLogin(request, context: context) + } Self.logger.info("🔗 DASHCONNECT :: authorized; deriving login key") // `deriveIdentityAuthKeyAtSlot` is main-actor isolated in the SDK. @@ -516,6 +567,175 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return connection } + /// The one-QR login: derive the request's session key, register it on the + /// identity with its bounds and limits, and only then publish the + /// encrypted key, so the app finds a live key on its first check. + /// + /// Safe to repeat for the same QR: the key is derived from the request, + /// so a second approval finds it registered and goes straight to + /// publishing. A registration that succeeded before a failed publish is + /// therefore finished by scanning the same QR again. + private func approveAppConnectLogin( + _ request: DashKeyRequest, + context: Context + ) async throws -> DAppConnection { + guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { + throw DashConnectPlatformError.loginContractUnavailable + } + + let requestId = AppConnect.requestId(appEphemeralPubKey: request.appEphemeralPubKey) + // `deriveConnectKey` is main-actor isolated in the SDK. + let sessionKey = try await MainActor.run { + try context.wallet.deriveConnectKey( + subFeature: .sessionAuthentication, + identityId: context.identityId, + leaf: requestId, + network: context.network + ) + } + var sessionPrivateKey = sessionKey.privateKeyData + defer { Self.zero(&sessionPrivateKey) } + let sessionKeyHash160 = try KeyExchangeCrypto.hash160(sessionKey.publicKeyData) + + let signer = KeychainSigner(modelContainer: context.modelContainer) + let currentPublicKeys = try context.wallet + .managedIdentity(identityId: context.identityId) + .getPublicKeys() + + let sessionKeyId: UInt32 + let totalBudget: UInt64? + let expiresAt: UInt64? + switch AppConnect.sessionKeyState( + publicKeyHash160: sessionKeyHash160, + currentIdentityPublicKeys: currentPublicKeys, + now: now() + ) { + case .unusable: + throw DashConnectPlatformError.sessionKeyUnusable + case .usable(let keyId): + Self.logger.info("🔗 DASHCONNECT :: session key already registered") + sessionKeyId = keyId + totalBudget = nil + expiresAt = nil + case .absent: + let keyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) + let budget = AppConnect.sessionKeyBudgetCredits + let expiry = AppConnect.expiresAt(from: now()) + let key = AppConnect.sessionIdentityPubkey( + keyId: keyId, + publicKeyHash160: sessionKeyHash160, + appContractId: request.contractId, + totalBudget: budget, + expiresAt: expiry + ) + Self.logger.info("🔗 DASHCONNECT :: registering session key") + try await signer.withAdditionalSigningKeys([ + (publicKey: sessionKeyHash160, privateKey: sessionPrivateKey), + ]) { + try await context.wallet.updateIdentity( + identityId: context.identityId, + addPublicKeys: [key], + signer: signer + ) + } + Self.logger.info("🔗 DASHCONNECT :: session key registered") + sessionKeyId = keyId + totalBudget = budget + expiresAt = expiry + } + + var walletEphemeralPrivateKey = try Self.generateEphemeralPrivateKey() + let values = try AppConnect.responseValues( + sessionPrivateKey: sessionPrivateKey, + appEphemeralPubKey: request.appEphemeralPubKey, + walletEphemeralPrivateKey: &walletEphemeralPrivateKey + ) + + let identityId = context.identityId.toBase58String() + let appContractId = request.contractId.toBase58String() + await deletePublishedAppConnectResponses( + identityId: identityId, + appContractId: appContractId, + responseContractId: responseContractId, + context: context, + signer: signer + ) + + Self.logger.info("🔗 DASHCONNECT :: publishing loginKeyResponse") + let (documentId, _) = try await context.wallet.createDocument( + ownerIdentityId: context.identityId, + contractId: responseContractId, + documentType: AppConnect.documentType, + propertiesJSON: try values.propertiesJSON(), + signer: signer + ) + Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse published") + + responseStore.save(responseStore.load() + [ + AppConnectPublishedResponse( + identityId: identityId, + appContractId: appContractId, + documentId: documentId.toBase58String(), + values: values, + sessionKeyId: sessionKeyId, + totalBudget: totalBudget, + expiresAt: expiresAt, + publishedAt: now() + ), + ]) + + let preview = await makeConnectionRequest(from: request) + let connection = Self.makeConnection(preview: preview, status: .active, updatedAt: now()) + var current = subject.value.filter { $0.id != connection.id } + current.append(connection) + persistAndSend(current) + return connection + } + + /// Deletes the responses this identity published earlier for an app, by + /// their original values. Best effort: a response that cannot be deleted + /// now stays recorded and is tried again at the next login, and it does + /// not hold the new login back — the entry it leaves is the encrypted key + /// of a request the app has already finished with. + private func deletePublishedAppConnectResponses( + identityId: String, + appContractId: String, + responseContractId: Data, + context: Context, + signer: KeychainSigner + ) async { + let recorded = responseStore.load() + let previous = recorded.filter { $0.identityId == identityId && $0.appContractId == appContractId } + guard !previous.isEmpty else { return } + + var deleted: [AppConnectPublishedResponse] = [] + for response in previous { + do { + guard let documentId = Self.decodeIdentifier(response.documentId) else { + throw DashConnectPlatformError.existingDocumentLookupFailed + } + let signingKeyId = try selectDocumentSigningKeyId( + wallet: context.wallet, + identityId: context.identityId + ) + _ = try await context.wallet.deleteDocument( + ownerIdentityId: context.identityId, + contractId: responseContractId, + documentType: AppConnect.documentType, + documentId: documentId, + propertiesJSON: try response.values.propertiesJSON(), + signingKeyId: signingKeyId, + signer: signer + ) + deleted.append(response) + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: previous loginKeyResponse not deleted — \(error.localizedDescription, privacy: .public)") + } + } + responseStore.save(recorded.filter { !deleted.contains($0) }) + } + func handleStateTransition(_ request: DashStRequest) async throws -> DashConnectStAction { try validateNetwork(request.network) let context = try await requireContext() diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index c0a724bcca..f9f343f773 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -199,7 +199,7 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { XCTAssertEqual(tagless.disablePublicKeyIds, tagged.disablePublicKeyIds) let appParser = PlatformWalletDashConnectStateTransitionParser { bytes in - .identityUpdate(try wallet.parseIdentityUpdateTransition(bytes)) + Self.parsed(.identityUpdate(try wallet.parseIdentityUpdateTransition(bytes))) } guard case let .keyRegistration(appTransition) = try appParser.parse(taglessBytes) else { return XCTFail("Expected a key-registration transition") @@ -214,14 +214,9 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { let contractId = Data(repeating: 0x22, count: 32) let tokenId = Data(repeating: 0x23, count: 32) let parser = PlatformWalletDashConnectStateTransitionParser { _ in - .tokenPurchase(ManagedPlatformWallet.ParsedTokenPurchaseTransition( - ownerId: ownerId, - dataContractId: contractId, - tokenId: tokenId, - tokenContractPosition: 3, - tokenCount: 100, - totalAgreedPrice: 100_000_000 - )) + Self.parsed(.batch(.init(ownerId: ownerId, transitions: [ + Self.tokenRow(contractId: contractId, tokenId: tokenId) + ]))) } guard case let .tokenPurchase(purchase) = try parser.parse(Data([0x00])) else { @@ -237,19 +232,79 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { func testParserRejectsContractGroupKeysInsteadOfDroppingTheirRestriction() throws { let parser = PlatformWalletDashConnectStateTransitionParser { _ in - .identityUpdate(.init( + Self.parsed(.identityUpdate(.init( identityId: Data(repeating: 0x21, count: 32), addPublicKeys: [.init( keyId: 1, keyType: .ecdsaSecp256k1, purpose: .authentication, securityLevel: .high, pubkeyBytes: Data(repeating: 0x22, count: 33), contractBounds: .contractGroup(id: Data(repeating: 0x23, count: 32)))], - disablePublicKeyIds: [])) + disablePublicKeyIds: []))) } XCTAssertThrowsError(try parser.parse(Data([0]))) { XCTAssertEqual($0 as? DashConnectPlatformError, .keyRegistrationUnexpectedMutation) } } + func testParserRefusesABatchThatIsNotALoneCompleteTokenPurchase() { + let ownerId = Data(repeating: 0x21, count: 32) + let contractId = Data(repeating: 0x22, count: 32) + let tokenId = Data(repeating: 0x23, count: 32) + let purchase = Self.tokenRow(contractId: contractId, tokenId: tokenId) + let refused: [(String, ManagedPlatformWallet.ParsedStateTransition)] = [ + ("two rows", Self.parsed(.batch(.init(ownerId: ownerId, transitions: [purchase, purchase])))), + ("no rows", Self.parsed(.batch(.init(ownerId: ownerId, transitions: [])))), + ("another token action", Self.parsed(.batch(.init(ownerId: ownerId, transitions: [ + Self.tokenRow(contractId: contractId, tokenId: tokenId, action: "Transfer") + ])))), + ("an incomplete row", Self.parsed(.batch(.init(ownerId: ownerId, transitions: [ + Self.tokenRow(contractId: contractId, tokenId: tokenId, complete: false) + ])))), + ("an incomplete transition", Self.parsed( + .batch(.init(ownerId: ownerId, transitions: [purchase])), complete: false)), + ("a missing price", Self.parsed(.batch(.init(ownerId: ownerId, transitions: [ + Self.tokenRow(contractId: contractId, tokenId: tokenId, amount: nil) + ])))), + ("a document row", Self.parsed(.batch(.init(ownerId: ownerId, transitions: [ + .document(.init( + dataContractId: contractId, documentType: "note", + documentId: Data(repeating: 0x24, count: 32), action: "Delete", + amount: nil, recipientId: nil, complete: true, details: nil)) + ])))), + ("another kind", Self.parsed(.other)), + ] + for (name, transition) in refused { + let parser = PlatformWalletDashConnectStateTransitionParser { _ in transition } + XCTAssertThrowsError(try parser.parse(Data([0])), name) { + XCTAssertEqual( + $0 as? DashConnectPlatformError, + .unsupportedStateTransition("TestKind"), + name) + } + } + } + + private static func parsed( + _ kind: ManagedPlatformWallet.ParsedStateTransitionKind, + complete: Bool = true + ) -> ManagedPlatformWallet.ParsedStateTransition { + .init( + kindName: "TestKind", ownerId: nil, isSigned: false, userFeeIncrease: 0, + complete: complete, serialized: Data(), details: nil, kind: kind) + } + + private static func tokenRow( + contractId: Data, + tokenId: Data, + action: String = "DirectPurchase", + amount: UInt64? = 100_000_000, + complete: Bool = true + ) -> ManagedPlatformWallet.ParsedBatchedTransition { + .token(.init( + dataContractId: contractId, tokenId: tokenId, tokenContractPosition: 3, + action: action, amount: amount, recipientId: nil, tokenCount: 100, + complete: complete, details: complete ? nil : "note")) + } + func testTokenPurchasePriceConvertsCreditsToDash() { // 1e11 credits = 1 DASH; 1e3 credits = 1 duff. XCTAssertEqual(Self.purchaseRequest(credits: 0).totalPriceDash, 0) @@ -1338,3 +1393,206 @@ private enum PurchaseSpyError: LocalizedError { } } } + +final class AppConnectLoginTests: XCTestCase { + private var defaults: UserDefaults! + private var suiteName: String! + + override func setUp() { + super.setUp() + suiteName = "AppConnectLoginTests.\(UUID().uuidString)" + defaults = UserDefaults(suiteName: suiteName) + } + + override func tearDown() { + defaults.removePersistentDomain(forName: suiteName) + defaults = nil + suiteName = nil + super.tearDown() + } + + func testOneQrLoginStartsAtProtocolVersion14() { + XCTAssertFalse(AppConnect.isAvailable(protocolVersion: 13)) + XCTAssertTrue(AppConnect.isAvailable(protocolVersion: 14)) + XCTAssertTrue(AppConnect.isAvailable(protocolVersion: 15)) + } + + func testRequestIdIsHash256OfTheAppEphemeralKey() { + // hash256 of the empty string, a published vector. + XCTAssertEqual( + AppConnect.requestId(appEphemeralPubKey: Data()).toHexString(), + "5df6e0e2761359d30a8275058e299fcc0381534545f55cf43e41983f5d4c9456") + XCTAssertEqual(AppConnect.requestId(appEphemeralPubKey: Data(repeating: 0x02, count: 33)).count, 32) + } + + func testSessionKeyIsAbsentUntilItsHashIsOnTheIdentity() { + let hash = Data(repeating: 0x11, count: 20) + let other = Self.key(keyId: 4, data: Data(repeating: 0x22, count: 20)) + XCTAssertEqual( + AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [other], now: Self.now), + .absent) + // The same bytes under another key type are a different key. + let sameBytesOtherType = Self.key(keyId: 5, keyType: .ecdsaSecp256k1, data: hash) + XCTAssertEqual( + AppConnect.sessionKeyState( + publicKeyHash160: hash, currentIdentityPublicKeys: [sameBytesOtherType], now: Self.now), + .absent) + } + + func testRegisteredSessionKeyIsUsableWithItsKeyId() { + let hash = Data(repeating: 0x11, count: 20) + let live = Self.key(keyId: 9, data: hash, expiresAt: Self.nowMilliseconds + 1) + XCTAssertEqual( + AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [live], now: Self.now), + .usable(keyId: 9)) + let unlimited = Self.key(keyId: 9, data: hash) + XCTAssertEqual( + AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [unlimited], now: Self.now), + .usable(keyId: 9)) + } + + func testDisabledExpiredOrMisregisteredSessionKeyIsUnusable() { + let hash = Data(repeating: 0x11, count: 20) + let unusable: [(String, ManagedIdentity.IdentityPublicKeyInfo)] = [ + ("disabled", Self.key(keyId: 9, data: hash, disabledAt: 1)), + ("expired", Self.key(keyId: 9, data: hash, expiresAt: Self.nowMilliseconds)), + ("wrong level", Self.key(keyId: 9, securityLevel: .critical, data: hash)), + ("wrong purpose", Self.key(keyId: 9, purpose: .transfer, data: hash)), + ] + for (name, key) in unusable { + XCTAssertEqual( + AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [key], now: Self.now), + .unusable, + name) + } + } + + func testNextKeyIdFollowsTheHighestKeyOnTheIdentity() { + XCTAssertEqual(AppConnect.nextKeyId(currentIdentityPublicKeys: []), 1) + XCTAssertEqual( + AppConnect.nextKeyId(currentIdentityPublicKeys: [ + Self.key(keyId: 0, data: Data([1])), + Self.key(keyId: 7, data: Data([2]), disabledAt: 1), + Self.key(keyId: 3, data: Data([3])), + ]), + 8) + } + + func testSessionKeyIsBoundToTheRequestedContractWithBothLimits() { + let hash = Data(repeating: 0x11, count: 20) + let contractId = Data(repeating: 0x33, count: 32) + let key = AppConnect.sessionIdentityPubkey( + keyId: 8, publicKeyHash160: hash, appContractId: contractId, totalBudget: 5, expiresAt: 6) + XCTAssertEqual(key.keyId, 8) + XCTAssertEqual(key.keyType, .ecdsaHash160) + XCTAssertEqual(key.purpose, .authentication) + XCTAssertEqual(key.securityLevel, .high) + XCTAssertEqual(key.pubkeyBytes, hash) + XCTAssertEqual(key.contractBounds, .singleContract(id: contractId)) + XCTAssertEqual(key.totalBudget, 5) + XCTAssertEqual(key.expiresAt, 6) + } + + func testExpiryIsTheLifetimeAfterNowInMilliseconds() { + XCTAssertEqual( + AppConnect.expiresAt(from: Date(timeIntervalSince1970: 1_000)), + UInt64((1_000 + AppConnect.sessionKeyLifetime) * 1000)) + } + + func testResponseCarriesTheSessionKeyOnlyTheAppCanDecrypt() throws { + let sessionPrivateKey = Data(repeating: 0x5a, count: 32) + let appEphemeralPrivateKey = Data(repeating: 0x07, count: 32) + let appEphemeralPubKey = try Secp256k1.compressedPublicKey(privateKey: appEphemeralPrivateKey) + let walletEphemeralPrivateKeyBytes = Data(repeating: 0x09, count: 32) + var walletEphemeralPrivateKey = walletEphemeralPrivateKeyBytes + + let values = try AppConnect.responseValues( + sessionPrivateKey: sessionPrivateKey, + appEphemeralPubKey: appEphemeralPubKey, + walletEphemeralPrivateKey: &walletEphemeralPrivateKey) + + XCTAssertEqual(walletEphemeralPrivateKey, Data(repeating: 0, count: 32), "the ephemeral key is wiped") + XCTAssertEqual( + values.appEphemeralPubKeyHash, + try KeyExchangeCrypto.hash160(appEphemeralPubKey).toHexString()) + let walletEphemeralPubKey = try Secp256k1.compressedPublicKey(privateKey: walletEphemeralPrivateKeyBytes) + XCTAssertEqual(values.walletEphemeralPubKey, walletEphemeralPubKey.toHexString()) + // 28-byte envelope plus one 32-byte key: the contract's minimum. + XCTAssertEqual(values.encryptedPayload.count, 60 * 2) + + let payload = try XCTUnwrap(Self.data(hex: values.encryptedPayload)) + // The app's side of the exchange: its private key with the wallet's + // public key. ECDH is symmetric, so the helper's parameters take the + // opposite pair to the one that encrypted. + XCTAssertEqual( + try KeyExchangeCrypto.decryptLoginKey( + payload, + walletEphemeralPriv: appEphemeralPrivateKey, + appEphemeralPub: walletEphemeralPubKey), + sessionPrivateKey) + } + + func testPropertiesJsonHoldsExactlyTheThreeContractFields() throws { + let values = AppConnect.ResponseValues( + appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc") + let object = try XCTUnwrap( + JSONSerialization.jsonObject(with: Data(try values.propertiesJSON().utf8)) as? [String: String]) + XCTAssertEqual(object, [ + "appEphemeralPubKeyHash": "aa", + "walletEphemeralPubKey": "bb", + "encryptedPayload": "cc", + ]) + } + + func testPublishedResponsesSurviveAReloadAndAreScoped() { + let response = AppConnectPublishedResponse( + identityId: "identity", appContractId: "app", documentId: "document", + values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), + sessionKeyId: 8, totalBudget: 5, expiresAt: 6, + publishedAt: Date(timeIntervalSince1970: 1_000)) + var scope: String? = "scope-a" + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { scope } + + store.save([response]) + XCTAssertEqual(store.load(), [response]) + + scope = "scope-b" + XCTAssertEqual(store.load(), [], "another wallet does not see the records") + scope = nil + store.save([response]) + XCTAssertEqual(store.load(), [], "nothing is stored without a wallet scope") + + scope = "scope-a" + store.save([]) + XCTAssertEqual(store.load(), []) + } + + private static let now = Date(timeIntervalSince1970: 1_800_000_000) + private static let nowMilliseconds: Int64 = 1_800_000_000_000 + + private static func key( + keyId: Int32, + purpose: KeyPurpose = .authentication, + securityLevel: SecurityLevel = .high, + keyType: KeyType = .ecdsaHash160, + data: Data, + disabledAt: Int64? = nil, + expiresAt: Int64? = nil + ) -> ManagedIdentity.IdentityPublicKeyInfo { + ManagedIdentity.IdentityPublicKeyInfo( + keyId: keyId, purpose: purpose, securityLevel: securityLevel, keyType: keyType, + readOnly: false, disabledAt: disabledAt, data: data, totalBudget: nil, expiresAt: expiresAt) + } + + private static func data(hex: String) -> Data? { + var bytes = [UInt8]() + var index = hex.startIndex + while index < hex.endIndex { + guard let next = hex.index(index, offsetBy: 2, limitedBy: hex.endIndex), + let byte = UInt8(hex[index ..< next], radix: 16) else { return nil } + bytes.append(byte) + index = next + } + return Data(bytes) + } +} From 9552f6ab2a08a8b744c08b3315e689921735e7a3 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sat, 10 Oct 2026 19:41:35 +0300 Subject: [PATCH 002/108] feat(dashpay): disable the app's key when a one-QR connection is turned off Turning a connection off only changed its local status, so the app kept a key that could still sign. For a connection made by the one-QR login the wallet now disables that session key on the identity and deletes the published response by its values before the row is downgraded; a failure leaves the row active and is shown to the user. A two-QR connection stays local-only: that login derives the same key every time and Platform never re-adds a disabled key, so disabling it would lock the app out for good. `disconnect(id:)` now throws, and the view model keeps a second tap and inbound requests out while the identity update is in flight. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 20 ++++++ .../DashConnect/DashConnectDataSource.swift | 10 ++- .../PlatformDashConnectDataSource.swift | 61 ++++++++++++++-- .../Components/ConnectionRow.swift | 8 ++- .../UI/DashConnect/ConnectionsViewModel.swift | 19 ++++- .../DashConnect/DashConnectStoreTests.swift | 2 +- .../PlatformDashConnectDataSourceTests.swift | 69 ++++++++++++++++++- 7 files changed, 175 insertions(+), 14 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 097e916401..030666f52d 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -100,6 +100,26 @@ enum AppConnect { ) } + /// The session keys behind `responses` that can still sign: the ones a + /// disconnect has to disable. A key that is gone, already disabled, or no + /// longer the kind of key this login registers is left alone. + static func sessionKeyIdsToDisable( + for responses: [AppConnectPublishedResponse], + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> [UInt32] { + let granted = Set(responses.map(\.sessionKeyId)) + return currentIdentityPublicKeys + .filter { + granted.contains(UInt32(bitPattern: $0.keyId)) + && $0.keyType == .ecdsaHash160 + && $0.purpose == .authentication + && $0.securityLevel == .high + && $0.disabledAt == nil + } + .map { UInt32(bitPattern: $0.keyId) } + .sorted() + } + /// The three values of a `loginKeyResponse`, as hex. struct ResponseValues: Codable, Equatable { let appEphemeralPubKeyHash: String diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index 41ea7e5521..d8c3823225 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -36,7 +36,13 @@ protocol DashConnectDataSource { /// transition could already have reached Platform — the caller must not /// offer a retry when it could have. func approveTokenPurchase(_ request: DashConnectTokenPurchaseRequest) async throws - func disconnect(id: String) async + /// Turns a connection off. For a one-QR connection this disables the key + /// the app was given on the identity and deletes the published response, + /// and throws when the key could not be disabled — the connection then + /// stays as it was. For a two-QR connection it only changes the local + /// status: that login derives the same key every time and Platform never + /// re-adds a disabled key, so disabling it would lock the app out for good. + func disconnect(id: String) async throws func remove(id: String) async } @@ -239,7 +245,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { DashConnectMockError.stateTransitionNotSupported) } - func disconnect(id: String) async { + func disconnect(id: String) async throws { let disconnectedAt = Date() persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 8f3c70d3e2..60ff587f2b 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1037,11 +1037,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { persistAndSend(subject.value.filter { $0.id != id }) } - func disconnect(id: String) async { + func disconnect(id: String) async throws { + try await revokeAppConnectGrants(appContractId: id) + let disconnectedAt = now() - // Local-only: keep the published `loginKeyResponse` document intact. - // Re-approving the same `dash-key:` QR is enough to return to `.active` - // once the identity keys are still registered. + // A two-QR connection has nothing recorded to revoke and stops here: + // its `loginKeyResponse` document stays, and re-approving the same + // `dash-key:` QR returns it to `.active` while the identity keys are + // still registered. persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } return DAppConnection( @@ -1054,6 +1057,56 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { }) } + /// Ends the access a one-QR login gave an app: disables its session keys + /// on the identity, then deletes the responses that carried them. Does + /// nothing, and needs neither a wallet nor the network, when nothing was + /// published for the app. + /// + /// The key goes first because it is what the app signs with; a response + /// that could not be deleted afterwards stays recorded and is retried by + /// the next disconnect or login. + private func revokeAppConnectGrants(appContractId: String) async throws { + guard responseStore.load().contains(where: { $0.appContractId == appContractId }) else { + return + } + + let context = try await requireContext() + let identityId = context.identityId.toBase58String() + let granted = responseStore.load().filter { + $0.identityId == identityId && $0.appContractId == appContractId + } + guard !granted.isEmpty else { return } + + try await authorize() + + let signer = KeychainSigner(modelContainer: context.modelContainer) + let currentPublicKeys = try context.wallet + .managedIdentity(identityId: context.identityId) + .getPublicKeys() + let keyIds = AppConnect.sessionKeyIdsToDisable( + for: granted, + currentIdentityPublicKeys: currentPublicKeys + ) + if !keyIds.isEmpty { + Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) session key(s)") + try await context.wallet.updateIdentity( + identityId: context.identityId, + disablePublicKeyIds: keyIds, + signer: signer + ) + Self.logger.info("🔗 DASHCONNECT :: session key(s) disabled") + } + + guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { return } + await deletePublishedAppConnectResponses( + identityId: identityId, + appContractId: appContractId, + responseContractId: responseContractId, + context: context, + signer: signer + ) + } + static func buildLoginKeyResponseDraft( loginKey: Data, appContractId: Data, diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift index e519e95730..eb1903b3dc 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift @@ -87,9 +87,11 @@ struct ConnectionRow: View { } /// Always reads as on: the row only shows it for an active connection, and - /// only the off direction is reachable from here. Turning it off locally - /// downgrades the connection back to `.approved`; it does not sign the user - /// out of the app, because the wallet has no channel to end that session. + /// only the off direction is reachable from here. Turning it off + /// downgrades the connection back to `.approved`. For a one-QR connection + /// the data source first disables the app's key on the identity, which is + /// what ends the app's access; for a two-QR connection the change is local + /// and the app keeps its keys (see `DashConnectDataSource.disconnect`). private var activeSwitch: some View { ZStack { SwitchView(isOn: .constant(true)) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index bdf6351e7d..c87d9a7bf1 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -281,8 +281,23 @@ final class ConnectionsViewModel: ObservableObject { } func disconnect(_ connection: DAppConnection) { - Task { - await dataSource.disconnect(id: connection.id) + // Disconnecting a one-QR connection signs an identity update, which + // takes seconds; the flag keeps a second tap and an inbound request + // out until it is done. + guard !isProcessingStateTransition else { return } + isProcessingStateTransition = true + Task { [weak self] in + guard let self else { return } + defer { self.isProcessingStateTransition = false } + do { + try await self.dataSource.disconnect(id: connection.id) + } catch { + self.message = ConnectionsScreenMessage( + kind: .error, + text: String( + format: NSLocalizedString("Could not disconnect: %@", comment: "DashConnect"), + error.localizedDescription)) + } } } diff --git a/DashWalletTests/DashConnect/DashConnectStoreTests.swift b/DashWalletTests/DashConnect/DashConnectStoreTests.swift index d0faac2dfb..1418e190f4 100644 --- a/DashWalletTests/DashConnect/DashConnectStoreTests.swift +++ b/DashWalletTests/DashConnect/DashConnectStoreTests.swift @@ -178,7 +178,7 @@ final class DashConnectStoreTests: XCTestCase { store: store ) - await first.disconnect(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F") + try await first.disconnect(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F") let second = MockDashConnectDataSource(store: store) XCTAssertEqual(second.connectionsSnapshot.count, 1) diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index f9f343f773..203d6dee43 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1277,6 +1277,37 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { /// /// `approvePendingTokenPurchase` works in an unstructured `Task` and the /// data source runs off the main actor, so there is no handle to await. + func testAFailedDisconnectIsReportedInsteadOfLookingLikeASuccess() async { + let spy = PurchaseApprovalSpy() + spy.disconnectFailure = PurchaseSpyError.refused + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.disconnect(Self.connection) + XCTAssertTrue(viewModel.isProcessingStateTransition) + // A second tap while the first is still out must not start another. + viewModel.disconnect(Self.connection) + await waitUntil { !viewModel.isProcessingStateTransition } + + XCTAssertEqual(spy.disconnectedIds, [Self.connection.id]) + XCTAssertEqual(viewModel.message?.kind, .error) + XCTAssertEqual(viewModel.message?.text.contains("spy refused"), true) + } + + func testASuccessfulDisconnectReportsNothing() async { + let spy = PurchaseApprovalSpy() + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.disconnect(Self.connection) + await waitUntil { !viewModel.isProcessingStateTransition } + + XCTAssertEqual(spy.disconnectedIds, [Self.connection.id]) + XCTAssertNil(viewModel.message) + } + + private static let connection = DAppConnection( + id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", name: "App", url: "", + status: .active, updatedAt: Date(timeIntervalSince1970: 1_000)) + private func waitUntil(timeout: TimeInterval = 2, _ condition: () -> Bool) async { let deadline = Date().addingTimeInterval(timeout) while !condition(), Date() < deadline { @@ -1371,8 +1402,12 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { throw PurchaseSpyError.unsupported } - func disconnect(id: String) async { - XCTFail("disconnect is not part of the purchase approval flow") + var disconnectFailure: Error? + private(set) var disconnectedIds: [String] = [] + + func disconnect(id: String) async throws { + disconnectedIds.append(id) + if let disconnectFailure { throw disconnectFailure } } func remove(id: String) async { @@ -1478,6 +1513,36 @@ final class AppConnectLoginTests: XCTestCase { 8) } + func testDisconnectDisablesOnlyTheLiveSessionKeysItGranted() { + let responses = [9, 11, 12, 13].map { Self.response(sessionKeyId: $0) } + let keys = [ + Self.key(keyId: 0, securityLevel: .master, keyType: .ecdsaSecp256k1, data: Data([0])), + Self.key(keyId: 9, data: Data([9])), + // Not granted by these responses. + Self.key(keyId: 10, data: Data([10])), + // Already disabled. + Self.key(keyId: 11, data: Data([11]), disabledAt: 1), + // The id now belongs to a key this login would never register. + Self.key(keyId: 12, securityLevel: .critical, data: Data([12])), + // 13 is not on the identity at all. + Self.key(keyId: 14, data: Data([14])), + ] + XCTAssertEqual( + AppConnect.sessionKeyIdsToDisable(for: responses, currentIdentityPublicKeys: keys), + [9]) + XCTAssertEqual( + AppConnect.sessionKeyIdsToDisable(for: [], currentIdentityPublicKeys: keys), + []) + } + + private static func response(sessionKeyId: UInt32) -> AppConnectPublishedResponse { + AppConnectPublishedResponse( + identityId: "identity", appContractId: "app", documentId: "document-\(sessionKeyId)", + values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), + sessionKeyId: sessionKeyId, totalBudget: nil, expiresAt: nil, + publishedAt: Date(timeIntervalSince1970: 1_000)) + } + func testSessionKeyIsBoundToTheRequestedContractWithBothLimits() { let hash = Data(repeating: 0x11, count: 20) let contractId = Data(repeating: 0x33, count: 32) From 18d0a04d3e64a2512047b493bf177173110bdd61 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sat, 10 Oct 2026 19:53:15 +0300 Subject: [PATCH 003/108] fix(dashpay): keep every one-QR session key revocable Review pass on the one-QR login and its disconnect: - A later login to the same app deleted the earlier record together with its key id, so that key stayed live and could no longer be found. The record now outlives its response (marked as deleted) until a disconnect disables the key. - The grant and the connection row are recorded once the key is on the identity, before the publish, so a publish with an unknown outcome still leaves a key the user can see and disable. Approving the same QR again reuses the recorded values and does nothing when already published. - A connection remembers which login made it. Turning a one-QR connection off removes the row instead of parking it in the two-QR "approved" state, and refuses, rather than reporting success, when its records are missing. - A scanned `dash-st:` key registration keeps the budget and expiry it carried instead of being rebuilt as an unlimited key. - Disconnect has its own in-flight flag, does not overlap an approval or a resolving request, and re-resolves the wallet context after the PIN prompt. Grant records are read, changed and written in one step. - The protocol-version query runs off the cooperative pool. - The two logins share one `AppConnect.seal` instead of two copies of the encrypt-and-wipe sequence, and the session private key is the sole owner of its buffer so the wipe reaches it. Still open, marked in code: key state is read from the SDK's local view of the identity (TODO(app-connect-stale-keys)); the approval sheet still shows the two-QR text. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 98 ++++-- .../DashConnect/DashConnectModels.swift | 9 + .../Models/DashConnect/DashConnectStore.swift | 9 +- .../PlatformDashConnectDataSource.swift | 314 ++++++++++++------ .../UI/DashConnect/ConnectionsScreen.swift | 2 +- .../UI/DashConnect/ConnectionsViewModel.swift | 18 +- .../DashConnect/DashConnectStoreTests.swift | 15 + .../PlatformDashConnectDataSourceTests.swift | 73 +++- 8 files changed, 385 insertions(+), 153 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 030666f52d..d00c440025 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -19,7 +19,7 @@ enum AppConnect { /// Same id on every network (`docs/protocol/app-connect.md` in /// dashpay/platform). static let contractId = "H8F9mP1BM55TE1ShsxPZHzhyinaMdY9bMmP85mkDhcJJ" - static let documentType = "loginKeyResponse" + static let documentType = PlatformDashConnectDataSource.loginKeyExchangeDocumentType /// Limits put on every session key. /// TODO(app-connect-limits): the protocol leaves both values to the @@ -100,14 +100,14 @@ enum AppConnect { ) } - /// The session keys behind `responses` that can still sign: the ones a + /// The session keys behind `grants` that can still sign: the ones a /// disconnect has to disable. A key that is gone, already disabled, or no /// longer the kind of key this login registers is left alone. static func sessionKeyIdsToDisable( - for responses: [AppConnectPublishedResponse], + for grants: [AppConnectGrant], currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] ) -> [UInt32] { - let granted = Set(responses.map(\.sessionKeyId)) + let granted = Set(grants.map(\.sessionKeyId)) return currentIdentityPublicKeys .filter { granted.contains(UInt32(bitPattern: $0.keyId)) @@ -126,6 +126,20 @@ enum AppConnect { let walletEphemeralPubKey: String let encryptedPayload: String + init(appEphemeralPubKeyHash: String, walletEphemeralPubKey: String, encryptedPayload: String) { + self.appEphemeralPubKeyHash = appEphemeralPubKeyHash + self.walletEphemeralPubKey = walletEphemeralPubKey + self.encryptedPayload = encryptedPayload + } + + init(_ sealed: SealedKey) { + self.init( + appEphemeralPubKeyHash: sealed.appEphemeralPubKeyHash.toHexString(), + walletEphemeralPubKey: sealed.walletEphemeralPublicKey.toHexString(), + encryptedPayload: sealed.encryptedPayload.toHexString() + ) + } + /// The document's properties in the form `createDocument` and /// delete-by-values take. func propertiesJSON() throws -> String { @@ -140,10 +154,19 @@ enum AppConnect { } } - /// Encrypts the session private key to the app. `walletEphemeralPrivateKey` - /// is wiped before returning. - static func responseValues( - sessionPrivateKey: Data, + /// A 32-byte key encrypted to an app's ephemeral key, with what the app + /// needs to find and open it. Shared by both logins: the two-QR response + /// carries the login key, the one-QR response the session private key. + struct SealedKey: Equatable { + let appEphemeralPubKeyHash: Data + let walletEphemeralPublicKey: Data + let encryptedPayload: Data + } + + /// Encrypts `key` to the app. `walletEphemeralPrivateKey` is wiped before + /// returning. + static func seal( + _ key: Data, appEphemeralPubKey: Data, walletEphemeralPrivateKey: inout Data, encrypt: (Data, Data, Data) throws -> Data = { key, walletPriv, appPub in @@ -153,7 +176,7 @@ enum AppConnect { appEphemeralPub: appPub ) } - ) throws -> ResponseValues { + ) throws -> SealedKey { defer { PlatformDashConnectDataSource.zero(&walletEphemeralPrivateKey) } let appEphemeralPubKeyHash = try KeyExchangeCrypto.hash160(appEphemeralPubKey) @@ -161,25 +184,31 @@ enum AppConnect { throw DashConnectPlatformError.invalidHash160 } let walletEphemeralPublicKey = try Secp256k1.compressedPublicKey(privateKey: walletEphemeralPrivateKey) - let encryptedPayload = try encrypt(sessionPrivateKey, walletEphemeralPrivateKey, appEphemeralPubKey) + let encryptedPayload = try encrypt(key, walletEphemeralPrivateKey, appEphemeralPubKey) - return ResponseValues( - appEphemeralPubKeyHash: appEphemeralPubKeyHash.toHexString(), - walletEphemeralPubKey: walletEphemeralPublicKey.toHexString(), - encryptedPayload: encryptedPayload.toHexString() + return SealedKey( + appEphemeralPubKeyHash: appEphemeralPubKeyHash, + walletEphemeralPublicKey: walletEphemeralPublicKey, + encryptedPayload: encryptedPayload ) } } -/// A response this wallet published and has not deleted yet, with the key it -/// granted. The type is index-only on Platform: there is no lookup by app and +/// A session key this wallet registered for an app, and the response that +/// carried it. Kept until the key is disabled and the response is gone. +/// +/// The response type is index-only on Platform: there is no lookup by app and /// a delete has to carry the original values, so this record is the only way -/// back to the entry. -struct AppConnectPublishedResponse: Codable, Equatable { +/// back to the entry — and the only place that knows which key on the +/// identity belongs to which app. +struct AppConnectGrant: Codable, Equatable { /// Base58 ids. let identityId: String let appContractId: String - let documentId: String + /// `nil` until Platform confirmed the response: the grant is recorded + /// before publishing, so a publish whose outcome is unknown still leaves + /// a key that can be disabled. + var documentId: String? let values: AppConnect.ResponseValues let sessionKeyId: UInt32 /// `nil` when the key was found already registered and its limits were @@ -187,11 +216,22 @@ struct AppConnectPublishedResponse: Codable, Equatable { let totalBudget: UInt64? let expiresAt: UInt64? let publishedAt: Date + /// Set once the response was deleted from Platform while the key stays + /// live (a later login to the same app). Absent means not deleted. + var responseDeleted: Bool? + /// Set once a disconnect disabled the key but could not delete the + /// response; the record then only waits for that delete. + var keyDisabled: Bool? + + /// Whether there is a response on Platform this record can still delete. + var hasDeletableResponse: Bool { + documentId != nil && responseDeleted != true + } } protocol AppConnectResponseStore { - func load() -> [AppConnectPublishedResponse] - func save(_ responses: [AppConnectPublishedResponse]) + func load() -> [AppConnectGrant] + func save(_ grants: [AppConnectGrant]) } /// Wallet- and network-scoped, like `UserDefaultsDashConnectStore`, whose @@ -233,27 +273,29 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { scopeKeyProvider().map { "\($0).app-connect-responses.v1" } } - func load() -> [AppConnectPublishedResponse] { + func load() -> [AppConnectGrant] { guard let storageKey, let data = defaults.data(forKey: storageKey) else { return [] } do { - return try decoder.decode([AppConnectPublishedResponse].self, from: data) + return try decoder.decode([AppConnectGrant].self, from: data) } catch { - // Losing the records is survivable: the next login still creates a - // fresh response, and the old entries stay until deleted by value. + // Without the records the keys they named can no longer be told + // apart on the identity. A one-QR row whose records are gone + // refuses to disconnect (`grantRecordsMissing`) instead of + // pretending the key was disabled. Self.logger.warning( "AppConnectResponseStore: stored responses could not be decoded: \(error.localizedDescription, privacy: .public)") return [] } } - func save(_ responses: [AppConnectPublishedResponse]) { + func save(_ grants: [AppConnectGrant]) { guard let storageKey else { return } - guard !responses.isEmpty else { + guard !grants.isEmpty else { defaults.removeObject(forKey: storageKey) return } do { - defaults.set(try encoder.encode(responses), forKey: storageKey) + defaults.set(try encoder.encode(grants), forKey: storageKey) } catch { Self.logger.error( "AppConnectResponseStore: failed to encode responses: \(error.localizedDescription, privacy: .public)") diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 0d1e80d4a1..5a94c68a40 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -173,6 +173,14 @@ enum ConnectionStatus: String, Codable, CaseIterable { } } +/// Which login made a connection. It decides what turning it off means: +/// a one-QR connection has a session key on the identity to disable, a +/// two-QR connection does not (see `DashConnectDataSource.disconnect`). +enum DashConnectLoginKind: String, Codable { + case twoQR + case oneQR +} + /// A connected app identified by its stable contract id. struct DAppConnection: Identifiable, Equatable, Hashable { let id: String @@ -180,6 +188,7 @@ struct DAppConnection: Identifiable, Equatable, Hashable { let url: String let status: ConnectionStatus let updatedAt: Date + var loginKind: DashConnectLoginKind = .twoQR } /// A pending request derived from a scanned login QR code. diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift index faa99db9a1..507ed2d726 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift @@ -115,7 +115,8 @@ final class UserDefaultsDashConnectStore: DashConnectStore { name: row.label, url: row.url, status: row.status, - updatedAt: row.updatedAt + updatedAt: row.updatedAt, + loginKind: row.loginKind ?? .twoQR ) ) } @@ -140,7 +141,8 @@ final class UserDefaultsDashConnectStore: DashConnectStore { label: $0.name, url: $0.url, status: $0.status, - updatedAt: $0.updatedAt + updatedAt: $0.updatedAt, + loginKind: $0.loginKind == .twoQR ? nil : $0.loginKind ) } @@ -166,6 +168,9 @@ final class UserDefaultsDashConnectStore: DashConnectStore { let url: String let status: ConnectionStatus let updatedAt: Date + /// Absent for a two-QR connection, which is every row written before + /// the one-QR login existed. + let loginKind: DashConnectLoginKind? } private static func base58Decode(_ string: String) -> Data? { diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 60ff587f2b..842fae7e04 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -72,6 +72,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case tokenPurchaseTokenIdMismatch case unsupportedStateTransition(String) case sessionKeyUnusable + case grantRecordsMissing case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -119,6 +120,10 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return "The scanned token purchase targets a different identity." case .tokenPurchaseTokenIdMismatch: return "The scanned token purchase names a token that does not belong to the contract and position it would buy from." + case .grantRecordsMissing: + return NSLocalizedString( + "This wallet has no record of the key it gave this app, so it cannot turn it off here.", + comment: "DashConnect") case .sessionKeyUnusable: return NSLocalizedString( "This sign-in request can no longer be approved. Ask the app for a new code.", @@ -172,6 +177,10 @@ struct DashConnectKeyRegistrationKey: Equatable { let securityLevel: SecurityLevel let publicKeyData: Data let contractBounds: ContractBounds? + /// Protocol 14 limits the scanned transition put on the key. Carried so + /// the rebuilt registration grants exactly what was asked for. + var totalBudget: UInt64? = nil + var expiresAt: UInt64? = nil } struct DashConnectKeyRegistrationTransition: Equatable { @@ -273,7 +282,9 @@ struct PlatformWalletDashConnectStateTransitionParser: DashConnectStateTransitio // this flow derives, so refuse the transition instead. throw DashConnectPlatformError.keyRegistrationUnexpectedMutation } - } + }, + totalBudget: key.totalBudget, + expiresAt: key.expiresAt ) }, disablePublicKeyIds: parsed.disablePublicKeyIds @@ -459,7 +470,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // two-QR flow until that pin moves. let protocolVersion: UInt32 do { - protocolVersion = try context.sdk.refreshProtocolVersion() + protocolVersion = try await Self.networkProtocolVersion(sdk: context.sdk) } catch { Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") throw error @@ -567,14 +578,28 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return connection } + /// `SDK.refreshProtocolVersion()` is a synchronous FFI call that makes a + /// proven network query. It runs on a plain dispatch queue so it does not + /// hold a cooperative-pool thread for a DAPI round trip. + private static func networkProtocolVersion(sdk: SDK) async throws -> UInt32 { + try await withCheckedThrowingContinuation { continuation in + DispatchQueue.global(qos: .userInitiated).async { + continuation.resume(with: Result { try sdk.refreshProtocolVersion() }) + } + } + } + /// The one-QR login: derive the request's session key, register it on the /// identity with its bounds and limits, and only then publish the /// encrypted key, so the app finds a live key on its first check. /// - /// Safe to repeat for the same QR: the key is derived from the request, - /// so a second approval finds it registered and goes straight to - /// publishing. A registration that succeeded before a failed publish is - /// therefore finished by scanning the same QR again. + /// The grant and the connection row are recorded as soon as the key is + /// known to be on the identity, before the publish: whatever happens to + /// the publish, the key stays visible in Connections and can be disabled. + /// + /// Approving the same QR again finds the key registered and does not + /// register it twice; if the response is already recorded as published it + /// does nothing more. private func approveAppConnectLogin( _ request: DashKeyRequest, context: Context @@ -584,27 +609,43 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } let requestId = AppConnect.requestId(appEphemeralPubKey: request.appEphemeralPubKey) - // `deriveConnectKey` is main-actor isolated in the SDK. - let sessionKey = try await MainActor.run { - try context.wallet.deriveConnectKey( + // `deriveConnectKey` is main-actor isolated in the SDK. Only the two + // buffers leave the closure, so the private key below is the sole + // owner of its storage and the deferred wipe reaches the real bytes. + var (sessionPublicKey, sessionPrivateKey) = try await MainActor.run { + let key = try context.wallet.deriveConnectKey( subFeature: .sessionAuthentication, identityId: context.identityId, leaf: requestId, network: context.network ) + return (key.publicKeyData, key.privateKeyData) } - var sessionPrivateKey = sessionKey.privateKeyData defer { Self.zero(&sessionPrivateKey) } - let sessionKeyHash160 = try KeyExchangeCrypto.hash160(sessionKey.publicKeyData) + let sessionKeyHash160 = try KeyExchangeCrypto.hash160(sessionPublicKey) + + var walletEphemeralPrivateKey = try Self.generateEphemeralPrivateKey() + let sealed = try AppConnect.seal( + sessionPrivateKey, + appEphemeralPubKey: request.appEphemeralPubKey, + walletEphemeralPrivateKey: &walletEphemeralPrivateKey + ) + let identityId = context.identityId.toBase58String() + let appContractId = request.contractId.toBase58String() + let requestHash = sealed.appEphemeralPubKeyHash.toHexString() let signer = KeychainSigner(modelContainer: context.modelContainer) + // TODO(app-connect-stale-keys): this is the SDK's local view of the + // identity, refreshed only when an identity update returns success. A + // registration that landed but whose wait failed is not in it, and + // approving the same QR then tries to add the key a second time. let currentPublicKeys = try context.wallet .managedIdentity(identityId: context.identityId) .getPublicKeys() let sessionKeyId: UInt32 - let totalBudget: UInt64? - let expiresAt: UInt64? + var totalBudget: UInt64? + var expiresAt: UInt64? switch AppConnect.sessionKeyState( publicKeyHash160: sessionKeyHash160, currentIdentityPublicKeys: currentPublicKeys, @@ -615,8 +656,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { case .usable(let keyId): Self.logger.info("🔗 DASHCONNECT :: session key already registered") sessionKeyId = keyId - totalBudget = nil - expiresAt = nil case .absent: let keyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) let budget = AppConnect.sessionKeyBudgetCredits @@ -644,18 +683,48 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { expiresAt = expiry } - var walletEphemeralPrivateKey = try Self.generateEphemeralPrivateKey() - let values = try AppConnect.responseValues( - sessionPrivateKey: sessionPrivateKey, - appEphemeralPubKey: request.appEphemeralPubKey, - walletEphemeralPrivateKey: &walletEphemeralPrivateKey - ) + // From here the app-side key exists on the identity. Record it, and + // show the connection, before anything else can fail. A grant already + // recorded for this request keeps its values: if an earlier publish + // landed without confirming, those are the ones on Platform. + let grant = updateGrants { grants -> AppConnectGrant in + if let existing = grants.first(where: { + $0.identityId == identityId && $0.appContractId == appContractId + && $0.sessionKeyId == sessionKeyId && $0.values.appEphemeralPubKeyHash == requestHash + }) { + return existing + } + let new = AppConnectGrant( + identityId: identityId, + appContractId: appContractId, + documentId: nil, + values: AppConnect.ResponseValues(sealed), + sessionKeyId: sessionKeyId, + totalBudget: totalBudget, + expiresAt: expiresAt, + publishedAt: now() + ) + grants.append(new) + return new + } - let identityId = context.identityId.toBase58String() - let appContractId = request.contractId.toBase58String() - await deletePublishedAppConnectResponses( - identityId: identityId, - appContractId: appContractId, + let preview = await makeConnectionRequest(from: request) + let connection = Self.makeConnection( + preview: preview, status: .active, updatedAt: now(), loginKind: .oneQR) + var current = subject.value.filter { $0.id != connection.id } + current.append(connection) + persistAndSend(current) + + guard grant.documentId == nil else { + Self.logger.info("🔗 DASHCONNECT :: response already published for this request") + return connection + } + + await deleteAppConnectResponses( + where: { + $0.identityId == identityId && $0.appContractId == appContractId + && $0.values.appEphemeralPubKeyHash != requestHash + }, responseContractId: responseContractId, context: context, signer: signer @@ -666,52 +735,50 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ownerIdentityId: context.identityId, contractId: responseContractId, documentType: AppConnect.documentType, - propertiesJSON: try values.propertiesJSON(), + propertiesJSON: try grant.values.propertiesJSON(), signer: signer ) Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse published") - responseStore.save(responseStore.load() + [ - AppConnectPublishedResponse( - identityId: identityId, - appContractId: appContractId, - documentId: documentId.toBase58String(), - values: values, - sessionKeyId: sessionKeyId, - totalBudget: totalBudget, - expiresAt: expiresAt, - publishedAt: now() - ), - ]) - - let preview = await makeConnectionRequest(from: request) - let connection = Self.makeConnection(preview: preview, status: .active, updatedAt: now()) - var current = subject.value.filter { $0.id != connection.id } - current.append(connection) - persistAndSend(current) + updateGrants { grants in + guard let index = grants.firstIndex(of: grant) else { return } + grants[index].documentId = documentId.toBase58String() + } return connection } - /// Deletes the responses this identity published earlier for an app, by - /// their original values. Best effort: a response that cannot be deleted - /// now stays recorded and is tried again at the next login, and it does - /// not hold the new login back — the entry it leaves is the encrypted key - /// of a request the app has already finished with. - private func deletePublishedAppConnectResponses( - identityId: String, - appContractId: String, + /// Reads, changes and writes the grant records in one step with no + /// suspension point in between, so an approval and a disconnect that + /// overlap cannot write a stale copy over each other's change. + @discardableResult + private func updateGrants(_ change: (inout [AppConnectGrant]) -> T) -> T { + var grants = responseStore.load() + let result = change(&grants) + responseStore.save(grants) + return result + } + + /// Deletes, by their original values, the responses of the matching + /// grants that are still on Platform. Best effort: a response that cannot + /// be deleted now stays recorded and is tried again by the next login or + /// disconnect. It does not hold the caller back — the entry it leaves is + /// the encrypted key of a request the app has already finished with. + /// + /// A grant whose key is still live keeps its record, marked as having no + /// response left, because the record is what lets a later disconnect find + /// and disable that key. A grant whose key is already disabled has no + /// further use and is dropped. + private func deleteAppConnectResponses( + where matches: (AppConnectGrant) -> Bool, responseContractId: Data, context: Context, signer: KeychainSigner ) async { - let recorded = responseStore.load() - let previous = recorded.filter { $0.identityId == identityId && $0.appContractId == appContractId } - guard !previous.isEmpty else { return } - - var deleted: [AppConnectPublishedResponse] = [] - for response in previous { + let pending = responseStore.load().filter { matches($0) && $0.hasDeletableResponse } + for grant in pending { do { - guard let documentId = Self.decodeIdentifier(response.documentId) else { + guard let documentIdText = grant.documentId, + let documentId = Self.decodeIdentifier(documentIdText) else { throw DashConnectPlatformError.existingDocumentLookupFailed } let signingKeyId = try selectDocumentSigningKeyId( @@ -723,17 +790,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { contractId: responseContractId, documentType: AppConnect.documentType, documentId: documentId, - propertiesJSON: try response.values.propertiesJSON(), + propertiesJSON: try grant.values.propertiesJSON(), signingKeyId: signingKeyId, signer: signer ) - deleted.append(response) + updateGrants { grants in + guard let index = grants.firstIndex(of: grant) else { return } + if grants[index].keyDisabled == true { + grants.remove(at: index) + } else { + grants[index].responseDeleted = true + } + } } catch { Self.logger.error( "🔗 DASHCONNECT :: previous loginKeyResponse not deleted — \(error.localizedDescription, privacy: .public)") } } - responseStore.save(recorded.filter { !deleted.contains($0) }) } func handleStateTransition(_ request: DashStRequest) async throws -> DashConnectStAction { @@ -1038,13 +1111,24 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } func disconnect(id: String) async throws { - try await revokeAppConnectGrants(appContractId: id) + let isOneQR = subject.value.first { $0.id == id }?.loginKind == .oneQR + let hasGrants = responseStore.load().contains { $0.appContractId == id } + if isOneQR || hasGrants { + try await revokeAppConnectGrants(appContractId: id, requiresGrants: isOneQR) + } + if isOneQR { + // Nothing is left of a one-QR connection once its key is disabled: + // the same QR can no longer be approved and there is no second + // step to wait for, so the row goes instead of sitting in the + // two-QR "approved" state. + persistAndSend(subject.value.filter { $0.id != id }) + return + } let disconnectedAt = now() - // A two-QR connection has nothing recorded to revoke and stops here: - // its `loginKeyResponse` document stays, and re-approving the same - // `dash-key:` QR returns it to `.active` while the identity keys are - // still registered. + // Local-only for a two-QR connection: its `loginKeyResponse` document + // stays, and re-approving the same `dash-key:` QR returns it to + // `.active` while the identity keys are still registered. persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } return DAppConnection( @@ -1057,34 +1141,44 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { }) } - /// Ends the access a one-QR login gave an app: disables its session keys - /// on the identity, then deletes the responses that carried them. Does - /// nothing, and needs neither a wallet nor the network, when nothing was - /// published for the app. + /// Ends the access one-QR logins gave an app: disables its session keys + /// on the identity, then deletes the responses that carried them. /// - /// The key goes first because it is what the app signs with; a response - /// that could not be deleted afterwards stays recorded and is retried by - /// the next disconnect or login. - private func revokeAppConnectGrants(appContractId: String) async throws { - guard responseStore.load().contains(where: { $0.appContractId == appContractId }) else { - return - } - - let context = try await requireContext() + /// The key goes first because it is what the app signs with. A response + /// that could not be deleted afterwards stays recorded, with its key + /// marked disabled, and is retried by the next login or disconnect. + /// + /// `requiresGrants` is set for a row made by the one-QR login: finding no + /// record for it means the key cannot be identified, and that is an error + /// rather than a silent success. + private func revokeAppConnectGrants(appContractId: String, requiresGrants: Bool) async throws { + var context = try await requireContext() let identityId = context.identityId.toBase58String() - let granted = responseStore.load().filter { - $0.identityId == identityId && $0.appContractId == appContractId + func isGranted(_ grant: AppConnectGrant) -> Bool { + grant.identityId == identityId && grant.appContractId == appContractId + } + guard responseStore.load().contains(where: isGranted) else { + if requiresGrants { throw DashConnectPlatformError.grantRecordsMissing } + return } - guard !granted.isEmpty else { return } try await authorize() + // The PIN prompt can outlast a wallet or network switch; sign with + // what is active now, and only if it is still the same identity. + context = try await requireContext() + guard context.identityId.toBase58String() == identityId else { + throw DashConnectPlatformError.noIdentity + } let signer = KeychainSigner(modelContainer: context.modelContainer) + // TODO(app-connect-stale-keys): the SDK's local view of the identity; + // a disable that landed but whose wait failed is not in it, and the + // retry is then refused by Platform until the view refreshes. let currentPublicKeys = try context.wallet .managedIdentity(identityId: context.identityId) .getPublicKeys() let keyIds = AppConnect.sessionKeyIdsToDisable( - for: granted, + for: responseStore.load().filter(isGranted), currentIdentityPublicKeys: currentPublicKeys ) if !keyIds.isEmpty { @@ -1097,10 +1191,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: session key(s) disabled") } + // Every key of this app is now off. Records with nothing left to + // delete are done; the rest wait for their response to go. + updateGrants { grants in + grants.removeAll { isGranted($0) && !$0.hasDeletableResponse } + for index in grants.indices where isGranted(grants[index]) { + grants[index].keyDisabled = true + } + } + guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { return } - await deletePublishedAppConnectResponses( - identityId: identityId, - appContractId: appContractId, + await deleteAppConnectResponses( + where: isGranted, responseContractId: responseContractId, context: context, signer: signer @@ -1120,26 +1222,24 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } ) throws -> DashConnectLoginKeyResponseDraft { - defer { zero(&walletEphemeralPrivateKey) } - - let appEphemeralPubKeyHash = try KeyExchangeCrypto.hash160(appEphemeralPubKey) - guard appEphemeralPubKeyHash.count == 20 else { - throw DashConnectPlatformError.invalidHash160 - } - - let walletEphemeralPublicKey = try Secp256k1.compressedPublicKey(privateKey: walletEphemeralPrivateKey) - let encryptedPayload = try encryptLoginKey(loginKey, walletEphemeralPrivateKey, appEphemeralPubKey) + let sealed = try AppConnect.seal( + loginKey, + appEphemeralPubKey: appEphemeralPubKey, + walletEphemeralPrivateKey: &walletEphemeralPrivateKey, + encrypt: encryptLoginKey + ) + let values = AppConnect.ResponseValues(sealed) return DashConnectLoginKeyResponseDraft( properties: [ "contractId": appContractId.toBase58String(), - "appEphemeralPubKeyHash": appEphemeralPubKeyHash.toHexString(), - "walletEphemeralPubKey": walletEphemeralPublicKey.toHexString(), - "encryptedPayload": encryptedPayload.toHexString(), + "appEphemeralPubKeyHash": values.appEphemeralPubKeyHash, + "walletEphemeralPubKey": values.walletEphemeralPubKey, + "encryptedPayload": values.encryptedPayload, "keyIndex": LoginKeyDerivation.defaultKeyIndex, ], - walletEphemeralPublicKey: walletEphemeralPublicKey, - encryptedPayload: encryptedPayload + walletEphemeralPublicKey: sealed.walletEphemeralPublicKey, + encryptedPayload: sealed.encryptedPayload ) } @@ -1307,14 +1407,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private static func makeConnection( preview: ConnectionRequest, status: ConnectionStatus, - updatedAt: Date + updatedAt: Date, + loginKind: DashConnectLoginKind = .twoQR ) -> DAppConnection { DAppConnection( id: preview.appContractId, name: preview.appLabel.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : preview.appLabel, url: preview.appUrl, status: status, - updatedAt: updatedAt + updatedAt: updatedAt, + loginKind: loginKind ) } @@ -1706,7 +1808,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { case .singleContractDocumentType(let id, let documentTypeName): return .singleContractDocumentType(id: id, documentTypeName: documentTypeName) } - } + }, + totalBudget: key.totalBudget, + expiresAt: key.expiresAt ) } diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 3ac6074272..a7189422e5 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -51,7 +51,7 @@ struct ConnectionsScreen: View { content } - if viewModel.isProcessingStateTransition { + if viewModel.isProcessingStateTransition || viewModel.isDisconnecting { Color.black.opacity(0.08) .ignoresSafeArea() diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index c87d9a7bf1..22ce543aa8 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -52,6 +52,10 @@ final class ConnectionsViewModel: ObservableObject { @Published var isApproving = false @Published var isApprovingPurchase = false @Published var isProcessingStateTransition = false + /// A disconnect that is signing an identity update. Its own flag, not + /// `isProcessingStateTransition`: a `dash-st:` task clears that one when + /// it finishes, which would lift the guard while a disconnect is still out. + @Published private(set) var isDisconnecting = false @Published var message: ConnectionsScreenMessage? /// Failure of the last approve attempt, rendered **inside** the approve sheet. /// A screen-level `.alert` cannot appear over a presented sheet, so routing this @@ -128,7 +132,7 @@ final class ConnectionsViewModel: ObservableObject { return } - guard !isProcessingStateTransition else { + guard !isProcessingStateTransition, !isDisconnecting else { message = ConnectionsScreenMessage( kind: .error, text: NSLocalizedString("Finish the current DashConnect request first, then try again.", @@ -282,13 +286,15 @@ final class ConnectionsViewModel: ObservableObject { func disconnect(_ connection: DAppConnection) { // Disconnecting a one-QR connection signs an identity update, which - // takes seconds; the flag keeps a second tap and an inbound request - // out until it is done. - guard !isProcessingStateTransition else { return } - isProcessingStateTransition = true + // takes seconds. It must not overlap anything else that signs one or + // touches the same records: a second tap, an approval on screen or in + // flight, a request still resolving, a `dash-st:` in progress. + guard !isDisconnecting, !isProcessingStateTransition, !isApproving, !isApprovingPurchase, + !isResolvingRequest, pendingRequest == nil, pendingTokenPurchase == nil else { return } + isDisconnecting = true Task { [weak self] in guard let self else { return } - defer { self.isProcessingStateTransition = false } + defer { self.isDisconnecting = false } do { try await self.dataSource.disconnect(id: connection.id) } catch { diff --git a/DashWalletTests/DashConnect/DashConnectStoreTests.swift b/DashWalletTests/DashConnect/DashConnectStoreTests.swift index 1418e190f4..4761ac5207 100644 --- a/DashWalletTests/DashConnect/DashConnectStoreTests.swift +++ b/DashWalletTests/DashConnect/DashConnectStoreTests.swift @@ -32,6 +32,21 @@ final class DashConnectStoreTests: XCTestCase { XCTAssertEqual(store.load(), connections) } + func testRoundTripKeepsWhichLoginMadeAConnection() { + let store = makeStore(network: .testnet, walletIdHex: "wallet-a") + var oneQR = sampleConnection( + id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: .active, + updatedAt: Date(timeIntervalSince1970: 10)) + oneQR.loginKind = .oneQR + let twoQR = sampleConnection( + id: "7W6u4NgW63FPUuW8EnTbYzD4KybNQD5n7CUDWydJY234", status: .active, + updatedAt: Date(timeIntervalSince1970: 20)) + + store.save([oneQR, twoQR]) + + XCTAssertEqual(store.load().map(\.loginKind), [.oneQR, .twoQR]) + } + func testUnknownStatusDropsOnlyThatRow() throws { let store = makeStore(network: .testnet, walletIdHex: "wallet-a") let payload: [[String: Any]] = [ diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 203d6dee43..bd2393b1c2 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -245,6 +245,28 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { } } + func testParserKeepsTheLimitsAScannedKeyRegistrationCarries() throws { + let parser = PlatformWalletDashConnectStateTransitionParser { _ in + Self.parsed(.identityUpdate(.init( + identityId: Data(repeating: 0x21, count: 32), + addPublicKeys: [ + .init( + keyId: 1, keyType: .ecdsaHash160, purpose: .authentication, + securityLevel: .high, pubkeyBytes: Data(repeating: 0x22, count: 20), + totalBudget: 7, expiresAt: 9), + .init( + keyId: 2, keyType: .ecdsaSecp256k1, purpose: .encryption, + securityLevel: .medium, pubkeyBytes: Data(repeating: 0x23, count: 33)), + ], + disablePublicKeyIds: []))) + } + guard case let .keyRegistration(transition) = try parser.parse(Data([0])) else { + return XCTFail("Expected a key-registration transition") + } + XCTAssertEqual(transition.addPublicKeys.map(\.totalBudget), [7, nil]) + XCTAssertEqual(transition.addPublicKeys.map(\.expiresAt), [9, nil]) + } + func testParserRefusesABatchThatIsNotALoneCompleteTokenPurchase() { let ownerId = Data(repeating: 0x21, count: 32) let contractId = Data(repeating: 0x22, count: 32) @@ -1283,10 +1305,10 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) viewModel.disconnect(Self.connection) - XCTAssertTrue(viewModel.isProcessingStateTransition) + XCTAssertTrue(viewModel.isDisconnecting) // A second tap while the first is still out must not start another. viewModel.disconnect(Self.connection) - await waitUntil { !viewModel.isProcessingStateTransition } + await waitUntil { !viewModel.isDisconnecting } XCTAssertEqual(spy.disconnectedIds, [Self.connection.id]) XCTAssertEqual(viewModel.message?.kind, .error) @@ -1298,7 +1320,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) viewModel.disconnect(Self.connection) - await waitUntil { !viewModel.isProcessingStateTransition } + await waitUntil { !viewModel.isDisconnecting } XCTAssertEqual(spy.disconnectedIds, [Self.connection.id]) XCTAssertNil(viewModel.message) @@ -1514,7 +1536,7 @@ final class AppConnectLoginTests: XCTestCase { } func testDisconnectDisablesOnlyTheLiveSessionKeysItGranted() { - let responses = [9, 11, 12, 13].map { Self.response(sessionKeyId: $0) } + let grants = [9, 11, 12, 13].map { Self.grant(sessionKeyId: $0) } let keys = [ Self.key(keyId: 0, securityLevel: .master, keyType: .ecdsaSecp256k1, data: Data([0])), Self.key(keyId: 9, data: Data([9])), @@ -1528,15 +1550,15 @@ final class AppConnectLoginTests: XCTestCase { Self.key(keyId: 14, data: Data([14])), ] XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable(for: responses, currentIdentityPublicKeys: keys), + AppConnect.sessionKeyIdsToDisable(for: grants, currentIdentityPublicKeys: keys), [9]) XCTAssertEqual( AppConnect.sessionKeyIdsToDisable(for: [], currentIdentityPublicKeys: keys), []) } - private static func response(sessionKeyId: UInt32) -> AppConnectPublishedResponse { - AppConnectPublishedResponse( + private static func grant(sessionKeyId: UInt32) -> AppConnectGrant { + AppConnectGrant( identityId: "identity", appContractId: "app", documentId: "document-\(sessionKeyId)", values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), sessionKeyId: sessionKeyId, totalBudget: nil, expiresAt: nil, @@ -1571,10 +1593,10 @@ final class AppConnectLoginTests: XCTestCase { let walletEphemeralPrivateKeyBytes = Data(repeating: 0x09, count: 32) var walletEphemeralPrivateKey = walletEphemeralPrivateKeyBytes - let values = try AppConnect.responseValues( - sessionPrivateKey: sessionPrivateKey, + let values = AppConnect.ResponseValues(try AppConnect.seal( + sessionPrivateKey, appEphemeralPubKey: appEphemeralPubKey, - walletEphemeralPrivateKey: &walletEphemeralPrivateKey) + walletEphemeralPrivateKey: &walletEphemeralPrivateKey)) XCTAssertEqual(walletEphemeralPrivateKey, Data(repeating: 0, count: 32), "the ephemeral key is wiped") XCTAssertEqual( @@ -1609,8 +1631,37 @@ final class AppConnectLoginTests: XCTestCase { ]) } + func testAGrantWrittenBeforeTheDeleteFlagsExistedStillLoads() throws { + // The shape the first device run stored: no `responseDeleted`, no + // `keyDisabled`. Losing it would leave that key impossible to find. + let stored = """ + [{"identityId":"identity","appContractId":"app","documentId":"document", + "values":{"appEphemeralPubKeyHash":"aa","walletEphemeralPubKey":"bb","encryptedPayload":"cc"}, + "sessionKeyId":6,"totalBudget":5000000000,"expiresAt":1799315762000,"publishedAt":1791539765792}] + """ + defaults.set(Data(stored.utf8), forKey: "scope.app-connect-responses.v1") + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } + + let grant = try XCTUnwrap(store.load().first) + XCTAssertEqual(grant.sessionKeyId, 6) + XCTAssertEqual(grant.documentId, "document") + XCTAssertNil(grant.responseDeleted) + XCTAssertNil(grant.keyDisabled) + XCTAssertTrue(grant.hasDeletableResponse) + } + + func testAGrantHasNothingToDeleteBeforeItIsPublishedOrAfterItsResponseIsGone() { + var grant = Self.grant(sessionKeyId: 6) + XCTAssertTrue(grant.hasDeletableResponse) + grant.responseDeleted = true + XCTAssertFalse(grant.hasDeletableResponse) + grant.responseDeleted = nil + grant.documentId = nil + XCTAssertFalse(grant.hasDeletableResponse) + } + func testPublishedResponsesSurviveAReloadAndAreScoped() { - let response = AppConnectPublishedResponse( + let response = AppConnectGrant( identityId: "identity", appContractId: "app", documentId: "document", values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), sessionKeyId: 8, totalBudget: 5, expiresAt: 6, From c80f5a0c36c15ccc4cb7fa5ff500fc97949b9287 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sat, 10 Oct 2026 20:07:44 +0300 Subject: [PATCH 004/108] fix(dashpay): match grant records by key and fail closed on a stale identity view Second review pass on the one-QR login: - A grant was looked up in the store by whole-value equality, and its date does not survive the store's millisecond round trip bit for bit, so about half of all publishes never recorded their document id. Records are now matched on what identifies a grant: identity, app, key id, request hash. - A granted key id missing from the wallet's local view of the identity was treated as gone, after which the records and the row were dropped as if the key had been disabled. Platform never removes a key, so a missing id now stops the disconnect with an error. - The one-QR approval re-resolves the wallet context after the PIN prompt and refuses to continue for a different identity. - The grant store decodes row by row and writes back rows it cannot read instead of overwriting them. - Two doc comments corrected to say what the code does. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 77 +++++++++++++++---- .../PlatformDashConnectDataSource.swift | 26 ++++++- .../Components/ConnectionRow.swift | 10 +-- .../PlatformDashConnectDataSourceTests.swift | 47 +++++++++++ 4 files changed, 134 insertions(+), 26 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index d00c440025..5996505ba4 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -8,8 +8,9 @@ import SwiftDashSDK /// encrypted key to the App Connect system contract. There is no `dash-st:` /// step. /// -/// Everything here is pure; `PlatformDashConnectDataSource` owns the Platform -/// calls and their order. +/// `AppConnect` holds the rules and is pure; `PlatformDashConnectDataSource` +/// owns the Platform calls and their order. The grant records and their +/// `UserDefaults` store are at the end of the file. enum AppConnect { /// The protocol version that registers the App Connect system contract. /// Below it the contract does not exist and the two-QR login is the only @@ -120,6 +121,18 @@ enum AppConnect { .sorted() } + /// Granted session keys the given view of the identity does not contain. + /// Platform never removes a key, it only disables it, so a missing id + /// means the view is out of date — not that the key is gone. A disconnect + /// must stop on these instead of treating them as dealt with. + static func sessionKeyIdsMissing( + from currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + for grants: [AppConnectGrant] + ) -> [UInt32] { + let known = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) + return Set(grants.map(\.sessionKeyId)).subtracting(known).sorted() + } + /// The three values of a `loginKeyResponse`, as hex. struct ResponseValues: Codable, Equatable { let appEphemeralPubKeyHash: String @@ -223,6 +236,14 @@ struct AppConnectGrant: Codable, Equatable { /// response; the record then only waits for that delete. var keyDisabled: Bool? + /// What makes two records the same grant: one session key given for one + /// request. Records are matched on this, never on whole-value equality — + /// `publishedAt` does not survive the store's millisecond round trip bit + /// for bit. + var key: String { + [identityId, appContractId, String(sessionKeyId), values.appEphemeralPubKeyHash].joined(separator: "|") + } + /// Whether there is a response on Platform this record can still delete. var hasDeletableResponse: Bool { documentId != nil && responseDeleted != true @@ -274,31 +295,53 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { } func load() -> [AppConnectGrant] { - guard let storageKey, let data = defaults.data(forKey: storageKey) else { return [] } - do { - return try decoder.decode([AppConnectGrant].self, from: data) - } catch { - // Without the records the keys they named can no longer be told - // apart on the identity. A one-QR row whose records are gone - // refuses to disconnect (`grantRecordsMissing`) instead of - // pretending the key was disabled. - Self.logger.warning( - "AppConnectResponseStore: stored responses could not be decoded: \(error.localizedDescription, privacy: .public)") - return [] - } + readRows().grants } func save(_ grants: [AppConnectGrant]) { guard let storageKey else { return } - guard !grants.isEmpty else { + // Rows this build cannot read are written back untouched: each one is + // the only record of a key on the identity, and dropping it would + // leave that key impossible to find. + let unreadable = readRows().unreadable + guard !grants.isEmpty || !unreadable.isEmpty else { defaults.removeObject(forKey: storageKey) return } do { - defaults.set(try encoder.encode(grants), forKey: storageKey) + let encoded = try grants.map { try JSONSerialization.jsonObject(with: encoder.encode($0)) } + defaults.set( + try JSONSerialization.data(withJSONObject: encoded + unreadable), + forKey: storageKey) } catch { Self.logger.error( - "AppConnectResponseStore: failed to encode responses: \(error.localizedDescription, privacy: .public)") + "AppConnectResponseStore: failed to encode grants: \(error.localizedDescription, privacy: .public)") + } + } + + /// Decodes row by row, like `UserDefaultsDashConnectStore`, so one + /// unreadable row costs one record instead of all of them. + private func readRows() -> (grants: [AppConnectGrant], unreadable: [Any]) { + guard let storageKey, let data = defaults.data(forKey: storageKey) else { return ([], []) } + guard let rows = (try? JSONSerialization.jsonObject(with: data)) as? [Any] else { + Self.logger.error("AppConnectResponseStore: stored value is not a JSON array; left in place") + return ([], []) + } + var grants: [AppConnectGrant] = [] + var unreadable: [Any] = [] + for row in rows { + if JSONSerialization.isValidJSONObject(row), + let rowData = try? JSONSerialization.data(withJSONObject: row), + let grant = try? decoder.decode(AppConnectGrant.self, from: rowData) { + grants.append(grant) + } else { + unreadable.append(row) + } + } + if !unreadable.isEmpty { + Self.logger.warning( + "AppConnectResponseStore: \(unreadable.count, privacy: .public) stored grant(s) could not be read; kept as stored") } + return (grants, unreadable) } } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 842fae7e04..da4d28cd83 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -73,6 +73,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case unsupportedStateTransition(String) case sessionKeyUnusable case grantRecordsMissing + case identityKeysOutOfDate case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -120,6 +121,10 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return "The scanned token purchase targets a different identity." case .tokenPurchaseTokenIdMismatch: return "The scanned token purchase names a token that does not belong to the contract and position it would buy from." + case .identityKeysOutOfDate: + return NSLocalizedString( + "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later.", + comment: "DashConnect") case .grantRecordsMissing: return NSLocalizedString( "This wallet has no record of the key it gave this app, so it cannot turn it off here.", @@ -483,7 +488,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } if AppConnect.isAvailable(protocolVersion: protocolVersion) { Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") - return try await approveAppConnectLogin(request, context: context) + // The PIN prompt can outlast a wallet or identity switch, and this + // path puts a spend-capable key on the identity: sign with what is + // active now, and only if it is still the identity that was shown. + let authorized = try await requireContext() + guard authorized.identityId == context.identityId else { + throw DashConnectPlatformError.noIdentity + } + return try await approveAppConnectLogin(request, context: authorized) } Self.logger.info("🔗 DASHCONNECT :: authorized; deriving login key") @@ -741,7 +753,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse published") updateGrants { grants in - guard let index = grants.firstIndex(of: grant) else { return } + guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } grants[index].documentId = documentId.toBase58String() } return connection @@ -795,7 +807,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) updateGrants { grants in - guard let index = grants.firstIndex(of: grant) else { return } + guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } if grants[index].keyDisabled == true { grants.remove(at: index) } else { @@ -1177,8 +1189,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let currentPublicKeys = try context.wallet .managedIdentity(identityId: context.identityId) .getPublicKeys() + let granted = responseStore.load().filter(isGranted) + guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { + // A granted key the local view does not know cannot be shown to + // be disabled, so nothing is reported as turned off. + throw DashConnectPlatformError.identityKeysOutOfDate + } let keyIds = AppConnect.sessionKeyIdsToDisable( - for: responseStore.load().filter(isGranted), + for: granted, currentIdentityPublicKeys: currentPublicKeys ) if !keyIds.isEmpty { diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift index eb1903b3dc..00ac7e770c 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift @@ -87,11 +87,11 @@ struct ConnectionRow: View { } /// Always reads as on: the row only shows it for an active connection, and - /// only the off direction is reachable from here. Turning it off - /// downgrades the connection back to `.approved`. For a one-QR connection - /// the data source first disables the app's key on the identity, which is - /// what ends the app's access; for a two-QR connection the change is local - /// and the app keeps its keys (see `DashConnectDataSource.disconnect`). + /// only the off direction is reachable from here. What turning it off does + /// depends on the login that made the connection (see + /// `DashConnectDataSource.disconnect`): a one-QR connection has the app's + /// key disabled on the identity and its row removed; a two-QR connection + /// is downgraded to `.approved` locally and the app keeps its keys. private var activeSwitch: some View { ZStack { SwitchView(isOn: .constant(true)) diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index bd2393b1c2..c35f037f15 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1650,6 +1650,53 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertTrue(grant.hasDeletableResponse) } + func testAGrantIsFoundAgainAfterTheStoreRoundTrip() { + // A wall-clock date does not survive the millisecond round trip bit + // for bit, so whole-value equality misses the stored record about + // half the time; the grant key does not depend on the date. + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } + for offset in 0 ..< 200 { + let grant = AppConnectGrant( + identityId: "identity", appContractId: "app", documentId: nil, + values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), + sessionKeyId: 6, totalBudget: nil, expiresAt: nil, + publishedAt: Date(timeIntervalSince1970: 1_791_539_765.792_813 + Double(offset) * 0.000_137)) + store.save([grant]) + XCTAssertEqual(store.load().first?.key, grant.key) + } + } + + func testARowThisBuildCannotReadIsKeptWhenTheStoreIsSaved() throws { + let stored = """ + [{"somethingNewer":true,"sessionKeyId":4}, + {"identityId":"identity","appContractId":"app","documentId":"document", + "values":{"appEphemeralPubKeyHash":"aa","walletEphemeralPubKey":"bb","encryptedPayload":"cc"}, + "sessionKeyId":6,"publishedAt":1791539765792}] + """ + defaults.set(Data(stored.utf8), forKey: "scope.app-connect-responses.v1") + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } + + XCTAssertEqual(store.load().map(\.sessionKeyId), [6]) + store.save(store.load() + [Self.grant(sessionKeyId: 7)]) + XCTAssertEqual(store.load().map(\.sessionKeyId), [6, 7]) + + let rows = try XCTUnwrap( + JSONSerialization.jsonObject( + with: try XCTUnwrap(defaults.data(forKey: "scope.app-connect-responses.v1"))) as? [[String: Any]]) + XCTAssertEqual(rows.filter { $0["somethingNewer"] as? Bool == true }.count, 1) + + // Clearing the readable grants must not clear the unreadable row. + store.save([]) + XCTAssertNotNil(defaults.data(forKey: "scope.app-connect-responses.v1")) + } + + func testAGrantedKeyMissingFromTheIdentityViewIsReportedNotAssumedGone() { + let grants = [9, 13].map { Self.grant(sessionKeyId: $0) } + let keys = [Self.key(keyId: 9, data: Data([9]), disabledAt: 1)] + XCTAssertEqual(AppConnect.sessionKeyIdsMissing(from: keys, for: grants), [13]) + XCTAssertEqual(AppConnect.sessionKeyIdsMissing(from: keys, for: [grants[0]]), []) + } + func testAGrantHasNothingToDeleteBeforeItIsPublishedOrAfterItsResponseIsGone() { var grant = Self.grant(sessionKeyId: 6) XCTAssertTrue(grant.hasDeletableResponse) From cc1a9701d3e07d1db3b638fc7032eaeb35b52591 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 12 Oct 2026 12:25:47 +0300 Subject: [PATCH 005/108] fix(dashpay): decide one-QR key and response state from Platform The wallet decided whether to add or disable a session key from the SDK's local copy of the identity, which is only replaced when an identity update returns success. It now reloads the identity before both decisions. A publish or a delete of the response can land without confirming. A refused publish is now looked up and adopted with the values that are on Platform, a failed delete is checked against Platform, and a disconnect no longer drops the record of a response whose publish never confirmed. Also: - a response deleted by a later login is published again when its own request comes back, instead of being reported as already published; - a connection stays while the app holds a key on another identity of the wallet, and a disconnect from an identity that gave it none says so; - a login does not start when the grant store cannot save; - records left by a disconnect are retried by the next login with the same identity. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 88 +++++- .../DashConnect/DashConnectDataSource.swift | 3 +- .../PlatformDashConnectDataSource.swift | 253 ++++++++++++++---- .../PlatformDashConnectDataSourceTests.swift | 78 +++++- 4 files changed, 354 insertions(+), 68 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 5996505ba4..c3f791bc5f 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -133,6 +133,63 @@ enum AppConnect { return Set(grants.map(\.sessionKeyId)).subtracting(known).sorted() } + /// The query for one identity's response to one request, in the order of + /// the contract's only index. A byte-array value travels as base64. + static func responseLookupWhereClause(appEphemeralPubKeyHash: Data, ownerIdentityId: Data) -> String { + """ + [["appEphemeralPubKeyHash","==","\(appEphemeralPubKeyHash.base64EncodedString())"],\ + ["$ownerId","==","\(ownerIdentityId.toBase58String())"]] + """ + } + + /// The values of a response read back from Platform, or `nil` when the + /// document is not the response to `appEphemeralPubKeyHash` or cannot be + /// read. A delete has to carry the values that are on Platform, and those + /// are this wallet's own only when it recorded them before publishing. + /// + /// The SDK returns a byte field as base64 text. An array of numbers and + /// hex text are read as well, so a change of that encoding does not turn + /// every lookup into a failure. + static func responseValues( + fromDocument document: [String: Any], + appEphemeralPubKeyHash: Data + ) -> ResponseValues? { + func field(_ name: String) -> Any? { + document[name] ?? (document["properties"] as? [String: Any])?[name] + } + func bytes(_ value: Any?, _ decode: (String) -> Data?) -> Data? { + if let text = value as? String { return decode(text) } + guard let numbers = value as? [Int], numbers.allSatisfy({ (0 ... 255).contains($0) }) else { return nil } + return Data(numbers.map(UInt8.init)) + } + let decoders: [(String) -> Data?] = [{ Data(base64Encoded: $0) }, { data(fromHex: $0) }] + for decode in decoders { + guard bytes(field("appEphemeralPubKeyHash"), decode) == appEphemeralPubKeyHash, + let walletEphemeralPubKey = bytes(field("walletEphemeralPubKey"), decode), + walletEphemeralPubKey.count == 33, + let encryptedPayload = bytes(field("encryptedPayload"), decode), + (60 ... 572).contains(encryptedPayload.count) else { continue } + return ResponseValues( + appEphemeralPubKeyHash: appEphemeralPubKeyHash.toHexString(), + walletEphemeralPubKey: walletEphemeralPubKey.toHexString(), + encryptedPayload: encryptedPayload.toHexString()) + } + return nil + } + + static func data(fromHex hex: String) -> Data? { + guard hex.count.isMultiple(of: 2) else { return nil } + var data = Data(capacity: hex.count / 2) + var index = hex.startIndex + while index < hex.endIndex { + let next = hex.index(index, offsetBy: 2) + guard let byte = UInt8(hex[index ..< next], radix: 16) else { return nil } + data.append(byte) + index = next + } + return data + } + /// The three values of a `loginKeyResponse`, as hex. struct ResponseValues: Codable, Equatable { let appEphemeralPubKeyHash: String @@ -222,18 +279,20 @@ struct AppConnectGrant: Codable, Equatable { /// before publishing, so a publish whose outcome is unknown still leaves /// a key that can be disabled. var documentId: String? - let values: AppConnect.ResponseValues + /// Replaced only by values read back from Platform. + var values: AppConnect.ResponseValues let sessionKeyId: UInt32 - /// `nil` when the key was found already registered and its limits were - /// not read back. + /// The limits the key was registered with; `nil` for one without. let totalBudget: UInt64? let expiresAt: UInt64? let publishedAt: Date - /// Set once the response was deleted from Platform while the key stays - /// live (a later login to the same app). Absent means not deleted. + /// Set once the response is known to be gone from Platform while the key + /// stays live: deleted by a later login to the same app, or never there + /// after a publish that did not land. Absent means not known to be gone. var responseDeleted: Bool? - /// Set once a disconnect disabled the key but could not delete the - /// response; the record then only waits for that delete. + /// Set once a disconnect disabled the key while its response could not + /// be deleted, or could not be shown to be absent; the record then only + /// waits for that. var keyDisabled: Bool? /// What makes two records the same grant: one session key given for one @@ -248,13 +307,26 @@ struct AppConnectGrant: Codable, Equatable { var hasDeletableResponse: Bool { documentId != nil && responseDeleted != true } + + /// A publish was started and never confirmed: the response may be on + /// Platform or not. + var hasUnconfirmedResponse: Bool { + documentId == nil && responseDeleted != true + } } protocol AppConnectResponseStore { + /// Whether `save` keeps anything. A login must not register a key the + /// store cannot record: nothing could find that key again. + var canPersist: Bool { get } func load() -> [AppConnectGrant] func save(_ grants: [AppConnectGrant]) } +extension AppConnectResponseStore { + var canPersist: Bool { true } +} + /// Wallet- and network-scoped, like `UserDefaultsDashConnectStore`, whose /// scope it borrows. Nothing stored is secret: the values are public on /// chain and the key ids are visible on the identity. @@ -294,6 +366,8 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { scopeKeyProvider().map { "\($0).app-connect-responses.v1" } } + var canPersist: Bool { storageKey != nil } + func load() -> [AppConnectGrant] { readRows().grants } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index d8c3823225..c60f51236e 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -39,7 +39,8 @@ protocol DashConnectDataSource { /// Turns a connection off. For a one-QR connection this disables the key /// the app was given on the identity and deletes the published response, /// and throws when the key could not be disabled — the connection then - /// stays as it was. For a two-QR connection it only changes the local + /// stays as it was. The connection also stays, without an error, while + /// the app holds a key on another identity of the wallet. For a two-QR connection it only changes the local /// status: that login derives the same key every time and Platform never /// re-adds a disabled key, so disabling it would lock the app out for good. func disconnect(id: String) async throws diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index da4d28cd83..873afc6486 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -74,6 +74,8 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case sessionKeyUnusable case grantRecordsMissing case identityKeysOutOfDate + case grantOnAnotherIdentity + case grantStoreUnavailable case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -125,6 +127,12 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later.", comment: "DashConnect") + case .grantOnAnotherIdentity: + return NSLocalizedString( + "This app has a key on another identity of this wallet. Switch to that identity to turn it off.", + comment: "DashConnect") + case .grantStoreUnavailable: + return "This wallet cannot record the key it would give the app, so the sign-in was not started." case .grantRecordsMissing: return NSLocalizedString( "This wallet has no record of the key it gave this app, so it cannot turn it off here.", @@ -619,6 +627,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { throw DashConnectPlatformError.loginContractUnavailable } + guard responseStore.canPersist else { + throw DashConnectPlatformError.grantStoreUnavailable + } let requestId = AppConnect.requestId(appEphemeralPubKey: request.appEphemeralPubKey) // `deriveConnectKey` is main-actor isolated in the SDK. Only the two @@ -647,13 +658,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let appContractId = request.contractId.toBase58String() let requestHash = sealed.appEphemeralPubKeyHash.toHexString() let signer = KeychainSigner(modelContainer: context.modelContainer) - // TODO(app-connect-stale-keys): this is the SDK's local view of the - // identity, refreshed only when an identity update returns success. A - // registration that landed but whose wait failed is not in it, and - // approving the same QR then tries to add the key a second time. - let currentPublicKeys = try context.wallet - .managedIdentity(identityId: context.identityId) - .getPublicKeys() + let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) let sessionKeyId: UInt32 var totalBudget: UInt64? @@ -668,6 +673,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { case .usable(let keyId): Self.logger.info("🔗 DASHCONNECT :: session key already registered") sessionKeyId = keyId + let registered = currentPublicKeys.first { UInt32(bitPattern: $0.keyId) == keyId } + totalBudget = registered?.totalBudget + expiresAt = registered?.expiresAt.map { UInt64(max(0, $0)) } case .absent: let keyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) let budget = AppConnect.sessionKeyBudgetCredits @@ -727,15 +735,21 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { current.append(connection) persistAndSend(current) - guard grant.documentId == nil else { + // A response deleted by a later login to this app is published again + // when its own request comes back. + guard !grant.hasDeletableResponse else { Self.logger.info("🔗 DASHCONNECT :: response already published for this request") return connection } + // Besides this app's earlier responses, this takes whatever an earlier + // disconnect of any app left behind for this identity: its row is + // gone, so a login is the only moment left to finish that cleanup. await deleteAppConnectResponses( where: { - $0.identityId == identityId && $0.appContractId == appContractId - && $0.values.appEphemeralPubKeyHash != requestHash + guard $0.identityId == identityId else { return false } + return $0.keyDisabled == true + || ($0.appContractId == appContractId && $0.values.appEphemeralPubKeyHash != requestHash) }, responseContractId: responseContractId, context: context, @@ -743,22 +757,75 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) Self.logger.info("🔗 DASHCONNECT :: publishing loginKeyResponse") - let (documentId, _) = try await context.wallet.createDocument( - ownerIdentityId: context.identityId, - contractId: responseContractId, - documentType: AppConnect.documentType, - propertiesJSON: try grant.values.propertiesJSON(), - signer: signer - ) - Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse published") + let documentId: Data + var publishedValues = grant.values + do { + (documentId, _) = try await context.wallet.createDocument( + ownerIdentityId: context.identityId, + contractId: responseContractId, + documentType: AppConnect.documentType, + propertiesJSON: try grant.values.propertiesJSON(), + signer: signer + ) + Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse published") + } catch { + // A publish can land without confirming, and the response is + // unique per request and identity, so the retry is then refused. + // If the response is there, this login is complete; if it is not, + // or that cannot be told, the failure stands. + guard let published = try? await findAppConnectResponse( + ownerIdentityId: context.identityId, + appEphemeralPubKeyHash: sealed.appEphemeralPubKeyHash, + responseContractId: responseContractId, + sdk: context.sdk + ) else { + throw error + } + Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse was already published") + documentId = published.documentId + publishedValues = published.values + } updateGrants { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } grants[index].documentId = documentId.toBase58String() + grants[index].values = publishedValues + grants[index].responseDeleted = nil } return connection } + /// This identity's response to one request, with the values it has on + /// Platform, or `nil` when there is none; a failed lookup or a response + /// that cannot be read throws. + private func findAppConnectResponse( + ownerIdentityId: Data, + appEphemeralPubKeyHash: Data, + responseContractId: Data, + sdk: SDK + ) async throws -> (documentId: Data, values: AppConnect.ResponseValues)? { + let response = try await sdk.documentList( + dataContractId: responseContractId.toBase58String(), + documentType: AppConnect.documentType, + whereClause: AppConnect.responseLookupWhereClause( + appEphemeralPubKeyHash: appEphemeralPubKeyHash, + ownerIdentityId: ownerIdentityId + ), + limit: 1 + ) + guard let documents = response["documents"] as? [[String: Any]] else { + throw DashConnectPlatformError.existingDocumentLookupFailed + } + guard let document = documents.first else { return nil } + guard let id = document["$id"] as? String, + let identifier = Self.decodeIdentifier(id), identifier.count == 32, + let values = AppConnect.responseValues( + fromDocument: document, appEphemeralPubKeyHash: appEphemeralPubKeyHash) else { + throw DashConnectPlatformError.existingDocumentLookupFailed + } + return (identifier, values) + } + /// Reads, changes and writes the grant records in one step with no /// suspension point in between, so an approval and a disconnect that /// overlap cannot write a stale copy over each other's change. @@ -772,8 +839,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// Deletes, by their original values, the responses of the matching /// grants that are still on Platform. Best effort: a response that cannot - /// be deleted now stays recorded and is tried again by the next login or - /// disconnect. It does not hold the caller back — the entry it leaves is + /// be deleted now stays recorded and is tried again by the next login + /// with this identity. It does not hold the caller back — the entry it leaves is /// the encrypted key of a request the app has already finished with. /// /// A grant whose key is still live keeps its record, marked as having no @@ -786,6 +853,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { context: Context, signer: KeychainSigner ) async { + await resolveUnconfirmedAppConnectResponses( + where: matches, responseContractId: responseContractId, context: context) let pending = responseStore.load().filter { matches($0) && $0.hasDeletableResponse } for grant in pending { do { @@ -806,17 +875,73 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signingKeyId: signingKeyId, signer: signer ) + markAppConnectResponseGone(grant) + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: previous loginKeyResponse not deleted — \(error.localizedDescription, privacy: .public)") + // A delete can land without confirming, and every retry is + // then refused because there is nothing left to delete. Only + // Platform can say which failure this was. + guard let hash = AppConnect.data(fromHex: grant.values.appEphemeralPubKeyHash) else { continue } + do { + let remaining = try await findAppConnectResponse( + ownerIdentityId: context.identityId, + appEphemeralPubKeyHash: hash, + responseContractId: responseContractId, + sdk: context.sdk + ) + if remaining == nil { markAppConnectResponseGone(grant) } + } catch { + continue + } + } + } + } + + /// Records that a grant has no response on Platform any more. The record + /// of a live key stays, because it is what lets a disconnect find that + /// key; the record of a disabled key has no further use. + private func markAppConnectResponseGone(_ grant: AppConnectGrant) { + updateGrants { grants in + guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } + if grants[index].keyDisabled == true { + grants.remove(at: index) + } else { + grants[index].responseDeleted = true + } + } + } + + /// Settles the matching grants whose publish never confirmed, by asking + /// Platform. A response that is there gets its id and its values on + /// Platform, so it can be deleted; one that is not there needs nothing + /// more. A lookup that fails leaves the record as it is for the next try. + private func resolveUnconfirmedAppConnectResponses( + where matches: (AppConnectGrant) -> Bool, + responseContractId: Data, + context: Context + ) async { + for grant in responseStore.load() where matches(grant) && grant.hasUnconfirmedResponse { + guard let hash = AppConnect.data(fromHex: grant.values.appEphemeralPubKeyHash) else { continue } + do { + let published = try await findAppConnectResponse( + ownerIdentityId: context.identityId, + appEphemeralPubKeyHash: hash, + responseContractId: responseContractId, + sdk: context.sdk + ) + guard let published else { + markAppConnectResponseGone(grant) + continue + } updateGrants { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } - if grants[index].keyDisabled == true { - grants.remove(at: index) - } else { - grants[index].responseDeleted = true - } + grants[index].documentId = published.documentId.toBase58String() + grants[index].values = published.values } } catch { Self.logger.error( - "🔗 DASHCONNECT :: previous loginKeyResponse not deleted — \(error.localizedDescription, privacy: .public)") + "🔗 DASHCONNECT :: unconfirmed loginKeyResponse not resolved — \(error.localizedDescription, privacy: .public)") } } } @@ -1126,7 +1251,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let isOneQR = subject.value.first { $0.id == id }?.loginKind == .oneQR let hasGrants = responseStore.load().contains { $0.appContractId == id } if isOneQR || hasGrants { - try await revokeAppConnectGrants(appContractId: id, requiresGrants: isOneQR) + let liveElsewhere = try await revokeAppConnectGrants(appContractId: id, requiresGrants: isOneQR) + // The row stands for the app, and the app still holds a key on + // another identity of this wallet. That key can only be disabled + // while its identity is the active one, so the row stays to get + // there; this identity's key is off. + if liveElsewhere { return } } if isOneQR { // Nothing is left of a one-QR connection once its key is disabled: @@ -1158,20 +1288,30 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// /// The key goes first because it is what the app signs with. A response /// that could not be deleted afterwards stays recorded, with its key - /// marked disabled, and is retried by the next login or disconnect. + /// marked disabled, and is retried by the next login with this identity. + /// + /// Returns whether the app still has a live key on another identity of + /// this wallet. When this identity gave it none, that is thrown instead: + /// nothing was turned off. /// /// `requiresGrants` is set for a row made by the one-QR login: finding no /// record for it means the key cannot be identified, and that is an error /// rather than a silent success. - private func revokeAppConnectGrants(appContractId: String, requiresGrants: Bool) async throws { + private func revokeAppConnectGrants(appContractId: String, requiresGrants: Bool) async throws -> Bool { var context = try await requireContext() let identityId = context.identityId.toBase58String() func isGranted(_ grant: AppConnectGrant) -> Bool { grant.identityId == identityId && grant.appContractId == appContractId } + func hasLiveGrantElsewhere() -> Bool { + responseStore.load().contains { + $0.appContractId == appContractId && $0.identityId != identityId && $0.keyDisabled != true + } + } guard responseStore.load().contains(where: isGranted) else { + if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } if requiresGrants { throw DashConnectPlatformError.grantRecordsMissing } - return + return false } try await authorize() @@ -1183,16 +1323,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } let signer = KeychainSigner(modelContainer: context.modelContainer) - // TODO(app-connect-stale-keys): the SDK's local view of the identity; - // a disable that landed but whose wait failed is not in it, and the - // retry is then refused by Platform until the view refreshes. - let currentPublicKeys = try context.wallet - .managedIdentity(identityId: context.identityId) - .getPublicKeys() + let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) let granted = responseStore.load().filter(isGranted) guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { - // A granted key the local view does not know cannot be shown to - // be disabled, so nothing is reported as turned off. + // Platform never removes a key, so the node that answered is + // behind. A key it does not know cannot be shown to be disabled, + // so nothing is reported as turned off. throw DashConnectPlatformError.identityKeysOutOfDate } let keyIds = AppConnect.sessionKeyIdsToDisable( @@ -1209,22 +1345,26 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: session key(s) disabled") } - // Every key of this app is now off. Records with nothing left to - // delete are done; the rest wait for their response to go. + // Every key this identity gave the app is now off. Records whose + // response is known to be gone are done; the rest wait for their + // response to be deleted, or to be found if its publish never + // confirmed. updateGrants { grants in - grants.removeAll { isGranted($0) && !$0.hasDeletableResponse } + grants.removeAll { isGranted($0) && $0.responseDeleted == true } for index in grants.indices where isGranted(grants[index]) { grants[index].keyDisabled = true } } - guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { return } - await deleteAppConnectResponses( - where: isGranted, - responseContractId: responseContractId, - context: context, - signer: signer - ) + if let responseContractId = Self.decodeIdentifier(AppConnect.contractId) { + await deleteAppConnectResponses( + where: isGranted, + responseContractId: responseContractId, + context: context, + signer: signer + ) + } + return hasLiveGrantElsewhere() } static func buildLoginKeyResponseDraft( @@ -1577,6 +1717,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } + /// The identity's keys as Platform has them now. The SDK's own copy is + /// only replaced when an identity update returns success, so a + /// registration or a disable that landed without confirming is missing + /// from it; deciding from that copy would add the key twice or disable it + /// twice. The reload also replaces the copy the SDK signs the next update + /// against. + private func refreshedIdentityPublicKeys( + context: Context + ) async throws -> [ManagedIdentity.IdentityPublicKeyInfo] { + guard try await context.wallet.loadIdentity(atIndex: context.identityIndex) == context.identityId else { + throw DashConnectPlatformError.noIdentity + } + return try context.wallet + .managedIdentity(identityId: context.identityId) + .getPublicKeys() + } + private func requireContext() async throws -> Context { let runtime = await MainActor.run { ( diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index c35f037f15..e4e0eef42c 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1452,6 +1452,20 @@ private enum PurchaseSpyError: LocalizedError { } final class AppConnectLoginTests: XCTestCase { + func testResponseLookupQueriesTheIndexInOrderWithBase64Hash() throws { + let hash = Data(repeating: 0xAB, count: 20) + let owner = Data(repeating: 0x01, count: 32) + + let clause = AppConnect.responseLookupWhereClause(appEphemeralPubKeyHash: hash, ownerIdentityId: owner) + + let parsed = try XCTUnwrap( + JSONSerialization.jsonObject(with: Data(clause.utf8)) as? [[String]]) + XCTAssertEqual(parsed, [ + ["appEphemeralPubKeyHash", "==", hash.base64EncodedString()], + ["$ownerId", "==", owner.toBase58String()], + ]) + } + private var defaults: UserDefaults! private var suiteName: String! @@ -1650,20 +1664,60 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertTrue(grant.hasDeletableResponse) } - func testAGrantIsFoundAgainAfterTheStoreRoundTrip() { - // A wall-clock date does not survive the millisecond round trip bit - // for bit, so whole-value equality misses the stored record about - // half the time; the grant key does not depend on the date. + func testASavedGrantIsLoadedWithTheSameKey() { let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } - for offset in 0 ..< 200 { - let grant = AppConnectGrant( - identityId: "identity", appContractId: "app", documentId: nil, - values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), - sessionKeyId: 6, totalBudget: nil, expiresAt: nil, - publishedAt: Date(timeIntervalSince1970: 1_791_539_765.792_813 + Double(offset) * 0.000_137)) - store.save([grant]) - XCTAssertEqual(store.load().first?.key, grant.key) + let grant = AppConnectGrant( + identityId: "identity", appContractId: "app", documentId: nil, + values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), + sessionKeyId: 6, totalBudget: nil, expiresAt: nil, + publishedAt: Date(timeIntervalSince1970: 1_791_539_765.792_813)) + store.save([grant]) + + XCTAssertEqual(store.load().first?.key, grant.key) + } + + func testAStoreWithoutAScopeCannotPersist() { + XCTAssertTrue( + UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" }.canPersist) + XCTAssertFalse( + UserDefaultsAppConnectResponseStore(defaults: defaults, network: .devnet) { nil }.canPersist) + } + + func testResponseValuesAreReadBackFromNumbersBase64AndHex() { + let hash = Data(repeating: 0xAB, count: 20) + let walletKey = Data([0x02] + [UInt8](repeating: 0x11, count: 32)) + let payload = Data(repeating: 0x22, count: 60) + let expected = AppConnect.ResponseValues( + appEphemeralPubKeyHash: hash.toHexString(), + walletEphemeralPubKey: walletKey.toHexString(), + encryptedPayload: payload.toHexString()) + let encodings: [(Data) -> Any] = [ + { $0.map(Int.init) }, { $0.base64EncodedString() }, { $0.toHexString() }, + ] + for encode in encodings { + let document: [String: Any] = [ + "$id": "id", + "appEphemeralPubKeyHash": encode(hash), + "walletEphemeralPubKey": encode(walletKey), + "encryptedPayload": encode(payload), + ] + XCTAssertEqual( + AppConnect.responseValues(fromDocument: document, appEphemeralPubKeyHash: hash), expected) + XCTAssertNil( + AppConnect.responseValues( + fromDocument: document, appEphemeralPubKeyHash: Data(repeating: 0xCD, count: 20))) } + XCTAssertNil(AppConnect.responseValues(fromDocument: ["$id": "id"], appEphemeralPubKeyHash: hash)) + } + + func testAnUnconfirmedResponseIsNeitherDeletableNorKnownGone() { + var grant = Self.grant(sessionKeyId: 6) + grant.documentId = nil + XCTAssertTrue(grant.hasUnconfirmedResponse) + XCTAssertFalse(grant.hasDeletableResponse) + + grant.responseDeleted = true + XCTAssertFalse(grant.hasUnconfirmedResponse) } func testARowThisBuildCannotReadIsKeptWhenTheStoreIsSaved() throws { From 09a28c55140ed7acc7e62565a2776721282796f2 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 12 Oct 2026 21:41:45 +0300 Subject: [PATCH 006/108] fix(dashpay): disconnect also disables one-QR keys the wallet has no record of A reinstalled wallet has no grant records, so disconnect left the app's earlier session keys live. Disconnect now also takes the live keys on the active identity that the wallet's key store shows bound to the app's contract and that are shaped as this login registers them (AUTHENTICATION, HIGH, ECDSA_HASH160, with a budget and an expiry). - Stops with an error when a live session key cannot be placed, or when a stored key of the app's is missing from the fetched key list. - Disables at most 10 keys per identity update, the consensus limit. - A one-QR row with no record no longer fails; the identity is checked. Not covered: the response behind a key with no record stays on Platform, and a key on a non-active identity with no record is not seen. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 121 ++++++++++++++-- .../PlatformDashConnectDataSource.swift | 129 +++++++++++++---- .../PlatformDashConnectDataSourceTests.swift | 132 +++++++++++++++++- 3 files changed, 338 insertions(+), 44 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index c3f791bc5f..ec273d0c77 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -101,26 +101,119 @@ enum AppConnect { ) } - /// The session keys behind `grants` that can still sign: the ones a - /// disconnect has to disable. A key that is gone, already disabled, or no - /// longer the kind of key this login registers is left alone. + /// What the wallet's store of identity keys says about one key: its + /// payload, whether it is disabled there, and the contract it is bound to + /// when the bound is a whole single contract. The fetched key list + /// carries no bounds, so for a key without a grant record this is where + /// its app is read from. + struct KeyBinding: Equatable { + let keyId: UInt32 + let data: Data + let singleContractId: Data? + var isDisabled = false + /// The stored key has the type, purpose, level and limits of a key + /// this login registers. + var isSessionKeyShaped = false + /// The store has a bound for the key that this build cannot read, so + /// the key's app is unknown rather than "another one". + var hasUnreadableBound = false + } + + /// The most keys one identity update may disable (Platform consensus). + static let maxKeysDisabledPerUpdate = 10 + + /// Whether the store's bound for a key says which contract, if any, the + /// key is bound to: no bound (0), a 32-byte single contract (1), a + /// document type (2) or a contract group (3). + static func isReadableBound(boundsKind: Int, boundIds: [Data]?) -> Bool { + switch boundsKind { + case 0, 2, 3: return true + case 1: return boundIds?.first?.count == 32 + default: return false + } + } + + /// The contract a stored key is bound to as a whole. `boundsKind` is the + /// store's discriminant: 1 is a single contract; a document-type bound + /// (2), a contract group (3) and no bound (0) give nil. + static func singleContractId(boundsKind: Int, boundIds: [Data]?) -> Data? { + guard boundsKind == 1, let id = boundIds?.first, id.count == 32 else { return nil } + return id + } + + private static func isLiveSessionKey(_ key: ManagedIdentity.IdentityPublicKeyInfo) -> Bool { + key.keyType == .ecdsaHash160 + && key.purpose == .authentication + && key.securityLevel == .high + && key.disabledAt == nil + } + + /// The keys a disconnect has to disable: the live ones behind `grants`, + /// plus every live key of the same kind that `bindings` shows bound to + /// `appContractId` and that carries a budget and an expiry, as every key + /// this login registers does. That covers the keys a reinstalled wallet + /// has no grant record for. A key that is gone, already disabled, or of + /// another shape is left alone, including one another wallet gave the + /// app with a document-type bound, a single limit or another key type. static func sessionKeyIdsToDisable( for grants: [AppConnectGrant], + appContractId: Data, + bindings: [KeyBinding], currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] ) -> [UInt32] { let granted = Set(grants.map(\.sessionKeyId)) return currentIdentityPublicKeys - .filter { - granted.contains(UInt32(bitPattern: $0.keyId)) - && $0.keyType == .ecdsaHash160 - && $0.purpose == .authentication - && $0.securityLevel == .high - && $0.disabledAt == nil + .filter { key in + guard isLiveSessionKey(key) else { return false } + let keyId = UInt32(bitPattern: key.keyId) + if granted.contains(keyId) { return true } + guard key.totalBudget != nil, key.expiresAt != nil else { return false } + return bindings.contains { + $0.keyId == keyId && $0.data == key.data && $0.singleContractId == appContractId + } } .map { UInt32(bitPattern: $0.keyId) } .sorted() } + /// Live session keys whose bound contract is unknown: not behind + /// `grants`, and either absent from `bindings` or stored with a bound + /// that cannot be read. Any of them could belong to the app being + /// disconnected, so a disconnect must stop on these instead of reporting + /// every key as turned off. + static func sessionKeyIdsWithUnknownBinding( + for grants: [AppConnectGrant], + bindings: [KeyBinding], + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> [UInt32] { + let granted = Set(grants.map(\.sessionKeyId)) + return currentIdentityPublicKeys + .filter { key in + guard isLiveSessionKey(key) else { return false } + let keyId = UInt32(bitPattern: key.keyId) + return !granted.contains(keyId) && !bindings.contains { + $0.keyId == keyId && $0.data == key.data && !$0.hasUnreadableBound + } + } + .map { UInt32(bitPattern: $0.keyId) } + .sorted() + } + + /// Keys the store holds as live and bound to `appContractId` that the + /// given view of the identity does not contain. As with a missing granted + /// key, the view is out of date and a disconnect must stop. + static func boundKeyIdsMissing( + from currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + appContractId: Data, + bindings: [KeyBinding] + ) -> [UInt32] { + let known = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) + return bindings + .filter { $0.singleContractId == appContractId && !$0.isDisabled && !known.contains($0.keyId) } + .map(\.keyId) + .sorted() + } + /// Granted session keys the given view of the identity does not contain. /// Platform never removes a key, it only disables it, so a missing id /// means the view is out of date — not that the key is gone. A disconnect @@ -269,8 +362,8 @@ enum AppConnect { /// /// The response type is index-only on Platform: there is no lookup by app and /// a delete has to carry the original values, so this record is the only way -/// back to the entry — and the only place that knows which key on the -/// identity belongs to which app. +/// back to the entry. It also names the key; without it a disconnect finds +/// the key by its contract bound, and the entry not at all. struct AppConnectGrant: Codable, Equatable { /// Base58 ids. let identityId: String @@ -317,7 +410,7 @@ struct AppConnectGrant: Codable, Equatable { protocol AppConnectResponseStore { /// Whether `save` keeps anything. A login must not register a key the - /// store cannot record: nothing could find that key again. + /// store cannot record: its response could not be found again. var canPersist: Bool { get } func load() -> [AppConnectGrant] func save(_ grants: [AppConnectGrant]) @@ -375,8 +468,8 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { func save(_ grants: [AppConnectGrant]) { guard let storageKey else { return } // Rows this build cannot read are written back untouched: each one is - // the only record of a key on the identity, and dropping it would - // leave that key impossible to find. + // the only record of a response on Platform, and dropping it would + // leave that response impossible to find. let unreadable = readRows().unreadable guard !grants.isEmpty || !unreadable.isEmpty else { defaults.removeObject(forKey: storageKey) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 873afc6486..afacd706fa 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -72,7 +72,6 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case tokenPurchaseTokenIdMismatch case unsupportedStateTransition(String) case sessionKeyUnusable - case grantRecordsMissing case identityKeysOutOfDate case grantOnAnotherIdentity case grantStoreUnavailable @@ -133,10 +132,6 @@ enum DashConnectPlatformError: LocalizedError, Equatable { comment: "DashConnect") case .grantStoreUnavailable: return "This wallet cannot record the key it would give the app, so the sign-in was not started." - case .grantRecordsMissing: - return NSLocalizedString( - "This wallet has no record of the key it gave this app, so it cannot turn it off here.", - comment: "DashConnect") case .sessionKeyUnusable: return NSLocalizedString( "This sign-in request can no longer be approved. Ask the app for a new code.", @@ -844,9 +839,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// the encrypted key of a request the app has already finished with. /// /// A grant whose key is still live keeps its record, marked as having no - /// response left, because the record is what lets a later disconnect find - /// and disable that key. A grant whose key is already disabled has no - /// further use and is dropped. + /// response left: a later disconnect picks the keys it has records for + /// without looking their app up in the wallet's key store. A grant whose + /// key is already disabled has no further use and is dropped. private func deleteAppConnectResponses( where matches: (AppConnectGrant) -> Bool, responseContractId: Data, @@ -899,8 +894,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } /// Records that a grant has no response on Platform any more. The record - /// of a live key stays, because it is what lets a disconnect find that - /// key; the record of a disabled key has no further use. + /// of a live key stays for a disconnect to disable that key by; the + /// record of a disabled key has no further use. private func markAppConnectResponseGone(_ grant: AppConnectGrant) { updateGrants { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } @@ -1251,7 +1246,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let isOneQR = subject.value.first { $0.id == id }?.loginKind == .oneQR let hasGrants = responseStore.load().contains { $0.appContractId == id } if isOneQR || hasGrants { - let liveElsewhere = try await revokeAppConnectGrants(appContractId: id, requiresGrants: isOneQR) + let liveElsewhere = try await revokeAppConnectGrants(appContractId: id, checksUnrecordedKeys: isOneQR) // The row stands for the app, and the app still holds a key on // another identity of this wallet. That key can only be disabled // while its identity is the active one, so the row stays to get @@ -1290,14 +1285,26 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// that could not be deleted afterwards stays recorded, with its key /// marked disabled, and is retried by the next login with this identity. /// - /// Returns whether the app still has a live key on another identity of - /// this wallet. When this identity gave it none, that is thrown instead: - /// nothing was turned off. + /// The keys are the ones recorded here plus the live keys on the identity + /// that are bound to the app's contract and shaped as this login + /// registers them, so the keys a reinstalled wallet kept no record of go + /// too. A key another wallet gave the app in a different shape stays. + /// TODO(app-connect-orphan-responses): the response behind a key with no + /// record stays on Platform. It can only be found by its request hash, + /// which the record held. /// - /// `requiresGrants` is set for a row made by the one-QR login: finding no - /// record for it means the key cannot be identified, and that is an error - /// rather than a silent success. - private func revokeAppConnectGrants(appContractId: String, requiresGrants: Bool) async throws -> Bool { + /// Returns whether a grant record shows the app with a live key on + /// another identity of this wallet. When this identity gave it none, that + /// is thrown instead: nothing was turned off. + /// TODO(app-connect-other-identity-keys): a key on another identity that + /// has no grant record is not seen, so the row can go while that key is + /// live. Only the active identity's keys are looked up. + /// + /// `checksUnrecordedKeys` is set for a row made by the one-QR login: with + /// no record for this identity the keys are still looked for on it. When + /// it holds none bound to the app, there was nothing to turn off here and + /// the call returns without an error. + private func revokeAppConnectGrants(appContractId: String, checksUnrecordedKeys: Bool) async throws -> Bool { var context = try await requireContext() let identityId = context.identityId.toBase58String() func isGranted(_ grant: AppConnectGrant) -> Bool { @@ -1308,10 +1315,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { $0.appContractId == appContractId && $0.identityId != identityId && $0.keyDisabled != true } } - guard responseStore.load().contains(where: isGranted) else { - if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } - if requiresGrants { throw DashConnectPlatformError.grantRecordsMissing } - return false + guard let appContract = Self.decodeIdentifier(appContractId) else { + throw DashConnectPlatformError.loginContractUnavailable + } + if !responseStore.load().contains(where: isGranted) { + // Before the PIN prompt, from the store alone: whether this + // identity holds a key of the app's that has no record. + let holdsUnrecordedKey = try checksUnrecordedKeys && Self + .storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + .contains { $0.singleContractId == appContract && !$0.isDisabled && $0.isSessionKeyShaped } + if !holdsUnrecordedKey { + if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } + if !checksUnrecordedKeys { return false } + } } try await authorize() @@ -1331,17 +1347,43 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // so nothing is reported as turned off. throw DashConnectPlatformError.identityKeysOutOfDate } + let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + guard AppConnect.sessionKeyIdsWithUnknownBinding( + for: granted, + bindings: bindings, + currentIdentityPublicKeys: currentPublicKeys + ).isEmpty, AppConnect.boundKeyIdsMissing( + from: currentPublicKeys, + appContractId: appContract, + bindings: bindings + ).isEmpty else { + // A live session key the wallet's store cannot place may be this + // app's, and a stored key of the app's that the fetched list + // lacks means the list is behind. Either way nothing is reported + // as turned off. + throw DashConnectPlatformError.identityKeysOutOfDate + } let keyIds = AppConnect.sessionKeyIdsToDisable( for: granted, + appContractId: appContract, + bindings: bindings, currentIdentityPublicKeys: currentPublicKeys ) + if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() { + throw DashConnectPlatformError.grantOnAnotherIdentity + } if !keyIds.isEmpty { Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) session key(s)") - try await context.wallet.updateIdentity( - identityId: context.identityId, - disablePublicKeyIds: keyIds, - signer: signer - ) + // Platform takes a limited number of keys per update. A failure + // part way leaves the rest live and the row in place; the next + // attempt picks up what is still live. + for start in stride(from: 0, to: keyIds.count, by: AppConnect.maxKeysDisabledPerUpdate) { + try await context.wallet.updateIdentity( + identityId: context.identityId, + disablePublicKeyIds: Array(keyIds[start ..< min(start + AppConnect.maxKeysDisabledPerUpdate, keyIds.count)]), + signer: signer + ) + } Self.logger.info("🔗 DASHCONNECT :: session key(s) disabled") } @@ -1734,6 +1776,39 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { .getPublicKeys() } + /// What the wallet's store holds for each key of the identity. The store + /// is written by the SDK as it loads and updates the identity. + private static func storedKeyBindings( + identityId: String, + modelContainer: ModelContainer + ) throws -> [AppConnect.KeyBinding] { + let descriptor = FetchDescriptor(predicate: #Predicate { $0.identityId == identityId }) + let modelContext = ModelContext(modelContainer) + // The rows are only readable while their context is alive. + return try withExtendedLifetime(modelContext) { + try modelContext.fetch(descriptor).map { + AppConnect.KeyBinding( + keyId: UInt32(bitPattern: $0.keyId), + data: $0.publicKeyData, + singleContractId: AppConnect.singleContractId( + boundsKind: $0.effectiveContractBoundsKind, + boundIds: $0.contractBounds + ), + isDisabled: $0.disabledAt != nil, + isSessionKeyShaped: $0.keyTypeEnum == .ecdsaHash160 + && $0.purposeEnum == .authentication + && $0.securityLevelEnum == .high + && $0.totalBudget != nil + && $0.expiresAt != nil, + hasUnreadableBound: !AppConnect.isReadableBound( + boundsKind: $0.effectiveContractBoundsKind, + boundIds: $0.contractBounds + ) + ) + } + } + } + private func requireContext() async throws -> Context { let runtime = await MainActor.run { ( diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index e4e0eef42c..7696a5e56c 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1563,14 +1563,139 @@ final class AppConnectLoginTests: XCTestCase { // 13 is not on the identity at all. Self.key(keyId: 14, data: Data([14])), ] + let app = Data(repeating: 0xA1, count: 32) XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable(for: grants, currentIdentityPublicKeys: keys), + AppConnect.sessionKeyIdsToDisable( + for: grants, appContractId: app, bindings: [], currentIdentityPublicKeys: keys), [9]) XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable(for: [], currentIdentityPublicKeys: keys), + AppConnect.sessionKeyIdsToDisable( + for: [], appContractId: app, bindings: [], currentIdentityPublicKeys: keys), []) } + func testDisconnectAlsoDisablesLiveKeysBoundToTheAppThatHaveNoGrantRecord() { + let app = Data(repeating: 0xA1, count: 32) + let otherApp = Data(repeating: 0xB2, count: 32) + let keys = [ + Self.key(keyId: 6, data: Data([6]), totalBudget: 5, expiresAt: 9_999), + Self.key(keyId: 7, data: Data([7]), totalBudget: 5, expiresAt: 9_999), + Self.key(keyId: 8, data: Data([8]), disabledAt: 1), + Self.key(keyId: 9, data: Data([9]), totalBudget: 5, expiresAt: 9_999), + Self.key(keyId: 10, data: Data([10]), totalBudget: 5, expiresAt: 9_999), + Self.key(keyId: 11, data: Data([11]), totalBudget: 5, expiresAt: 9_999), + // Bound to the app and of the same kind, but without limits and + // without a grant record: not a key this login registered. + Self.key(keyId: 13, data: Data([13])), + // Bound to the app, but not a key this login registers. + Self.key( + keyId: 12, purpose: .encryption, securityLevel: .medium, keyType: .ecdsaSecp256k1, + data: Data([12]), totalBudget: 5, expiresAt: 9_999), + // Bound to the app with one limit only. + Self.key(keyId: 14, data: Data([14]), expiresAt: 9_999), + ] + let bindings = [ + AppConnect.KeyBinding(keyId: 6, data: Data([6]), singleContractId: app), + AppConnect.KeyBinding(keyId: 7, data: Data([7]), singleContractId: app), + AppConnect.KeyBinding(keyId: 8, data: Data([8]), singleContractId: app), + AppConnect.KeyBinding(keyId: 9, data: Data([9]), singleContractId: app), + AppConnect.KeyBinding(keyId: 10, data: Data([10]), singleContractId: otherApp), + // The stored row under this id is for a different key. + AppConnect.KeyBinding(keyId: 11, data: Data([0xFF]), singleContractId: app), + AppConnect.KeyBinding(keyId: 12, data: Data([12]), singleContractId: app), + AppConnect.KeyBinding(keyId: 13, data: Data([13]), singleContractId: app), + AppConnect.KeyBinding(keyId: 14, data: Data([14]), singleContractId: app), + ] + XCTAssertEqual( + AppConnect.sessionKeyIdsToDisable( + for: [Self.grant(sessionKeyId: 9)], + appContractId: app, + bindings: bindings, + currentIdentityPublicKeys: keys), + [6, 7, 9]) + XCTAssertEqual( + AppConnect.sessionKeyIdsToDisable( + for: [], appContractId: otherApp, bindings: bindings, currentIdentityPublicKeys: keys), + [10]) + } + + func testOnlyAWholeSingleContractBoundNamesTheApp() { + let app = Data(repeating: 0xA1, count: 32) + XCTAssertEqual(AppConnect.singleContractId(boundsKind: 1, boundIds: [app]), app) + XCTAssertNil(AppConnect.singleContractId(boundsKind: 0, boundIds: nil)) + XCTAssertNil(AppConnect.singleContractId(boundsKind: 2, boundIds: [app])) + XCTAssertNil(AppConnect.singleContractId(boundsKind: 3, boundIds: [app])) + XCTAssertNil(AppConnect.singleContractId(boundsKind: 1, boundIds: [])) + XCTAssertNil(AppConnect.singleContractId(boundsKind: 1, boundIds: [Data([1, 2])])) + + for kind in [0, 2, 3] { + XCTAssertTrue(AppConnect.isReadableBound(boundsKind: kind, boundIds: kind == 0 ? nil : [app])) + } + XCTAssertTrue(AppConnect.isReadableBound(boundsKind: 1, boundIds: [app])) + XCTAssertFalse(AppConnect.isReadableBound(boundsKind: 1, boundIds: [Data([1, 2])])) + XCTAssertFalse(AppConnect.isReadableBound(boundsKind: 1, boundIds: nil)) + XCTAssertFalse(AppConnect.isReadableBound(boundsKind: 4, boundIds: [app])) + } + + func testAKeyBoundElsewhereOrNotAtAllIsNeitherDisabledNorUnknown() { + let app = Data(repeating: 0xA1, count: 32) + let keys = [4, 5, 6].map { + Self.key(keyId: Int32($0), data: Data([UInt8($0)]), totalBudget: 5, expiresAt: 9_999) + } + let bindings = [ + // A document-type bound and an unbounded key both store no single contract. + AppConnect.KeyBinding(keyId: 4, data: Data([4]), singleContractId: nil), + AppConnect.KeyBinding(keyId: 5, data: Data([5]), singleContractId: nil), + AppConnect.KeyBinding(keyId: 6, data: Data([6]), singleContractId: Data(repeating: 0xB2, count: 32)), + ] + XCTAssertEqual( + AppConnect.sessionKeyIdsToDisable( + for: [], appContractId: app, bindings: bindings, currentIdentityPublicKeys: keys), + []) + XCTAssertEqual( + AppConnect.sessionKeyIdsWithUnknownBinding(for: [], bindings: bindings, currentIdentityPublicKeys: keys), + []) + } + + func testAStoredLiveKeyOfTheAppMissingFromTheIdentityViewIsReported() { + let app = Data(repeating: 0xA1, count: 32) + let otherApp = Data(repeating: 0xB2, count: 32) + let keys = [Self.key(keyId: 6, data: Data([6]))] + let bindings = [ + AppConnect.KeyBinding(keyId: 6, data: Data([6]), singleContractId: app), + AppConnect.KeyBinding(keyId: 7, data: Data([7]), singleContractId: app), + AppConnect.KeyBinding(keyId: 8, data: Data([8]), singleContractId: app, isDisabled: true), + AppConnect.KeyBinding(keyId: 9, data: Data([9]), singleContractId: otherApp), + ] + XCTAssertEqual(AppConnect.boundKeyIdsMissing(from: keys, appContractId: app, bindings: bindings), [7]) + } + + func testALiveSessionKeyTheStoreCannotPlaceStopsADisconnect() { + let app = Data(repeating: 0xA1, count: 32) + let keys = [ + Self.key(keyId: 0, securityLevel: .master, keyType: .ecdsaSecp256k1, data: Data([0])), + Self.key(keyId: 6, data: Data([6])), + Self.key(keyId: 7, data: Data([7])), + Self.key(keyId: 8, data: Data([8]), disabledAt: 1), + Self.key(keyId: 9, data: Data([9])), + Self.key(keyId: 11, data: Data([11])), + ] + let bindings = [ + AppConnect.KeyBinding(keyId: 6, data: Data([6]), singleContractId: nil), + AppConnect.KeyBinding(keyId: 11, data: Data([0xFF]), singleContractId: app), + AppConnect.KeyBinding(keyId: 14, data: Data([14]), singleContractId: nil, hasUnreadableBound: true), + ] + // 0 and 8 cannot be session keys that sign; 6 is in the store; 9 has + // a grant record. 7 is unknown, so is 11 (its row is another key) and + // 14 (its stored bound cannot be read). + XCTAssertEqual( + AppConnect.sessionKeyIdsWithUnknownBinding( + for: [Self.grant(sessionKeyId: 9)], + bindings: bindings, + currentIdentityPublicKeys: keys + [Self.key(keyId: 14, data: Data([14]))]), + [7, 11, 14]) + } + private static func grant(sessionKeyId: UInt32) -> AppConnectGrant { AppConnectGrant( identityId: "identity", appContractId: "app", documentId: "document-\(sessionKeyId)", @@ -1794,11 +1919,12 @@ final class AppConnectLoginTests: XCTestCase { keyType: KeyType = .ecdsaHash160, data: Data, disabledAt: Int64? = nil, + totalBudget: UInt64? = nil, expiresAt: Int64? = nil ) -> ManagedIdentity.IdentityPublicKeyInfo { ManagedIdentity.IdentityPublicKeyInfo( keyId: keyId, purpose: purpose, securityLevel: securityLevel, keyType: keyType, - readOnly: false, disabledAt: disabledAt, data: data, totalBudget: nil, expiresAt: expiresAt) + readOnly: false, disabledAt: disabledAt, data: data, totalBudget: totalBudget, expiresAt: expiresAt) } private static func data(hex: String) -> Data? { From a31dd3a0376c58727801d2d32f448714b05a9d9c Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 12 Oct 2026 22:56:25 +0300 Subject: [PATCH 007/108] feat(dashpay): decode App Connect request v2 and seal its response The request v2 proposed in Yappr's App Connect profile names several keys (a contract group, a document type, a single contract, an encryption key) with a budget and an expiry each. This adds the parts that are fully specified and have published vectors; nothing reads them in the login flow yet, so a v2 QR is still refused. - AppConnectRequest: the body decoder (header, TLVs, bindings) and the request age check. `unsupported` and `invalid` follow the reference codec. - DashConnectUri.parseAppConnectRequest: the `dash-key:` v=2 URI and its `cb` return URL. - KeyExchangeCrypto: the v2 response key (HKDF info "app-connect:v2"), its associated data and the multi-key payload. Checked against vendor/platform-auth/src/app-connect/vectors.json. Co-Authored-By: Claude Opus 5.5 --- .../Protocol/AppConnectRequest.swift | 370 +++++++++++++++ .../Protocol/DashConnectRequests.swift | 9 + .../DashConnect/Protocol/DashConnectUri.swift | 85 ++++ .../Protocol/KeyExchangeCrypto.swift | 124 ++++- .../DashConnect/DashConnectUriTests.swift | 423 ++++++++++++++++++ .../DashConnect/KeyExchangeCryptoTests.swift | 94 ++++ 6 files changed, 1099 insertions(+), 6 deletions(-) create mode 100644 DashWallet/Sources/Models/DashConnect/Protocol/AppConnectRequest.swift diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/AppConnectRequest.swift b/DashWallet/Sources/Models/DashConnect/Protocol/AppConnectRequest.swift new file mode 100644 index 0000000000..68e6071b92 --- /dev/null +++ b/DashWallet/Sources/Models/DashConnect/Protocol/AppConnectRequest.swift @@ -0,0 +1,370 @@ +import Foundation + +/// Why an App Connect request was refused. The two cases are the statuses a +/// wallet reports back to the app: `unsupported` for a version, mandatory +/// field or binding kind this decoder does not know (a newer app), `invalid` +/// for anything else that breaks the format. +enum AppConnectRequestError: Error, Equatable { + case unsupported(String) + case invalid(String) +} + +/// App Connect request v2, as proposed by Yappr's `docs/APP_CONNECT_PROFILE.md`: +/// +/// body = 0x02 ‖ appEphPub (33) ‖ appId (32) ‖ labelLen (1) ‖ label ‖ TLV* +/// TLV = type (1) ‖ length (1) ‖ value +/// +/// Even TLV types must be understood, so an unknown one refuses the request; +/// unknown odd types are skipped. TLVs come in ascending type order, and of +/// the known types only the two bindings repeat. Integers are big-endian. +/// +/// This type only decodes and checks the format. Nothing in the login flow +/// reads it yet. +struct AppConnectRequest: Equatable { + /// Wire tags, equal to Platform's `ContractBounds` bincode tags. + enum BindingKind: UInt8 { + case singleContract = 0 + case documentType = 1 + case contractGroup = 2 + } + + /// The security levels a binding may ask for, as Platform numbers them. + enum SecurityLevel: UInt8 { + case critical = 1 + case high = 2 + } + + /// The key purposes an encryption binding may ask for, as Platform + /// numbers them. + enum EncryptionPurpose: UInt8 { + case encryption = 1 + case decryption = 2 + } + + struct AuthBinding: Equatable { + let kind: BindingKind + let securityLevel: SecurityLevel + /// The contract id, or the group id for `contractGroup`. + let id: Data + /// Proposed lifetime budget in credits; nil when the request asks for + /// none. A `contractGroup` binding always has one. + let totalBudget: UInt64? + /// Proposed expiry as a block time in milliseconds; nil for none. + let expiresAt: UInt64? + /// Set on `documentType` only. + let documentTypeName: String? + } + + struct EncryptionBinding: Equatable { + let contractId: Data + let purpose: EncryptionPurpose + } + + enum Age: Equatable { + case fresh + /// Created more than `maxAge` before the wallet's clock. + case stale + /// Created more than `maxClockSkew` after it. + case future + } + + static let version: UInt8 = 0x02 + static let maxAuthBindings = 4 + static let maxEncryptionBindings = 2 + static let maxAge: TimeInterval = 10 * 60 + static let maxClockSkew: TimeInterval = 2 * 60 + + let appEphemeralPubKey: Data + /// The app's id: the contract the wallet brands the request with. + let appId: Data + /// Unauthenticated display hint from the payload; spoofable. + let label: String + /// The identity the app expects to answer. + let identityHint: Data? + /// One to four; the first is the primary binding. + let authBindings: [AuthBinding] + /// 16 bytes naming the app install, used to supersede its previous login. + let connectionId: Data? + let encryptionBindings: [EncryptionBinding] + /// The request asks to renew an existing grant instead of logging in. + let isRenewal: Bool + /// Milliseconds since the epoch. + let createdAt: UInt64 + + func age(now: Date) -> Age { + let created = TimeInterval(createdAt) / 1000 + let current = now.timeIntervalSince1970 + if current - created > Self.maxAge { return .stale } + if created - current > Self.maxClockSkew { return .future } + return .fresh + } +} + +extension AppConnectRequest { + private enum TLV { + static let identityHint: UInt8 = 0x01 + static let authBinding: UInt8 = 0x02 + static let connectionId: UInt8 = 0x03 + static let encryptionBinding: UInt8 = 0x04 + static let mode: UInt8 = 0x05 + static let createdAt: UInt8 = 0x06 + + static let known: Set = [identityHint, authBinding, connectionId, encryptionBinding, mode, createdAt] + static let fixedLengths: [UInt8: Int] = [ + identityHint: 32, connectionId: 16, encryptionBinding: 33, mode: 1, createdAt: 8, + ] + } + + private static let publicKeyLength = 33 + private static let idLength = 32 + private static let maxLabelLength = 64 + private static let maxDocumentTypeNameLength = 64 + private static let authBindingFixedLength = 1 + 1 + idLength + 8 + 8 + private static let modeRenew: UInt8 = 1 + /// The reference codec is JavaScript: a timestamp it cannot hold exactly + /// is out of range there, so it is here too. + private static let maxTimestamp: UInt64 = (1 << 53) - 1 + + /// Whether a refusal is `unsupported` or `invalid` follows the reference + /// codec. Framing, the most bindings allowed, the mode and the timestamps + /// are checked as each TLV is read, and so is an unknown mandatory TLV or + /// binding kind. The remaining rules (the key, the label's characters, + /// levels, the group budget, type names, repeated bindings, the + /// encryption purpose, the required fields) are checked after the last + /// TLV, so an unknown part further on is reported first. Which of several + /// broken rules is named may differ from the reference. + static func decode(_ body: Data) throws -> AppConnectRequest { + let bytes = [UInt8](body) + guard let first = bytes.first else { + throw AppConnectRequestError.invalid("empty request") + } + guard first == version else { + throw AppConnectRequestError.unsupported("request version \(first)") + } + var offset = 1 + guard bytes.count >= offset + publicKeyLength + idLength + 1 else { + throw AppConnectRequestError.invalid("request is truncated") + } + + let appEphemeralPubKey = Data(bytes[offset ..< offset + publicKeyLength]) + offset += publicKeyLength + var brokenRule: AppConnectRequestError? + func note(_ message: String) { + if brokenRule == nil { brokenRule = .invalid(message) } + } + if !Secp256k1.isValidCompressedPoint(appEphemeralPubKey) { + note("app ephemeral public key is not a compressed secp256k1 point") + } + let appId = Data(bytes[offset ..< offset + idLength]) + offset += idLength + + let labelLength = Int(bytes[offset]) + offset += 1 + guard labelLength <= maxLabelLength else { + throw AppConnectRequestError.invalid("label is longer than \(maxLabelLength) bytes") + } + guard offset + labelLength <= bytes.count else { + throw AppConnectRequestError.invalid("request is truncated") + } + guard let label = String(validating: bytes[offset ..< offset + labelLength], as: UTF8.self) else { + throw AppConnectRequestError.invalid("label is not valid UTF-8") + } + // None of the characters a label could use to disguise itself on the + // approval sheet. + if label.unicodeScalars.contains(where: isForbiddenInLabel) { + note("label contains control or bidirectional formatting characters") + } + offset += labelLength + + var identityHint: Data? + var authBindings: [AuthBinding] = [] + var connectionId: Data? + var encryptionBindings: [EncryptionBinding] = [] + var isRenewal = false + var createdAt: UInt64? + var previousType: UInt8 = 0 + + while offset < bytes.count { + guard offset + 2 <= bytes.count else { + throw AppConnectRequestError.invalid("TLV header is truncated") + } + let type = bytes[offset] + let length = Int(bytes[offset + 1]) + offset += 2 + guard offset + length <= bytes.count else { + throw AppConnectRequestError.invalid("TLV \(type) is truncated") + } + let value = bytes[offset ..< offset + length] + offset += length + + // The two binding types repeat, and so may an optional type this + // decoder does not know. + let isRepeatable = type == TLV.authBinding || type == TLV.encryptionBinding + || (!type.isMultiple(of: 2) && !TLV.known.contains(type)) + guard type > previousType || (type == previousType && isRepeatable) else { + throw AppConnectRequestError.invalid("TLV \(type) is out of order or repeated") + } + previousType = type + + if let fixedLength = TLV.fixedLengths[type], length != fixedLength { + throw AppConnectRequestError.invalid("TLV \(type) must be \(fixedLength) bytes") + } + + switch type { + case TLV.identityHint: + identityHint = Data(value) + case TLV.authBinding: + guard authBindings.count < maxAuthBindings else { + throw AppConnectRequestError.invalid("more than \(maxAuthBindings) auth bindings") + } + let binding = try decodeAuthBinding(value, note: note) + if authBindings.contains(where: { + $0.kind == binding.kind && $0.id == binding.id && $0.documentTypeName == binding.documentTypeName + }) { + note("duplicate auth binding") + } + authBindings.append(binding) + case TLV.connectionId: + connectionId = Data(value) + case TLV.encryptionBinding: + guard encryptionBindings.count < maxEncryptionBindings else { + throw AppConnectRequestError.invalid("more than \(maxEncryptionBindings) encryption bindings") + } + let rawPurpose = value[value.index(before: value.endIndex)] + let purpose = EncryptionPurpose(rawValue: rawPurpose) + if purpose == nil { + note("encryption binding purpose \(rawPurpose)") + } + // The stand-in purpose never leaves: a noted rule refuses the request. + let binding = EncryptionBinding(contractId: Data(value.prefix(idLength)), purpose: purpose ?? .encryption) + if purpose != nil, encryptionBindings.contains(binding) { + note("duplicate encryption binding") + } + encryptionBindings.append(binding) + case TLV.mode: + guard value.first == modeRenew else { + throw AppConnectRequestError.invalid("unknown mode") + } + isRenewal = true + case TLV.createdAt: + let timestamp = try readTimestamp(value, what: "created-at") + guard timestamp > 0 else { + throw AppConnectRequestError.invalid("created-at is zero") + } + createdAt = timestamp + default: + guard !type.isMultiple(of: 2) else { + throw AppConnectRequestError.unsupported("mandatory TLV \(type)") + } + } + } + + guard let createdAt else { + throw AppConnectRequestError.invalid("request has no created-at") + } + if let brokenRule { + throw brokenRule + } + guard !authBindings.isEmpty else { + throw AppConnectRequestError.invalid("request has no auth binding") + } + + return AppConnectRequest( + appEphemeralPubKey: appEphemeralPubKey, + appId: appId, + label: label, + identityHint: identityHint, + authBindings: authBindings, + connectionId: connectionId, + encryptionBindings: encryptionBindings, + isRenewal: isRenewal, + createdAt: createdAt + ) + } + + /// Throws when the binding cannot be read; a rule its values break goes + /// to `note`, and the binding returned then never leaves `decode`. + private static func decodeAuthBinding(_ value: ArraySlice, note: (String) -> Void) throws -> AuthBinding { + let bytes = Array(value) + guard bytes.count >= authBindingFixedLength else { + throw AppConnectRequestError.invalid("auth binding is truncated") + } + guard let kind = BindingKind(rawValue: bytes[0]) else { + throw AppConnectRequestError.unsupported("auth binding kind \(bytes[0])") + } + // CRITICAL only on a contract group; HIGH on every kind. + let securityLevel = SecurityLevel(rawValue: bytes[1]) + if securityLevel == nil || (securityLevel == .critical && kind != .contractGroup) { + note("security level \(bytes[1]) is not allowed on this binding") + } + + let id = Data(bytes[2 ..< 2 + idLength]) + let budget = readUInt64(bytes[34 ..< 42]) + let expiresAt = try readTimestamp(bytes[42 ..< 50], what: "expires-at") + if kind == .contractGroup, budget == 0 { + note("a contractGroup binding must carry a budget") + } + + let rest = bytes[authBindingFixedLength...] + var documentTypeName: String? + if kind == .documentType { + guard let nameLength = rest.first, Int(nameLength) + 1 == rest.count else { + throw AppConnectRequestError.invalid("document type name length does not match") + } + let name = rest.dropFirst() + guard let text = String(validating: name, as: UTF8.self) else { + throw AppConnectRequestError.invalid("document type name is not valid UTF-8") + } + if !(1 ... maxDocumentTypeNameLength).contains(name.count) || !name.allSatisfy(isDocumentTypeNameByte) { + note("document type name must be 1-64 of [A-Za-z0-9_-]") + } + documentTypeName = text + } else { + guard rest.isEmpty else { + throw AppConnectRequestError.invalid("binding carries trailing bytes") + } + } + + return AuthBinding( + kind: kind, + securityLevel: securityLevel ?? .high, + id: id, + totalBudget: budget > 0 ? budget : nil, + expiresAt: expiresAt > 0 ? expiresAt : nil, + documentTypeName: documentTypeName + ) + } + + /// C0 and C1 controls, and the bidirectional marks, embeddings, overrides + /// and isolates. + private static func isForbiddenInLabel(_ scalar: Unicode.Scalar) -> Bool { + switch scalar.value { + case 0x00 ... 0x1F, 0x7F ... 0x9F, 0x061C, 0x200E, 0x200F, 0x202A ... 0x202E, 0x2066 ... 0x2069: + return true + default: + return false + } + } + + private static func isDocumentTypeNameByte(_ byte: UInt8) -> Bool { + switch byte { + case UInt8(ascii: "A") ... UInt8(ascii: "Z"), UInt8(ascii: "a") ... UInt8(ascii: "z"), + UInt8(ascii: "0") ... UInt8(ascii: "9"), UInt8(ascii: "_"), UInt8(ascii: "-"): + return true + default: + return false + } + } + + private static func readUInt64(_ bytes: ArraySlice) -> UInt64 { + bytes.reduce(0) { $0 << 8 | UInt64($1) } + } + + private static func readTimestamp(_ bytes: ArraySlice, what: String) throws -> UInt64 { + let value = readUInt64(bytes) + guard value <= maxTimestamp else { + throw AppConnectRequestError.invalid("\(what) is out of range") + } + return value + } +} diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift index 5c3f6583ea..50682e4532 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift @@ -15,6 +15,15 @@ struct DashKeyRequest: Equatable { let network: DashConnectNetwork } +/// A `dash-key:` URI carrying an App Connect request v2. +struct AppConnectUri: Equatable { + let request: AppConnectRequest + let network: DashConnectNetwork + /// The `cb` return URL: absolute `https`, no credentials. Checked for + /// form only; whether its host belongs to the app is not decided here. + let callback: URL? +} + struct DashStRequest: Equatable { let transitionBytes: Data let network: DashConnectNetwork diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift index d9d0411ab6..0c6c9712d6 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift @@ -90,6 +90,14 @@ enum DashConnectUri { /// would need. private static let maxKeyPayloadLength = minKeyPayloadLength + maxLabelLength private static let maxStPayloadLength = 4 * 1024 + /// The largest App Connect request the format defines today (a 64-byte + /// label, four auth bindings with full-length names, two encryption + /// bindings and every optional field) is 734 bytes. The rest is room for optional + /// fields a newer app may add, which this decoder has to skip, at a + /// decode cost that stays small. + private static let maxAppConnectPayloadLength = 1024 + private static let appConnectVersion = "2" + private static let maxCallbackLength = 512 /// Encoded-length ceilings, enforced BEFORE decoding. /// @@ -182,6 +190,83 @@ enum DashConnectUri { ) } + /// Parses a `dash-key:` URI of version 2. A version 1 URI is + /// `unsupported` here: it belongs to `parseKeyRequest`. + static func parseAppConnectRequest(_ uri: String) throws -> AppConnectUri { + // Scalars, not characters: a combining mark after the scheme or a + // delimiter must not hide it. + guard uri.unicodeScalars.starts(with: keyScheme.unicodeScalars) else { + throw AppConnectRequestError.invalid("not a dash-key URI") + } + let remainder = uri.unicodeScalars.dropFirst(keyScheme.unicodeScalars.count) + guard let queryIndex = remainder.firstIndex(of: "?") else { + throw AppConnectRequestError.invalid("URI has no query") + } + let body = String(remainder[.. String { + let text = String(scalars).replacingOccurrences(of: "+", with: " ") + return text.removingPercentEncoding ?? text + } + + /// `cb` is an absolute `https` URL without credentials, already + /// form-decoded. The app's own check takes anything a browser's URL + /// parser repairs; this takes only a URL that is valid as written, with a + /// host written without percent-encoding and a port that is a port. The + /// host is what the user will be shown. + private static func parseCallback(_ text: String) throws -> URL { + guard text.utf16.count <= maxCallbackLength, + let components = URLComponents(string: text, encodingInvalidCharacters: false), + components.scheme?.lowercased() == "https", + // Presence, not the decoded value: that is nil for bytes that are not UTF-8. + components.rangeOfUser == nil, components.rangeOfPassword == nil, + let hostRange = components.rangeOfHost, !hostRange.isEmpty, !text[hostRange].contains("%"), + components.rangeOfPort == nil || components.port.map({ (0 ... 65535).contains($0) }) == true, + let url = components.url else { + throw AppConnectRequestError.invalid("callback is not an https URL without credentials") + } + return url + } + static func parseStRequest(_ uri: String) throws -> DashStRequest { let envelope = try parseEnvelope(uri, scheme: stScheme, diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/KeyExchangeCrypto.swift b/DashWallet/Sources/Models/DashConnect/Protocol/KeyExchangeCrypto.swift index a2ed637a38..92f3f36261 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/KeyExchangeCrypto.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/KeyExchangeCrypto.swift @@ -13,6 +13,8 @@ enum KeyExchangeCrypto { case randomNonceGenerationFailed(OSStatus) case invalidEncryptedPayload case hash160Failed + case invalidAppConnectSlots + case invalidAppConnectAssociatedData var errorDescription: String? { switch self { @@ -32,6 +34,10 @@ enum KeyExchangeCrypto { "Failed to assemble the AES-GCM encrypted login-key payload." case .hash160Failed: "Failed to compute hash160 via platform_wallet_hash160." + case .invalidAppConnectSlots: + "An App Connect response carries 1 to 17 keys of exactly 32 bytes." + case .invalidAppConnectAssociatedData: + "App Connect associated data needs a 20-byte request hash and a 32-byte identity ID." } } } @@ -42,6 +48,9 @@ enum KeyExchangeCrypto { private static let nonceLength = 12 private static let encryptedPayloadLength = 60 private static let keyExchangeSalt = Data("dash:key-exchange:v1".utf8) + private static let appConnectInfo = Data("app-connect:v2".utf8) + private static let appConnectAssociatedDataPrefix = Data("dash:app-connect:v2".utf8) + private static let maxAppConnectSlots = 17 private static let authInfo = Data("auth".utf8) private static let encryptionInfo = Data("encryption".utf8) @@ -95,10 +104,118 @@ enum KeyExchangeCrypto { ) } + /// The AES key of an App Connect v2 response. Same salt as the legacy + /// exchange with its own `info`, so it never equals a v1 key. The + /// returned Data is owned by the caller to clear. + static func deriveAppConnectAesKey(sharedX: Data) throws -> Data { + try requireLength(sharedX, expected: aesKeyLength, error: CryptoError.invalidSharedXLength) + return try deriveHKDFKey( + inputKeyMaterial: sharedX, + salt: keyExchangeSalt, + info: appConnectInfo, + outputByteCount: aesKeyLength + ) + } + + /// What an App Connect v2 response is authenticated against: the request + /// it answers and the identity that publishes it, so a response copied + /// under another identity does not open. + static func appConnectAssociatedData(appEphemeralPubKeyHash: Data, ownerId: Data) throws -> Data { + guard appEphemeralPubKeyHash.count == hash160Length, ownerId.count == loginKeyLength else { + throw CryptoError.invalidAppConnectAssociatedData + } + return appConnectAssociatedDataPrefix + appEphemeralPubKeyHash + ownerId + } + + /// Encrypts the granted private keys of an App Connect v2 response: + /// `nonce (12) ‖ ciphertext (32 per slot) ‖ tag (16)`. + static func encryptAppConnectSlots(_ slots: [Data], + walletEphemeralPriv: Data, + appEphemeralPub: Data, + ownerId: Data) throws -> Data { + try encryptAppConnectSlots( + slots, + walletEphemeralPriv: walletEphemeralPriv, + appEphemeralPub: appEphemeralPub, + ownerId: ownerId, + nonce: try randomNonce() + ) + } + + /// Fixed-nonce variant. Tests only — never call from the login flow. + static func encryptAppConnectSlots(_ slots: [Data], + walletEphemeralPriv: Data, + appEphemeralPub: Data, + ownerId: Data, + nonce: Data) throws -> Data { + guard (1 ... maxAppConnectSlots).contains(slots.count), + slots.allSatisfy({ $0.count == loginKeyLength }) else { + throw CryptoError.invalidAppConnectSlots + } + try requireLength(nonce, expected: nonceLength, error: CryptoError.invalidNonceLength) + + let associatedData = try appConnectAssociatedData( + appEphemeralPubKeyHash: try hash160(appEphemeralPub), + ownerId: ownerId + ) + var sharedX = try Secp256k1.ecdhSharedX(privateKey: walletEphemeralPriv, publicKey: appEphemeralPub) + defer { sharedX.resetBytes(in: 0 ..< sharedX.count) } + var aesKey = try deriveAppConnectAesKey(sharedX: sharedX) + defer { aesKey.resetBytes(in: 0 ..< aesKey.count) } + var plaintext = slots.reduce(into: Data()) { $0.append($1) } + defer { plaintext.resetBytes(in: 0 ..< plaintext.count) } + + let sealedBox = try AES.GCM.seal( + plaintext, + using: SymmetricKey(data: aesKey), + nonce: try AES.GCM.Nonce(data: nonce), + authenticating: associatedData + ) + guard let combined = sealedBox.combined, + combined.count == nonceLength + plaintext.count + 16 else { + throw CryptoError.invalidEncryptedPayload + } + return combined + } + + /// Tests only — opens an App Connect v2 payload with the app's side of + /// the exchange. It does not apply the app's other checks. + static func decryptAppConnectSlots(_ payload: Data, + appEphemeralPriv: Data, + walletEphemeralPub: Data, + ownerId: Data) throws -> [Data] { + let associatedData = try appConnectAssociatedData( + appEphemeralPubKeyHash: try hash160(try Secp256k1.compressedPublicKey(privateKey: appEphemeralPriv)), + ownerId: ownerId + ) + let sharedX = try Secp256k1.ecdhSharedX(privateKey: appEphemeralPriv, publicKey: walletEphemeralPub) + let aesKey = try deriveAppConnectAesKey(sharedX: sharedX) + let plaintext = try AES.GCM.open( + try AES.GCM.SealedBox(combined: payload), + using: SymmetricKey(data: aesKey), + authenticating: associatedData + ) + guard !plaintext.isEmpty, plaintext.count.isMultiple(of: loginKeyLength) else { + throw CryptoError.invalidAppConnectSlots + } + return stride(from: 0, to: plaintext.count, by: loginKeyLength).map { + plaintext.subdata(in: plaintext.startIndex + $0 ..< plaintext.startIndex + $0 + loginKeyLength) + } + } + /// The returned Data is owned by the caller to clear. static func encryptLoginKey(_ loginKey: Data, walletEphemeralPriv: Data, appEphemeralPub: Data) throws -> Data { + try encryptLoginKey( + loginKey, + walletEphemeralPriv: walletEphemeralPriv, + appEphemeralPub: appEphemeralPub, + nonce: try randomNonce() + ) + } + + private static func randomNonce() throws -> Data { var nonceBytes = [UInt8](repeating: 0, count: nonceLength) let status = SecRandomCopyBytes(kSecRandomDefault, nonceBytes.count, &nonceBytes) guard status == errSecSuccess else { @@ -108,12 +225,7 @@ enum KeyExchangeCrypto { let nonce = Data(nonceBytes) zero(&nonceBytes) - return try encryptLoginKey( - loginKey, - walletEphemeralPriv: walletEphemeralPriv, - appEphemeralPub: appEphemeralPub, - nonce: nonce - ) + return nonce } /// Fixed-nonce variant. Tests only — never call from the login flow. diff --git a/DashWalletTests/DashConnect/DashConnectUriTests.swift b/DashWalletTests/DashConnect/DashConnectUriTests.swift index 8b15886b4f..84cd2f73b8 100644 --- a/DashWalletTests/DashConnect/DashConnectUriTests.swift +++ b/DashWalletTests/DashConnect/DashConnectUriTests.swift @@ -285,4 +285,427 @@ final class DashConnectUriTests: XCTestCase { XCTAssertNotEqual(error as? DashConnectUriError, .bodyTooLong) } } + + // MARK: - App Connect request v2 + + /// Yappr's published vectors (`vendor/platform-auth/src/app-connect/vectors.json`). + private enum AppConnectVector { + static let requestBytes = Data(hex: "0203e83cb927e85f96ae50a95ca3be21cc7a3755139a941b15d99b01af4fecf0d270f8833c7a2d58ab816c24ae915fe2aa94676588b467ba1e9f2b24c1a3df7fdb7805596170707202320201b0590e59269c6885acf71d27ddfce85187e2cc9736c42e958127cd35be6d38e80000000ba43b7400000001a2f7beb400023a0102a2a1b4ac6fef22ea2a1a68e8123644b357875f6b412c18109281c146e7b271bc000000003b9aca00000001a2f7beb4000770726f66696c650310a69b1b4f666681453dec3734667a5ab20421f8833c7a2d58ab816c24ae915fe2aa94676588b467ba1e9f2b24c1a3df7fdb78010608000001a128425c00")! + static let requestUri = "dash-key:2fAANHHASdojyjV9Sqa2wf2nwZE8kLLqmeHpZWa8sBfaGsddVqyMG2ZVte7xJkTKsXvmFYbXzXbNnMo7bJQBxNcf79N8YWi7pLKyb39Rqv6b1KUmxw9UeJGYz2CV9hFGNUQtcyMYVq2Fg6vAxtxpYays61H8gLMcWqaG8TfgGA3H7setGAYiBsM5YmdZgeuCdGAHSwfNfav5cfFjXNDkPWv37UNSgFxj6o58jfXc3kCLKqLJtc5ZPjm1thEGYxK8HVYBi8fRQeEVy76n27DXGrVTyHz94CfJRuMnH76xGYbMgeuvurxjJMLrQgWUu53cjocYyzzNWdJrgs2D5?n=d&v=2&cb=https%3A%2F%2Fyap.pr%2Fconnect%3Fr%3Dd77dc0da9df83a47755a15c42c5d9db9d7a7fd62" + static let renewBytes = Data(hex: "0203e83cb927e85f96ae50a95ca3be21cc7a3755139a941b15d99b01af4fecf0d270f8833c7a2d58ab816c24ae915fe2aa94676588b467ba1e9f2b24c1a3df7fdb7805596170707201209296d642338cb3bfceeb554285462719e15f004d0579ce53ea77fb6d86cd9ab902320201b0590e59269c6885acf71d27ddfce85187e2cc9736c42e958127cd35be6d38e80000000ba43b7400000001a2f7beb4000310a69b1b4f666681453dec3734667a5ab20501010608000001a128425c00")! + static let renewUri = "dash-key:iJ1PNsQ8ThpuRCEMwQJG9ffSCyMb7vfLJDiYFhU3epnaeTDAZxAdVv9NyHP4CeToE4XT1UYUtTeBzHZ6pFcCRtRnDkeVA32woHqKBGsGrJWYcmVFeTKM5Sip7jKiWC2emRfmekq3qpcrXBmUZon1Ro4vTxztmGCbEdwyMf6DKHbJ9JLuBF3G17bXdjrg32xMMftA36fKEtNr9J2auvn8XBi322CmWUWUgKmwxpAvtwnnvZYTG81eQ73YPiCRX6Soh?n=t&v=2" + static let appEphemeralPubKey = Data(hex: "03e83cb927e85f96ae50a95ca3be21cc7a3755139a941b15d99b01af4fecf0d270")! + static let appId = Data(hex: "f8833c7a2d58ab816c24ae915fe2aa94676588b467ba1e9f2b24c1a3df7fdb78")! + static let groupId = Data(hex: "b0590e59269c6885acf71d27ddfce85187e2cc9736c42e958127cd35be6d38e8")! + static let dashpayContractId = Data(hex: "a2a1b4ac6fef22ea2a1a68e8123644b357875f6b412c18109281c146e7b271bc")! + static let ownerId = Data(hex: "9296d642338cb3bfceeb554285462719e15f004d0579ce53ea77fb6d86cd9ab9")! + static let connectionId = Data(hex: "a69b1b4f666681453dec3734667a5ab2")! + static let createdAt: UInt64 = 1791676800000 + static let expiresAt: UInt64 = 1799452800000 + } + + func testDecodesThePublishedAppConnectRequest() throws { + let request = try AppConnectRequest.decode(AppConnectVector.requestBytes) + + XCTAssertEqual(request, AppConnectRequest( + appEphemeralPubKey: AppConnectVector.appEphemeralPubKey, + appId: AppConnectVector.appId, + label: "Yappr", + identityHint: nil, + authBindings: [ + .init(kind: .contractGroup, securityLevel: .critical, id: AppConnectVector.groupId, + totalBudget: 50_000_000_000, expiresAt: AppConnectVector.expiresAt, documentTypeName: nil), + .init(kind: .documentType, securityLevel: .high, id: AppConnectVector.dashpayContractId, + totalBudget: 1_000_000_000, expiresAt: AppConnectVector.expiresAt, documentTypeName: "profile"), + ], + connectionId: AppConnectVector.connectionId, + encryptionBindings: [.init(contractId: AppConnectVector.appId, purpose: .encryption)], + isRenewal: false, + createdAt: AppConnectVector.createdAt + )) + } + + func testParsesThePublishedAppConnectUri() throws { + let parsed = try DashConnectUri.parseAppConnectRequest(AppConnectVector.requestUri) + + XCTAssertEqual(parsed.request, try AppConnectRequest.decode(AppConnectVector.requestBytes)) + XCTAssertEqual(parsed.network, .devnet) + XCTAssertEqual( + parsed.callback?.absoluteString, + "https://yap.pr/connect?r=d77dc0da9df83a47755a15c42c5d9db9d7a7fd62") + } + + func testParsesThePublishedRenewRequest() throws { + let parsed = try DashConnectUri.parseAppConnectRequest(AppConnectVector.renewUri) + + XCTAssertEqual(parsed.request, try AppConnectRequest.decode(AppConnectVector.renewBytes)) + XCTAssertEqual(parsed.network, .testnet) + XCTAssertNil(parsed.callback) + XCTAssertTrue(parsed.request.isRenewal) + XCTAssertEqual(parsed.request.identityHint, AppConnectVector.ownerId) + XCTAssertEqual(parsed.request.authBindings.map(\.kind), [.contractGroup]) + XCTAssertEqual(parsed.request.encryptionBindings, []) + } + + func testAVersion1UriIsUnsupportedByTheAppConnectParserAndViceVersa() throws { + XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest(try validKeyUri())) { error in + XCTAssertEqual(error as? AppConnectRequestError, .unsupported("URI version 1")) + } + // The version 1 parser measures the body before it reads the version, + // so a full version 2 request is refused there for its length. + XCTAssertThrowsError(try DashConnectUri.parseKeyRequest(AppConnectVector.requestUri)) { error in + XCTAssertEqual(error as? DashConnectUriError, .bodyTooLong) + } + XCTAssertThrowsError(try DashConnectUri.parseKeyRequest(try validKeyUri(query: "n=t&v=2"))) { error in + XCTAssertEqual(error as? DashConnectUriError, .unsupportedVersion) + } + } + + func testAppConnectUriQueryRules() { + let base = AppConnectVector.renewUri + // `n`, `v` and `cb` may each appear once; other parameters are ignored. + XCTAssertNoThrow(try DashConnectUri.parseAppConnectRequest(base + "&x=1&x=2")) + for repeated in ["&n=t", "&v=2", "&cb=https%3A%2F%2Fa.example&cb=https%3A%2F%2Fa.example"] { + XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest(base + repeated), repeated) { error in + guard case .invalid = error as? AppConnectRequestError else { return XCTFail("\(error)") } + } + } + for callback in [ + "http%3A%2F%2Fyap.pr%2Fconnect", "https%3A%2F%2Fuser%3Apw%40yap.pr%2F", "https%3A%2F%2Fuser%40yap.pr%2F", + // Credentials that do not decode as text are still credentials. + "https%3A%2F%2F%25FF%40yap.pr%2F", "https%3A%2F%2Fyap.pr%25FF%40evil.example%2F", + "https%3A%2F%2Fyap.pr%25FF%3A%25FF%40evil.example%2F", + "yap.pr%2Fconnect", "https%3A%2F%2Fyap.pr%2F" + String(repeating: "a", count: 512), + ] { + XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest(base + "&cb=" + callback), callback) { error in + guard case .invalid = error as? AppConnectRequestError else { return XCTFail("\(error)") } + } + } + XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest(base.replacingOccurrences(of: "n=t", with: "n=x"))) { error in + XCTAssertEqual(error as? AppConnectRequestError, .invalid("unknown network")) + } + } + + func testAnOversizedAppConnectBodyIsRejectedBeforeDecoding() { + // `0` is not a Base58 character: a length check that ran after the + // decode would report that instead. + let uri = "dash-key:" + String(repeating: "0", count: 1500) + "?n=t&v=2" + XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest(uri)) { error in + XCTAssertEqual(error as? AppConnectRequestError, .invalid("request is too long")) + } + XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest("dash-key:0?n=t&v=2")) { error in + XCTAssertEqual(error as? AppConnectRequestError, .invalid("request is not base58")) + } + } + + func testAnAppConnectPayloadAtTheCeilingIsReadAndOneOverIsNot() { + // Padded with optional TLVs this decoder skips. + let minimal = Self.appConnectHeader + Self.groupBinding + Self.createdAtTlv + let padding = { (count: Int) -> Data in + var data = Data() + var left = count + while left > 0 { + let chunk = min(left, 257) + data += Self.tlv(0x07, Data(repeating: 0, count: chunk - 2)) + left -= chunk + } + return data + } + let uri = { (payload: Data) in "dash-key:\(self.base58Encode(payload))?n=t&v=2" } + + XCTAssertNoThrow(try DashConnectUri.parseAppConnectRequest(uri(minimal + padding(1024 - minimal.count)))) + XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest(uri(minimal + padding(1025 - minimal.count)))) { error in + XCTAssertEqual(error as? AppConnectRequestError, .invalid("request is too long")) + } + } + + func testAppConnectQueryIsFormDecodedBeforeItIsRead() throws { + let body = String(AppConnectVector.renewUri.dropFirst("dash-key:".count).prefix { $0 != "?" }) + let parse = { (query: String) in try DashConnectUri.parseAppConnectRequest("dash-key:\(body)?\(query)") } + + XCTAssertEqual(try parse("%6E=t&%76=%32").network, .testnet) + XCTAssertEqual(try parse("?n=t&v=2").network, .testnet) + // An encoded name is still the same parameter. + XCTAssertThrowsError(try parse("n=t&v=2&%76=1")) { error in + XCTAssertEqual(error as? AppConnectRequestError, .invalid("query parameter v is repeated")) + } + // A combining mark after a delimiter does not swallow it. + XCTAssertEqual(try parse("v=2&\u{301}x=1&n=t").network, .testnet) + } + + func testAppConnectCallbackHostMustReadAsWritten() throws { + let base = AppConnectVector.renewUri + let exact = "https://yap.pr/" + String(repeating: "a", count: 512 - "https://yap.pr/".count) + XCTAssertEqual(try DashConnectUri.parseAppConnectRequest(base + "&cb=" + exact).callback?.absoluteString, exact) + + // Decodes to `https://yap.pr%2F.evil.example/`: a host that only looks like yap.pr. + for callback in ["https%3A%2F%2Fyap.pr%252F.evil.example%2F", "https%3A%2F%2Fyap.pr%2540evil.example%2F", + "https%3A%2F%2Fyap.pr%3A99999%2F", "https%3A%2F%2Fyap.pr%3A99999999999999999999%2F", + "https%3A%2F%2Fb%C3%BCcher.example%2F"] { + XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest(base + "&cb=" + callback), callback) + } + // An international host is written in its ASCII form. + XCTAssertEqual( + try DashConnectUri.parseAppConnectRequest(base + "&cb=https%3A%2F%2Fxn--bcher-kva.example%3A8443%2F").callback?.port, + 8443) + } + + // The renew request in pieces: header, then one TLV per element. + private static let appConnectHeader = AppConnectVector.renewBytes.prefix(1 + 33 + 32 + 1 + 5) + private static let groupBinding = tlv(0x02, Data([2, 1]) + AppConnectVector.groupId + u64(50_000_000_000) + u64(0)) + private static let createdAtTlv = tlv(0x06, u64(AppConnectVector.createdAt)) + + private static func tlv(_ type: UInt8, _ value: Data) -> Data { + Data([type, UInt8(value.count)]) + value + } + + private static func u64(_ value: UInt64) -> Data { + withUnsafeBytes(of: value.bigEndian) { Data($0) } + } + + private static func authBinding(kind: UInt8, level: UInt8, id: UInt8, budget: UInt64 = 1, tail: Data = Data()) -> Data { + tlv(0x02, Data([kind, level]) + Data(repeating: id, count: 32) + u64(budget) + u64(0) + tail) + } + + private func decodeAppConnect(_ parts: Data...) throws -> AppConnectRequest { + try AppConnectRequest.decode(parts.reduce(Self.appConnectHeader, +)) + } + + private func assertInvalid(_ parts: Data..., file: StaticString = #filePath, line: UInt = #line) { + XCTAssertThrowsError(try AppConnectRequest.decode(parts.reduce(Self.appConnectHeader, +)), file: file, line: line) { error in + guard case .invalid = error as? AppConnectRequestError else { + return XCTFail("expected invalid, got \(error)", file: file, line: line) + } + } + } + + private func assertUnsupported(_ parts: Data..., file: StaticString = #filePath, line: UInt = #line) { + XCTAssertThrowsError(try AppConnectRequest.decode(parts.reduce(Self.appConnectHeader, +)), file: file, line: line) { error in + guard case .unsupported = error as? AppConnectRequestError else { + return XCTFail("expected unsupported, got \(error)", file: file, line: line) + } + } + } + + func testTheSmallestAppConnectRequestDecodes() throws { + let request = try decodeAppConnect(Self.groupBinding, Self.createdAtTlv) + XCTAssertEqual(request.authBindings.count, 1) + XCTAssertNil(request.authBindings[0].expiresAt) + XCTAssertNil(request.identityHint) + XCTAssertNil(request.connectionId) + XCTAssertFalse(request.isRenewal) + } + + func testUnknownOddTlvsAreSkippedAndUnknownEvenOnesRefuse() throws { + // 0x07 and 0x09 are unknown and optional; 0x07 may even repeat. + let request = try decodeAppConnect( + Self.groupBinding, Self.createdAtTlv, + Self.tlv(0x07, Data([1])), Self.tlv(0x07, Data()), Self.tlv(0x09, Data([1, 2, 3]))) + XCTAssertEqual(request, try decodeAppConnect(Self.groupBinding, Self.createdAtTlv)) + + assertUnsupported(Self.groupBinding, Self.createdAtTlv, Self.tlv(0x08, Data())) + // An unknown binding kind is a newer format too. + assertUnsupported(Self.authBinding(kind: 3, level: 2, id: 1), Self.createdAtTlv) + // So is another body version. + XCTAssertThrowsError(try AppConnectRequest.decode(Data([0x03]) + Self.appConnectHeader.dropFirst())) { error in + XCTAssertEqual(error as? AppConnectRequestError, .unsupported("request version 3")) + } + } + + func testAnUnknownMandatoryPartOutranksABrokenRule() { + let badLevel = Self.authBinding(kind: 0, level: 1, id: 1) + let unknownKind = Self.authBinding(kind: 7, level: 2, id: 2) + let unknownTlv = Self.tlv(0x08, Data()) + let encryption = { (purpose: UInt8) in Self.tlv(0x04, Data(repeating: 1, count: 32) + Data([purpose])) } + + // Alone, each of these is a broken rule... + assertInvalid(badLevel, Self.createdAtTlv) + assertInvalid(Self.groupBinding, encryption(3), Self.createdAtTlv) + // ...and still a newer format when something unknown follows. + assertUnsupported(badLevel, Self.createdAtTlv, unknownTlv) + assertUnsupported(badLevel, unknownKind) + assertUnsupported(Self.groupBinding, Self.groupBinding, Self.createdAtTlv, unknownTlv) + assertUnsupported(Self.groupBinding, encryption(3), Self.createdAtTlv, unknownTlv) + assertUnsupported(Self.authBinding(kind: 2, level: 1, id: 1, budget: 0), Self.createdAtTlv, unknownTlv) + + let offCurve = Data([0x02]) + Data([0x02]) + Data(repeating: 0xFF, count: 32) + AppConnectVector.appId + let badLabel = Data([3]) + Data("a\nb".utf8) + XCTAssertThrowsError(try AppConnectRequest.decode( + offCurve + badLabel + Self.groupBinding + Self.createdAtTlv + unknownTlv)) { error in + guard case .unsupported = error as? AppConnectRequestError else { return XCTFail("\(error)") } + } + let name = { (text: String) in Data([UInt8(text.utf8.count)]) + Data(text.utf8) } + assertInvalid(Self.authBinding(kind: 1, level: 2, id: 1, tail: name("pro file")), Self.createdAtTlv) + assertUnsupported(Self.authBinding(kind: 1, level: 2, id: 1, tail: name("pro file")), Self.createdAtTlv, unknownTlv) + assertInvalid(Self.groupBinding, encryption(1), encryption(1), Self.createdAtTlv) + assertUnsupported(Self.groupBinding, encryption(1), encryption(1), Self.createdAtTlv, unknownTlv) + + // What is checked as each TLV is read stays a broken rule, whatever follows. + let single = { (id: UInt8) in Self.authBinding(kind: 0, level: 2, id: id) } + assertInvalid(Self.groupBinding, Self.tlv(0x05, Data([1, 1])), Self.createdAtTlv, unknownTlv) + assertInvalid(Self.groupBinding, Self.tlv(0x05, Data([2])), Self.createdAtTlv, unknownTlv) + assertInvalid(Self.groupBinding, Self.tlv(0x06, Self.u64(0)), unknownTlv) + assertInvalid(Self.groupBinding, Self.tlv(0x06, Self.u64(1 << 53)), unknownTlv) + assertInvalid( + Self.tlv(0x02, Data([2, 1]) + AppConnectVector.groupId + Self.u64(1) + Self.u64(1 << 53)), + Self.createdAtTlv, unknownTlv) + assertInvalid(single(1), single(2), single(3), single(4), single(5), Self.createdAtTlv, unknownTlv) + assertInvalid(Self.groupBinding, encryption(1), encryption(2), encryption(1), Self.createdAtTlv, unknownTlv) + assertInvalid(Self.authBinding(kind: 1, level: 2, id: 1, tail: Data([3]) + Data("ab".utf8)), Self.createdAtTlv, unknownTlv) + assertInvalid(Self.authBinding(kind: 1, level: 2, id: 1, tail: Data([1, 0xFF])), Self.createdAtTlv, unknownTlv) + assertInvalid(Self.authBinding(kind: 0, level: 2, id: 1, tail: name("profile")), Self.createdAtTlv, unknownTlv) + assertInvalid(Self.createdAtTlv, Self.groupBinding, unknownTlv) + } + + func testAppConnectTextAndTimestampEdges() throws { + let header = { (label: Data) in + Data([0x02]) + AppConnectVector.appEphemeralPubKey + AppConnectVector.appId + Data([UInt8(label.count)]) + label + } + let tail = Self.groupBinding + Self.createdAtTlv + let name = { (bytes: Data) in Data([UInt8(bytes.count)]) + bytes } + + // A leading BOM stays part of the label. + let withBom = try AppConnectRequest.decode(header(Data([0xEF, 0xBB, 0xBF]) + Data("Yappr".utf8)) + tail) + XCTAssertEqual(withBom.label.unicodeScalars.first, "\u{FEFF}") + // A document type name is ASCII; a BOM in front is not. + assertInvalid( + Self.authBinding(kind: 1, level: 2, id: 1, tail: name(Data([0xEF, 0xBB, 0xBF]) + Data("profile".utf8))), + Self.createdAtTlv) + assertInvalid(Self.authBinding(kind: 1, level: 2, id: 1, tail: name(Data([0xFF]))), Self.createdAtTlv) + + // The largest timestamp the reference codec can hold. + let last = try decodeAppConnect(Self.groupBinding, Self.tlv(0x06, Self.u64((1 << 53) - 1))) + XCTAssertEqual(last.createdAt, (1 << 53) - 1) + assertInvalid( + Self.tlv(0x02, Data([2, 1]) + AppConnectVector.groupId + Self.u64(1) + Self.u64(1 << 53)), + Self.createdAtTlv) + } + + func testAppConnectTlvOrderAndCountRules() { + let hint = Self.tlv(0x01, Data(repeating: 7, count: 32)) + let connection = Self.tlv(0x03, Data(repeating: 7, count: 16)) + let mode = Self.tlv(0x05, Data([1])) + + // Out of order. + assertInvalid(Self.groupBinding, hint, Self.createdAtTlv) + assertInvalid(Self.createdAtTlv, Self.groupBinding) + // A known singleton twice. + assertInvalid(hint, hint, Self.groupBinding, Self.createdAtTlv) + assertInvalid(Self.groupBinding, connection, connection, Self.createdAtTlv) + assertInvalid(Self.groupBinding, mode, mode, Self.createdAtTlv) + assertInvalid(Self.groupBinding, Self.createdAtTlv, Self.createdAtTlv) + // The required ones missing. + assertInvalid(Self.groupBinding) + assertInvalid(Self.createdAtTlv) + // Too many bindings, or the same one twice. + assertInvalid( + Self.authBinding(kind: 0, level: 2, id: 1), Self.authBinding(kind: 0, level: 2, id: 2), + Self.authBinding(kind: 0, level: 2, id: 3), Self.authBinding(kind: 0, level: 2, id: 4), + Self.authBinding(kind: 0, level: 2, id: 5), Self.createdAtTlv) + assertInvalid(Self.authBinding(kind: 0, level: 2, id: 1), Self.authBinding(kind: 0, level: 2, id: 1), Self.createdAtTlv) + let encryption = { (id: UInt8, purpose: UInt8) in Self.tlv(0x04, Data(repeating: id, count: 32) + Data([purpose])) } + assertInvalid(Self.groupBinding, encryption(1, 1), encryption(1, 2), encryption(2, 1), Self.createdAtTlv) + assertInvalid(Self.groupBinding, encryption(1, 1), encryption(1, 1), Self.createdAtTlv) + XCTAssertNoThrow(try decodeAppConnect(Self.groupBinding, encryption(1, 1), encryption(1, 2), Self.createdAtTlv)) + } + + func testAppConnectTlvValueRules() { + // Wrong lengths of the fixed-size values. + assertInvalid(Self.tlv(0x01, Data(repeating: 7, count: 31)), Self.groupBinding, Self.createdAtTlv) + assertInvalid(Self.groupBinding, Self.tlv(0x03, Data(repeating: 7, count: 17)), Self.createdAtTlv) + assertInvalid(Self.groupBinding, Self.tlv(0x04, Data(repeating: 7, count: 32)), Self.createdAtTlv) + assertInvalid(Self.groupBinding, Self.tlv(0x06, Data(repeating: 1, count: 7))) + // Values outside what is defined. + assertInvalid(Self.groupBinding, Self.tlv(0x04, Data(repeating: 7, count: 32) + Data([3])), Self.createdAtTlv) + assertInvalid(Self.groupBinding, Self.tlv(0x05, Data([2])), Self.createdAtTlv) + assertInvalid(Self.groupBinding, Self.tlv(0x06, Self.u64(0))) + assertInvalid(Self.groupBinding, Self.tlv(0x06, Self.u64(1 << 53))) + // A TLV running past the end, and a lone type byte. + assertInvalid(Self.groupBinding, Self.createdAtTlv.dropLast()) + assertInvalid(Self.groupBinding, Self.createdAtTlv, Data([0x07])) + } + + func testAppConnectAuthBindingRules() throws { + let name = { (text: String) in Data([UInt8(text.utf8.count)]) + Data(text.utf8) } + + // CRITICAL only on a contract group; nothing but CRITICAL and HIGH. + XCTAssertNoThrow(try decodeAppConnect(Self.authBinding(kind: 2, level: 2, id: 1), Self.createdAtTlv)) + assertInvalid(Self.authBinding(kind: 0, level: 1, id: 1), Self.createdAtTlv) + assertInvalid(Self.authBinding(kind: 1, level: 1, id: 1, tail: name("profile")), Self.createdAtTlv) + assertInvalid(Self.authBinding(kind: 2, level: 0, id: 1), Self.createdAtTlv) + assertInvalid(Self.authBinding(kind: 2, level: 3, id: 1), Self.createdAtTlv) + // A contract group always carries a budget; the others need not. + assertInvalid(Self.authBinding(kind: 2, level: 1, id: 1, budget: 0), Self.createdAtTlv) + let unlimited = try decodeAppConnect(Self.authBinding(kind: 0, level: 2, id: 1, budget: 0), Self.createdAtTlv) + XCTAssertNil(unlimited.authBindings[0].totalBudget) + // The name belongs to documentType, and only there. + assertInvalid(Self.authBinding(kind: 1, level: 2, id: 1), Self.createdAtTlv) + assertInvalid(Self.authBinding(kind: 1, level: 2, id: 1, tail: Data([0])), Self.createdAtTlv) + assertInvalid(Self.authBinding(kind: 1, level: 2, id: 1, tail: Data([3]) + Data("ab".utf8)), Self.createdAtTlv) + assertInvalid(Self.authBinding(kind: 1, level: 2, id: 1, tail: name("pro file")), Self.createdAtTlv) + assertInvalid(Self.authBinding(kind: 1, level: 2, id: 1, tail: name(String(repeating: "a", count: 65))), Self.createdAtTlv) + assertInvalid(Self.authBinding(kind: 0, level: 2, id: 1, tail: name("profile")), Self.createdAtTlv) + // Two types of one contract are two bindings. + let two = try decodeAppConnect( + Self.authBinding(kind: 1, level: 2, id: 1, tail: name("a")), + Self.authBinding(kind: 1, level: 2, id: 1, tail: name("b")), Self.createdAtTlv) + XCTAssertEqual(two.authBindings.map(\.documentTypeName), ["a", "b"]) + // Truncated. + assertInvalid(Self.tlv(0x02, Data([0, 2]) + Data(repeating: 1, count: 32)), Self.createdAtTlv) + } + + func testAppConnectHeaderRules() { + let tail = Self.groupBinding + Self.createdAtTlv + let key = AppConnectVector.appEphemeralPubKey + let header = { (key: Data, label: Data) -> Data in + var data = Data([0x02]) + data.append(key) + data.append(AppConnectVector.appId) + data.append(UInt8(label.count)) + data.append(label) + return data + } + let decode = { (data: Data) in try AppConnectRequest.decode(data) } + let offCurveKey: Data = Data([0x02]) + Data(repeating: 0xFF, count: 32) + let overrunningLabel: Data = header(key, Data()).dropLast() + Data([5]) + Data("ab".utf8) + + XCTAssertNoThrow(try decode(header(key, Data("Ünï".utf8)) + tail)) + let invalidBodies: [Data] = [ + Data(), + Data(header(key, Data()).dropLast()), + // Not a point on the curve. + header(offCurveKey, Data()) + tail, + // A label over 64 bytes, one running past the end, and malformed UTF-8. + header(key, Data(repeating: 0x41, count: 65)) + tail, + overrunningLabel, + header(key, Data([0xC3, 0x28])) + tail, + // Overlong and surrogate encodings are not UTF-8. + header(key, Data([0xC0, 0xAF])) + tail, + header(key, Data([0xED, 0xA0, 0x80])) + tail, + ] + for (index, body) in invalidBodies.enumerated() { + XCTAssertThrowsError(try decode(body), "body \(index)") { error in + guard case .invalid = error as? AppConnectRequestError else { return XCTFail("body \(index): \(error)") } + } + } + // Characters a label could disguise itself with. + for forbidden in ["a\u{0}b", "a\nb", "a\u{7F}b", "a\u{85}b", "a\u{202E}b", "a\u{200F}b", "a\u{2066}b", "a\u{061C}b"] { + XCTAssertThrowsError(try decode(header(key, Data(forbidden.utf8)) + tail), forbidden) { error in + XCTAssertEqual( + error as? AppConnectRequestError, + .invalid("label contains control or bidirectional formatting characters")) + } + } + } + + func testAppConnectRequestAge() throws { + let request = try AppConnectRequest.decode(AppConnectVector.requestBytes) + let created = Date(timeIntervalSince1970: TimeInterval(AppConnectVector.createdAt) / 1000) + + XCTAssertEqual(request.age(now: created), .fresh) + XCTAssertEqual(request.age(now: created.addingTimeInterval(10 * 60)), .fresh) + XCTAssertEqual(request.age(now: created.addingTimeInterval(10 * 60 + 1)), .stale) + XCTAssertEqual(request.age(now: created.addingTimeInterval(-2 * 60)), .fresh) + XCTAssertEqual(request.age(now: created.addingTimeInterval(-2 * 60 - 1)), .future) + } } diff --git a/DashWalletTests/DashConnect/KeyExchangeCryptoTests.swift b/DashWalletTests/DashConnect/KeyExchangeCryptoTests.swift index 67aff88ad3..a5d2dfe2ec 100644 --- a/DashWalletTests/DashConnect/KeyExchangeCryptoTests.swift +++ b/DashWalletTests/DashConnect/KeyExchangeCryptoTests.swift @@ -169,4 +169,98 @@ final class KeyExchangeCryptoTests: XCTestCase { appEphemeralPub: appEphemeralPub )) } + + // MARK: - App Connect v2 response + + /// Yappr's published vectors (`vendor/platform-auth/src/app-connect/vectors.json`). + private enum AppConnectVector { + static let appEphemeralPriv = Data(hex: "83adc3b5a48a1f3938969be4e3d674210d09aec8a2c2cb2b43b22972afca8682")! + static let appEphemeralPub = Data(hex: "03e83cb927e85f96ae50a95ca3be21cc7a3755139a941b15d99b01af4fecf0d270")! + static let appEphemeralPubKeyHash = Data(hex: "d77dc0da9df83a47755a15c42c5d9db9d7a7fd62")! + static let ownerId = Data(hex: "9296d642338cb3bfceeb554285462719e15f004d0579ce53ea77fb6d86cd9ab9")! + static let walletEphemeralPriv = Data(hex: "d1772740bcf476137df337bbe42122e82da08e11b632d6c3ff0d7281576e4127")! + static let walletEphemeralPub = Data(hex: "02ee49ae562aa74ea28f95094da6800db9244b1addc1499439ffc7382cd7862d5a")! + static let nonce = Data(hex: "22bb26ec9e0d316c4fb36be2")! + static let slots = [ + Data(hex: "7df2f40f15e6079e514d7e5cb9cb1861b89986906ed820e158c3144272df9586")!, + Data(hex: "3a992d9275d082af7540d1333a134ff0572c2bb79567437daa88dee55af1571f")!, + Data(hex: "b37bb0ae8d6bbf01b38e843470570d5158d1939762a88673dd6cdf71bc144753")!, + ] + static let hkdfOutput = "b9837f16975f02d7c06df91441bbf3dad51ca7d65016178f34084247dd1b703f" + static let aad = "646173683a6170702d636f6e6e6563743a7632d77dc0da9df83a47755a15c42c5d9db9d7a7fd629296d642338cb3bfceeb554285462719e15f004d0579ce53ea77fb6d86cd9ab9" + static let encryptedPayload = "22bb26ec9e0d316c4fb36be20e3f2a358cce3609d09094351ce5e78f08e5253b0f9258616374753411c97faecb1fbde336c01d7f08380095a0a7ffe3fe207f80e92a7adb7bd8731dffe3b96a6b2c363aa1302c4e82d60f75419aa1f6f3ac5522453f2b761495fb3b7816ea8bfe66a210e14fdad8b7f7c15ffb3ef39b" + } + + func testAppConnectKeyAndAssociatedDataMatchThePublishedVector() throws { + XCTAssertEqual(try KeyExchangeCrypto.hash160(AppConnectVector.appEphemeralPub), AppConnectVector.appEphemeralPubKeyHash) + XCTAssertEqual( + try Secp256k1.compressedPublicKey(privateKey: AppConnectVector.walletEphemeralPriv), + AppConnectVector.walletEphemeralPub) + + let sharedX = try Secp256k1.ecdhSharedX( + privateKey: AppConnectVector.walletEphemeralPriv, + publicKey: AppConnectVector.appEphemeralPub) + XCTAssertEqual(try KeyExchangeCrypto.deriveAppConnectAesKey(sharedX: sharedX).hexEncodedString(), AppConnectVector.hkdfOutput) + // The legacy exchange derives another key from the same secret. + XCTAssertNotEqual(try KeyExchangeCrypto.deriveAesKey(sharedX: sharedX).hexEncodedString(), AppConnectVector.hkdfOutput) + + XCTAssertEqual( + try KeyExchangeCrypto.appConnectAssociatedData( + appEphemeralPubKeyHash: AppConnectVector.appEphemeralPubKeyHash, + ownerId: AppConnectVector.ownerId).hexEncodedString(), + AppConnectVector.aad) + } + + func testAppConnectPayloadMatchesThePublishedVector() throws { + let payload = try KeyExchangeCrypto.encryptAppConnectSlots( + AppConnectVector.slots, + walletEphemeralPriv: AppConnectVector.walletEphemeralPriv, + appEphemeralPub: AppConnectVector.appEphemeralPub, + ownerId: AppConnectVector.ownerId, + nonce: AppConnectVector.nonce) + + XCTAssertEqual(payload.hexEncodedString(), AppConnectVector.encryptedPayload) + XCTAssertEqual(payload.count, 28 + 32 * 3) + } + + func testAppConnectPayloadOpensForTheAppAndOnlyUnderTheSameIdentity() throws { + let payload = try KeyExchangeCrypto.encryptAppConnectSlots( + AppConnectVector.slots, + walletEphemeralPriv: AppConnectVector.walletEphemeralPriv, + appEphemeralPub: AppConnectVector.appEphemeralPub, + ownerId: AppConnectVector.ownerId) + + XCTAssertNotEqual(payload.prefix(12), AppConnectVector.nonce) + XCTAssertEqual( + try KeyExchangeCrypto.decryptAppConnectSlots( + payload, + appEphemeralPriv: AppConnectVector.appEphemeralPriv, + walletEphemeralPub: AppConnectVector.walletEphemeralPub, + ownerId: AppConnectVector.ownerId), + AppConnectVector.slots) + // Copied under another identity it does not open. + XCTAssertThrowsError(try KeyExchangeCrypto.decryptAppConnectSlots( + payload, + appEphemeralPriv: AppConnectVector.appEphemeralPriv, + walletEphemeralPub: AppConnectVector.walletEphemeralPub, + ownerId: Data(repeating: 0x01, count: 32))) + } + + func testAppConnectPayloadTakesOneToSeventeenKeysOf32Bytes() throws { + let slot = AppConnectVector.slots[0] + func encrypt(_ slots: [Data], ownerId: Data = AppConnectVector.ownerId) throws -> Data { + try KeyExchangeCrypto.encryptAppConnectSlots( + slots, + walletEphemeralPriv: AppConnectVector.walletEphemeralPriv, + appEphemeralPub: AppConnectVector.appEphemeralPub, + ownerId: ownerId) + } + + XCTAssertEqual(try encrypt([slot]).count, 60) + XCTAssertEqual(try encrypt(Array(repeating: slot, count: 17)).count, 572) + XCTAssertThrowsError(try encrypt([])) + XCTAssertThrowsError(try encrypt(Array(repeating: slot, count: 18))) + XCTAssertThrowsError(try encrypt([slot.dropLast()])) + XCTAssertThrowsError(try encrypt([slot], ownerId: Data(repeating: 1, count: 31))) + } } From 7a414c84ec34c6ff1fa0b9bcc75f7249cd3141fe Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 12:28:44 +0300 Subject: [PATCH 008/108] fix(dashpay): take an App Connect callback only with a plain lowercase host A bracketed host passed the check and read back without its brackets, and IP addresses passed in every spelling. The host is now a plain DNS name in lowercase. Query values are form-decoded one sequence at a time, and the version in the unsupported error is echoed only when it is a short number. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/Protocol/DashConnectUri.swift | 60 +++++++++++++++---- .../DashConnect/DashConnectUriTests.swift | 32 +++++++++- .../DashConnect/KeyExchangeCryptoTests.swift | 9 +++ 3 files changed, 88 insertions(+), 13 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift index 0c6c9712d6..7ce73f2db2 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift @@ -204,8 +204,8 @@ enum DashConnectUri { } let body = String(remainder[.. String { - let text = String(scalars).replacingOccurrences(of: "+", with: " ") - return text.removingPercentEncoding ?? text + let source = Array(String(scalars).utf8) + let hexValue = { (byte: UInt8) -> UInt8? in + byte < 0x80 ? Character(UnicodeScalar(byte)).hexDigitValue.map(UInt8.init) : nil + } + var bytes: [UInt8] = [] + bytes.reserveCapacity(source.count) + var index = 0 + while index < source.count { + let byte = source[index] + if byte == UInt8(ascii: "%"), index + 2 < source.count, + let high = hexValue(source[index + 1]), let low = hexValue(source[index + 2]) { + bytes.append(high << 4 | low) + index += 3 + } else { + bytes.append(byte == UInt8(ascii: "+") ? 0x20 : byte) + index += 1 + } + } + return String(decoding: bytes, as: UTF8.self) } /// `cb` is an absolute `https` URL without credentials, already /// form-decoded. The app's own check takes anything a browser's URL - /// parser repairs; this takes only a URL that is valid as written, with a - /// host written without percent-encoding and a port that is a port. The - /// host is what the user will be shown. + /// parser repairs or percent-encodes; this refuses what `URLComponents` + /// does not take as written, and takes a host only when it is a plain + /// lowercase DNS name (see `isPlainHostName`) and a port only when it is + /// a port. The host is what the user will be shown. In one case this is + /// the looser side: an `xn--` label that is not valid punycode passes + /// here and not in the app. private static func parseCallback(_ text: String) throws -> URL { guard text.utf16.count <= maxCallbackLength, let components = URLComponents(string: text, encodingInvalidCharacters: false), components.scheme?.lowercased() == "https", // Presence, not the decoded value: that is nil for bytes that are not UTF-8. components.rangeOfUser == nil, components.rangeOfPassword == nil, - let hostRange = components.rangeOfHost, !hostRange.isEmpty, !text[hostRange].contains("%"), + let hostRange = components.rangeOfHost, isPlainHostName(text[hostRange]), components.rangeOfPort == nil || components.port.map({ (0 ... 65535).contains($0) }) == true, let url = components.url else { throw AppConnectRequestError.invalid("callback is not an https URL without credentials") @@ -267,6 +290,21 @@ enum DashConnectUri { return url } + /// Dot-separated labels of lowercase ASCII letters, digits and hyphens, + /// none of them empty, the last one starting with a letter. That leaves + /// out IP addresses in every spelling (`[::1]`, `1.2.3.4`, `2130706433`, + /// `1.2.3.0x4`), bracketed text, which `URL.host` reads back without the + /// brackets, percent-encoding, and capitals, which a browser lowercases + /// (`paypaI.com` opens `paypai.com`). Whether an `xn--` label is valid + /// punycode is not checked. + private static func isPlainHostName(_ host: Substring) -> Bool { + let labels = host.split(separator: ".", omittingEmptySubsequences: false) + let isLetter = { (scalar: Unicode.Scalar) in ("a" ... "z").contains(scalar) } + return labels.allSatisfy { label in + !label.isEmpty && label.unicodeScalars.allSatisfy { isLetter($0) || ("0" ... "9").contains($0) || $0 == "-" } + } && labels.last?.unicodeScalars.first.map(isLetter) == true + } + static func parseStRequest(_ uri: String) throws -> DashStRequest { let envelope = try parseEnvelope(uri, scheme: stScheme, diff --git a/DashWalletTests/DashConnect/DashConnectUriTests.swift b/DashWalletTests/DashConnect/DashConnectUriTests.swift index 84cd2f73b8..54fa951fe1 100644 --- a/DashWalletTests/DashConnect/DashConnectUriTests.swift +++ b/DashWalletTests/DashConnect/DashConnectUriTests.swift @@ -375,7 +375,7 @@ final class DashConnectUriTests: XCTestCase { // Credentials that do not decode as text are still credentials. "https%3A%2F%2F%25FF%40yap.pr%2F", "https%3A%2F%2Fyap.pr%25FF%40evil.example%2F", "https%3A%2F%2Fyap.pr%25FF%3A%25FF%40evil.example%2F", - "yap.pr%2Fconnect", "https%3A%2F%2Fyap.pr%2F" + String(repeating: "a", count: 512), + "yap.pr%2Fconnect", "https%3A%2F%2Fyap.pr%2F" + String(repeating: "a", count: 513 - "https://yap.pr/".count), ] { XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest(base + "&cb=" + callback), callback) { error in guard case .invalid = error as? AppConnectRequestError else { return XCTFail("\(error)") } @@ -431,6 +431,26 @@ final class DashConnectUriTests: XCTestCase { } // A combining mark after a delimiter does not swallow it. XCTAssertEqual(try parse("v=2&\u{301}x=1&n=t").network, .testnet) + + // `+` is a space, which no parameter here may contain. + XCTAssertEqual(try parse("n=t&v=2&cb=https://yap.pr/a-b").callback?.path, "/a-b") + XCTAssertThrowsError(try parse("n=t&v=2&cb=https://yap.pr/a+b")) + XCTAssertThrowsError(try parse("n=t&v=+2")) + // Each sequence decodes on its own: the `%3F` here opens a query + // even though `%FF` is not text, and the result is then not a URL + // as written. + XCTAssertEqual(try parse("n=t&v=2&cb=https://yap.pr/a%3Fr%3D1").callback?.query, "r=1") + XCTAssertThrowsError(try parse("n=t&v=2&cb=https://yap.pr/a%3Fr%3D1%FF")) + // A `%` without two hex digits stands as written, at the end too. + XCTAssertThrowsError(try parse("n=t&v=2&cb=https://yap.pr/a%")) + for version in ["%", "%4", ""] { + XCTAssertThrowsError(try parse("n=t&v=" + version), version) { error in + XCTAssertEqual(error as? AppConnectRequestError, .unsupported("URI version (unreadable)")) + } + } + XCTAssertThrowsError(try parse("n=t&v=" + String(repeating: "9", count: 4))) { error in + XCTAssertEqual(error as? AppConnectRequestError, .unsupported("URI version (unreadable)")) + } } func testAppConnectCallbackHostMustReadAsWritten() throws { @@ -441,7 +461,15 @@ final class DashConnectUriTests: XCTestCase { // Decodes to `https://yap.pr%2F.evil.example/`: a host that only looks like yap.pr. for callback in ["https%3A%2F%2Fyap.pr%252F.evil.example%2F", "https%3A%2F%2Fyap.pr%2540evil.example%2F", "https%3A%2F%2Fyap.pr%3A99999%2F", "https%3A%2F%2Fyap.pr%3A99999999999999999999%2F", - "https%3A%2F%2Fb%C3%BCcher.example%2F"] { + "https%3A%2F%2Fb%C3%BCcher.example%2F", + // Bracketed text reads back without its brackets. + "https%3A%2F%2F%5Byap.pr%5D%2F", "https%3A%2F%2F%5B%5D%2F", "https%3A%2F%2F%5Byap.pr%3Aevil.example%5D%2F", + // Addresses, in the spellings a browser takes. + "https%3A%2F%2F%5B%3A%3A1%5D%2F", "https%3A%2F%2F1.2.3.4%2F", "https%3A%2F%2F2130706433%2F", + "https%3A%2F%2F0x7f.1%2F", "https%3A%2F%2Ffoo.123%2F", "https%3A%2F%2F1.2.3.0x4%2F", "https%3A%2F%2F0x7f000001%2F", + // A browser lowercases the host: `paypaI.com` opens `paypai.com`. + "https%3A%2F%2FpaypaI.com%2F", "https%3A%2F%2FYAP.PR%2F", + "https%3A%2F%2Fyap..pr%2F", "https%3A%2F%2Fyap.pr.%2F", "https%3A%2F%2Fyap_pr.example%2F"] { XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest(base + "&cb=" + callback), callback) } // An international host is written in its ASCII form. diff --git a/DashWalletTests/DashConnect/KeyExchangeCryptoTests.swift b/DashWalletTests/DashConnect/KeyExchangeCryptoTests.swift index a5d2dfe2ec..97669c6d4f 100644 --- a/DashWalletTests/DashConnect/KeyExchangeCryptoTests.swift +++ b/DashWalletTests/DashConnect/KeyExchangeCryptoTests.swift @@ -230,7 +230,16 @@ final class KeyExchangeCryptoTests: XCTestCase { appEphemeralPub: AppConnectVector.appEphemeralPub, ownerId: AppConnectVector.ownerId) + let second = try KeyExchangeCrypto.encryptAppConnectSlots( + AppConnectVector.slots, + walletEphemeralPriv: AppConnectVector.walletEphemeralPriv, + appEphemeralPub: AppConnectVector.appEphemeralPub, + ownerId: AppConnectVector.ownerId) + + // A nonce of its own every time. XCTAssertNotEqual(payload.prefix(12), AppConnectVector.nonce) + XCTAssertNotEqual(payload.prefix(12), second.prefix(12)) + XCTAssertNotEqual(payload.prefix(12), Data(count: 12)) XCTAssertEqual( try KeyExchangeCrypto.decryptAppConnectSlots( payload, From 7ec86f20fa12781bc77febae6d01f917b1a11bf0 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 12:28:44 +0300 Subject: [PATCH 009/108] fix(dashpay): keep a stored App Connect value that is not a row list Saving grants replaced or removed a stored value that did not parse as a JSON array, although reading it logs that it is left in place. The save is now skipped. The test spy's disconnect state moves behind its lock. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 17 ++++++--- .../PlatformDashConnectDataSourceTests.swift | 37 +++++++++++++++++-- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index ec273d0c77..c8f75bef1f 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -467,10 +467,17 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { func save(_ grants: [AppConnectGrant]) { guard let storageKey else { return } + let stored = readRows() + // A value that is not a list of rows is not this build's to replace: + // nothing is written until it is gone. + guard !stored.isNotRowList else { + Self.logger.error("AppConnectResponseStore: stored value is not a JSON array; grants not saved") + return + } // Rows this build cannot read are written back untouched: each one is // the only record of a response on Platform, and dropping it would // leave that response impossible to find. - let unreadable = readRows().unreadable + let unreadable = stored.unreadable guard !grants.isEmpty || !unreadable.isEmpty else { defaults.removeObject(forKey: storageKey) return @@ -488,11 +495,11 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { /// Decodes row by row, like `UserDefaultsDashConnectStore`, so one /// unreadable row costs one record instead of all of them. - private func readRows() -> (grants: [AppConnectGrant], unreadable: [Any]) { - guard let storageKey, let data = defaults.data(forKey: storageKey) else { return ([], []) } + private func readRows() -> (grants: [AppConnectGrant], unreadable: [Any], isNotRowList: Bool) { + guard let storageKey, let data = defaults.data(forKey: storageKey) else { return ([], [], false) } guard let rows = (try? JSONSerialization.jsonObject(with: data)) as? [Any] else { Self.logger.error("AppConnectResponseStore: stored value is not a JSON array; left in place") - return ([], []) + return ([], [], true) } var grants: [AppConnectGrant] = [] var unreadable: [Any] = [] @@ -509,6 +516,6 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { Self.logger.warning( "AppConnectResponseStore: \(unreadable.count, privacy: .public) stored grant(s) could not be read; kept as stored") } - return (grants, unreadable) + return (grants, unreadable, false) } } diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 7696a5e56c..1daf7c54e8 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1424,12 +1424,24 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { throw PurchaseSpyError.unsupported } - var disconnectFailure: Error? - private(set) var disconnectedIds: [String] = [] + private var storedDisconnectFailure: Error? + private var storedDisconnectedIds: [String] = [] + + var disconnectFailure: Error? { + get { lock.withLock { storedDisconnectFailure } } + set { lock.withLock { storedDisconnectFailure = newValue } } + } + + var disconnectedIds: [String] { + lock.withLock { storedDisconnectedIds } + } func disconnect(id: String) async throws { - disconnectedIds.append(id) - if let disconnectFailure { throw disconnectFailure } + let failure = lock.withLock { () -> Error? in + storedDisconnectedIds.append(id) + return storedDisconnectFailure + } + if let failure { throw failure } } func remove(id: String) async { @@ -1869,6 +1881,23 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertNotNil(defaults.data(forKey: "scope.app-connect-responses.v1")) } + func testAStoredValueThatIsNotARowListIsNeverReplaced() { + let suiteName = "AppConnectResponseStoreTests.\(UUID().uuidString)" + let defaults = UserDefaults(suiteName: suiteName)! + defer { defaults.removePersistentDomain(forName: suiteName) } + let key = "scope.app-connect-responses.v1" + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } + + for stored in [Data(#"{"rows":[]}"#.utf8), Data([0xFF, 0x00])] { + defaults.set(stored, forKey: key) + XCTAssertEqual(store.load().count, 0) + store.save([Self.grant(sessionKeyId: 7)]) + XCTAssertEqual(defaults.data(forKey: key), stored) + store.save([]) + XCTAssertEqual(defaults.data(forKey: key), stored) + } + } + func testAGrantedKeyMissingFromTheIdentityViewIsReportedNotAssumedGone() { let grants = [9, 13].map { Self.grant(sessionKeyId: $0) } let keys = [Self.key(keyId: 9, data: Data([9]), disabledAt: 1)] From d24e54a020d152a5ed1ad22bc13a2362e3503936 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 14:47:10 +0300 Subject: [PATCH 010/108] fix(dashpay): show what a one-QR sign-in gives the app and bind the approval to it The approval sheet now resolves which login the network takes before it is shown. For the one-QR login it names the session key's budget and lifetime, and the key is registered with the terms that were shown. An approval is refused, and the sheet rebuilt, when the active identity or the login is no longer the one on the sheet; with the protocol version unknown there is nothing to approve. - A session key found already registered is reused only when it is bound to the request's contract and carries limits within the approved terms. - A publish is recorded as unconfirmed before it is submitted, so a republished response is not dropped by a later disconnect. - The grant store reports that it cannot persist while its stored value is not a row list, and a grant that did not land stops the login before the response is published. - Disconnecting a one-QR connection that replaced a two-QR one keeps the row in the two-QR "approved" state while that login's keys are live, and never disables them. - The two remaining English-only errors are localized, and the PR's new strings are added to the catalogs. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 100 +++++- .../DashConnect/DashConnectDataSource.swift | 18 +- .../DashConnect/DashConnectModels.swift | 26 +- .../PlatformDashConnectDataSource.swift | 284 ++++++++++++---- .../DashConnect/ApproveConnectionSheet.swift | 106 ++++-- .../Components/ApproveSheetPresentation.swift | 12 +- .../Components/ConnectionRow.swift | 3 +- .../UI/DashConnect/ConnectionsScreen.swift | 4 +- .../UI/DashConnect/ConnectionsViewModel.swift | 11 +- DashWallet/ar.lproj/Localizable.strings | 15 + DashWallet/bg.lproj/Localizable.strings | 15 + DashWallet/ca.lproj/Localizable.strings | 15 + DashWallet/cs.lproj/Localizable.strings | 15 + DashWallet/da.lproj/Localizable.strings | 15 + DashWallet/de.lproj/Localizable.strings | 15 + DashWallet/el.lproj/Localizable.strings | 15 + DashWallet/en.lproj/Localizable.strings | 15 + DashWallet/eo.lproj/Localizable.strings | 15 + DashWallet/es.lproj/Localizable.strings | 15 + DashWallet/et.lproj/Localizable.strings | 15 + DashWallet/fa.lproj/Localizable.strings | 15 + DashWallet/fi.lproj/Localizable.strings | 15 + DashWallet/fil.lproj/Localizable.strings | 15 + DashWallet/fr.lproj/Localizable.strings | 15 + DashWallet/hr.lproj/Localizable.strings | 15 + DashWallet/hu.lproj/Localizable.strings | 15 + DashWallet/id.lproj/Localizable.strings | 15 + DashWallet/it.lproj/Localizable.strings | 15 + DashWallet/ja.lproj/Localizable.strings | 15 + DashWallet/ko.lproj/Localizable.strings | 15 + DashWallet/mk.lproj/Localizable.strings | 15 + DashWallet/ms.lproj/Localizable.strings | 15 + DashWallet/nb.lproj/Localizable.strings | 15 + DashWallet/nl.lproj/Localizable.strings | 15 + DashWallet/pl.lproj/Localizable.strings | 15 + DashWallet/pt.lproj/Localizable.strings | 15 + DashWallet/ro.lproj/Localizable.strings | 15 + DashWallet/ru.lproj/Localizable.strings | 15 + DashWallet/sk.lproj/Localizable.strings | 15 + DashWallet/sl.lproj/Localizable.strings | 15 + DashWallet/sl_SI.lproj/Localizable.strings | 15 + DashWallet/sq.lproj/Localizable.strings | 15 + DashWallet/sr.lproj/Localizable.strings | 15 + DashWallet/sv.lproj/Localizable.strings | 15 + DashWallet/th.lproj/Localizable.strings | 15 + DashWallet/tr.lproj/Localizable.strings | 15 + DashWallet/uk.lproj/Localizable.strings | 15 + DashWallet/vi.lproj/Localizable.strings | 15 + DashWallet/zh-Hans.lproj/Localizable.strings | 15 + .../zh-Hant-TW.lproj/Localizable.strings | 15 + DashWallet/zh.lproj/Localizable.strings | 15 + DashWallet/zh_TW.lproj/Localizable.strings | 15 + .../DashConnectDataSourceTests.swift | 3 +- .../DashConnect/DashConnectStoreTests.swift | 6 +- .../PlatformDashConnectDataSourceTests.swift | 314 ++++++++++++++++-- 55 files changed, 1389 insertions(+), 143 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index c8f75bef1f..3fc476f359 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -28,10 +28,32 @@ enum AppConnect { static let sessionKeyBudgetCredits: UInt64 = 5_000_000_000 // 0.05 DASH static let sessionKeyLifetime: TimeInterval = 90 * 24 * 60 * 60 + /// What a one-QR approval gives the app: how many of the identity's + /// credits its key may spend and for how long the key works. The approval + /// sheet shows these values and the key is registered with them. + struct SessionKeyTerms: Equatable { + let budgetCredits: UInt64 + let lifetime: TimeInterval + + static let current = SessionKeyTerms( + budgetCredits: sessionKeyBudgetCredits, + lifetime: sessionKeyLifetime) + + func expiresAt(from now: Date) -> UInt64 { + UInt64((now.addingTimeInterval(lifetime).timeIntervalSince1970 * 1000).rounded()) + } + } + static func isAvailable(protocolVersion: UInt32) -> Bool { protocolVersion >= minimumProtocolVersion } + /// The terms of the login a network at `protocolVersion` gets: the + /// session key's for the one-QR login, none for the two-QR login. + static func sessionKeyTerms(protocolVersion: UInt32) -> SessionKeyTerms? { + isAvailable(protocolVersion: protocolVersion) ? .current : nil + } + /// The DIP-13 leaf of the session key: `hash256` of the app's ephemeral /// public key. Not the lookup key of the response, which is `hash160` of /// the same bytes. @@ -39,24 +61,42 @@ enum AppConnect { Data(SHA256.hash(data: Data(SHA256.hash(data: appEphemeralPubKey)))) } - static func expiresAt(from now: Date) -> UInt64 { - UInt64((now.addingTimeInterval(sessionKeyLifetime).timeIntervalSince1970 * 1000).rounded()) - } - /// What the identity already holds for a derived session key. enum SessionKeyState: Equatable { /// Not on the identity: register it. case absent - /// Registered and able to sign: publish without an identity update. + /// Registered, able to sign, and shown to be this app's key within + /// the approved terms: publish without an identity update. case usable(keyId: UInt32) - /// Registered but disabled or expired. Platform never re-adds a key, - /// so this request cannot be answered; the app has to ask again. + /// Registered but disabled or expired, or not shown to be this app's + /// key within the approved terms. Platform never re-adds a key, so + /// this request cannot be answered; the app has to ask again. case unusable } + /// How far the device clock may have moved back since a key was + /// registered before that key's expiry counts as later than the terms + /// allow. Without it a clock correction between two tries of one request + /// would turn the wallet's own key away. + static let clockTolerance: TimeInterval = 60 * 60 + + /// The session key is derived from the identity and the request's + /// ephemeral key, not from the app's contract, so a request that repeats + /// another app's ephemeral key derives that app's key. A registered key + /// is therefore reused only when it is bound to `appContractId` and + /// carries limits no wider than `terms`. + /// + /// The fetched key list carries no bounds. The bound is read from + /// `bindings`; a key the store cannot place counts as this app's only + /// when `grantedKeyIds` holds it — the keys this wallet recorded giving + /// this app for this request. static func sessionKeyState( publicKeyHash160: Data, currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + appContractId: Data, + bindings: [KeyBinding], + grantedKeyIds: Set, + terms: SessionKeyTerms, now: Date ) -> SessionKeyState { guard let key = currentIdentityPublicKeys.first(where: { @@ -68,10 +108,19 @@ enum AppConnect { guard key.purpose == .authentication, key.securityLevel == .high, key.disabledAt == nil, - key.expiresAt.map({ $0 > nowMilliseconds }) ?? true else { + let totalBudget = key.totalBudget, + totalBudget <= terms.budgetCredits, + let expiresAt = key.expiresAt, + expiresAt > nowMilliseconds, + UInt64(expiresAt) <= terms.expiresAt(from: now.addingTimeInterval(clockTolerance)) else { return .unusable } - return .usable(keyId: UInt32(bitPattern: key.keyId)) + let keyId = UInt32(bitPattern: key.keyId) + let stored = bindings.first { $0.keyId == keyId && $0.data == key.data && !$0.hasUnreadableBound } + guard stored.map({ $0.singleContractId == appContractId }) ?? grantedKeyIds.contains(keyId) else { + return .unusable + } + return .usable(keyId: keyId) } static func nextKeyId( @@ -155,11 +204,15 @@ enum AppConnect { /// has no grant record for. A key that is gone, already disabled, or of /// another shape is left alone, including one another wallet gave the /// app with a document-type bound, a single limit or another key type. + /// So is the two-QR login's authentication key, named by + /// `twoQRAuthenticationKeyHash160`: it has the same kind and bound, and a + /// `dash-st:` registration may have put limits on it. static func sessionKeyIdsToDisable( for grants: [AppConnectGrant], appContractId: Data, bindings: [KeyBinding], - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + twoQRAuthenticationKeyHash160: Data? = nil ) -> [UInt32] { let granted = Set(grants.map(\.sessionKeyId)) return currentIdentityPublicKeys @@ -167,7 +220,8 @@ enum AppConnect { guard isLiveSessionKey(key) else { return false } let keyId = UInt32(bitPattern: key.keyId) if granted.contains(keyId) { return true } - guard key.totalBudget != nil, key.expiresAt != nil else { return false } + guard key.totalBudget != nil, key.expiresAt != nil, + key.data != twoQRAuthenticationKeyHash160 else { return false } return bindings.contains { $0.keyId == keyId && $0.data == key.data && $0.singleContractId == appContractId } @@ -226,6 +280,17 @@ enum AppConnect { return Set(grants.map(\.sessionKeyId)).subtracting(known).sorted() } + /// What a disconnect leaves of the matching records once their keys are + /// disabled. A record whose response is known to be gone is done; the + /// rest stay, marked, until their response is deleted, or found if its + /// publish never confirmed. + static func markKeysDisabled(in grants: inout [AppConnectGrant], where matches: (AppConnectGrant) -> Bool) { + grants.removeAll { matches($0) && $0.responseDeleted == true } + for index in grants.indices where matches(grants[index]) { + grants[index].keyDisabled = true + } + } + /// The query for one identity's response to one request, in the order of /// the contract's only index. A byte-array value travels as base64. static func responseLookupWhereClause(appEphemeralPubKeyHash: Data, ownerIdentityId: Data) -> String { @@ -396,6 +461,15 @@ struct AppConnectGrant: Codable, Equatable { [identityId, appContractId, String(sessionKeyId), values.appEphemeralPubKeyHash].joined(separator: "|") } + /// Call before a publish is submitted. Until Platform confirms it, the + /// response may be there or not, whatever the record said before: a + /// response an earlier login deleted is published again when its request + /// comes back. + mutating func markPublishStarted() { + documentId = nil + responseDeleted = nil + } + /// Whether there is a response on Platform this record can still delete. var hasDeletableResponse: Bool { documentId != nil && responseDeleted != true @@ -459,7 +533,9 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { scopeKeyProvider().map { "\($0).app-connect-responses.v1" } } - var canPersist: Bool { storageKey != nil } + /// False as well while the stored value is not a list of rows: `save` + /// leaves such a value alone, so nothing new would be kept. + var canPersist: Bool { storageKey != nil && !readRows().isNotRowList } func load() -> [AppConnectGrant] { readRows().grants diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index c60f51236e..ce3c450fc8 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -25,7 +25,10 @@ protocol DashConnectDataSource { func parseQR(_ content: String) async throws -> DashConnectQr func makeConnectionRequest(from loginRequest: DashKeyRequest) async -> ConnectionRequest - func approveLogin(_ request: DashKeyRequest) async throws -> DAppConnection + /// `consent` is the request as the approval sheet showed it. A login + /// that would give the app something else, or act for another identity, + /// is refused. + func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection /// Parses a scanned `dash-st:` payload and either completes key /// registration immediately or returns a token purchase that awaits /// explicit user approval via `approveTokenPurchase(_:)`. @@ -40,9 +43,12 @@ protocol DashConnectDataSource { /// the app was given on the identity and deletes the published response, /// and throws when the key could not be disabled — the connection then /// stays as it was. The connection also stays, without an error, while - /// the app holds a key on another identity of the wallet. For a two-QR connection it only changes the local - /// status: that login derives the same key every time and Platform never - /// re-adds a disabled key, so disabling it would lock the app out for good. + /// the app holds a key on another identity of the wallet. For a two-QR + /// connection it only changes the local status: that login derives the + /// same key every time and Platform never re-adds a disabled key, so + /// disabling it would lock the app out for good. A one-QR connection that + /// replaced a two-QR one gets both: its session keys are disabled, and it + /// stays, in that local status, while the two-QR keys are on the identity. func disconnect(id: String) async throws func remove(id: String) async } @@ -201,7 +207,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { throw DashConnectMockError.notDashConnectQrCode } - func approveLogin(_ request: DashKeyRequest) async throws -> DAppConnection { + func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { try await Task.sleep(nanoseconds: 400_000_000) if shouldFailNextApprove { @@ -209,7 +215,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { throw DashConnectMockError.approveFailed } - let connectionRequest = await makeConnectionRequest(from: request) + let connectionRequest = consent let connection = DAppConnection( id: connectionRequest.appContractId, name: connectionRequest.appLabel.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : connectionRequest.appLabel, diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 5a94c68a40..0f1546599f 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -199,6 +199,12 @@ struct ConnectionRequest: Equatable { let walletUsername: String? let walletIdentityId: String? let existingConnection: DAppConnection? + /// What the one-QR login gives the app. `nil` for the two-QR login, which + /// registers no key at approval. + var sessionKeyTerms: AppConnect.SessionKeyTerms? = nil + /// The network did not say which login it takes, so what approving would + /// give the app is unknown and there is nothing to approve yet. + var isLoginUnresolved = false } extension ConnectionRequest { @@ -226,7 +232,9 @@ extension ConnectionRequest { appUrl: String, walletUsername: String?, walletIdentityId: String?, - existingConnection: DAppConnection? + existingConnection: DAppConnection?, + sessionKeyTerms: AppConnect.SessionKeyTerms? = nil, + isLoginUnresolved: Bool = false ) { self.init( appLabel: appLabel.trimmingCharacters(in: .whitespacesAndNewlines), @@ -234,7 +242,21 @@ extension ConnectionRequest { appContractId: loginRequest.contractId.toBase58String(), walletUsername: walletUsername, walletIdentityId: walletIdentityId, - existingConnection: existingConnection + existingConnection: existingConnection, + sessionKeyTerms: sessionKeyTerms, + isLoginUnresolved: isLoginUnresolved ) } } + +extension AppConnect.SessionKeyTerms { + /// The budget as DASH at full credit precision, e.g. "0.05 DASH". + var budgetText: String { + PlatformCreditsFormatter.dashString(budgetCredits) + } + + /// The lifetime in whole days. + var lifetimeDays: Int { + Int(lifetime / (24 * 60 * 60)) + } +} diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index afacd706fa..0ebc43e477 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -75,6 +75,9 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case identityKeysOutOfDate case grantOnAnotherIdentity case grantStoreUnavailable + case approvalOutOfDate + case grantNotRecorded + case twoQRKeysNotChecked case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -131,13 +134,31 @@ enum DashConnectPlatformError: LocalizedError, Equatable { "This app has a key on another identity of this wallet. Switch to that identity to turn it off.", comment: "DashConnect") case .grantStoreUnavailable: - return "This wallet cannot record the key it would give the app, so the sign-in was not started." + return NSLocalizedString( + "This wallet cannot record the key it would give the app, so the sign-in was not started.", + comment: "DashConnect") + case .grantNotRecorded: + return NSLocalizedString( + "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key.", + comment: "DashConnect") + case .twoQRKeysNotChecked: + return NSLocalizedString( + "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again.", + comment: "DashConnect") + case .approvalOutOfDate: + return NSLocalizedString( + "The details of this sign-in changed while it was on screen. Check them and approve again.", + comment: "DashConnect") case .sessionKeyUnusable: return NSLocalizedString( "This sign-in request can no longer be approved. Ask the app for a new code.", comment: "DashConnect") case .unsupportedStateTransition(let kindName): - return "This wallet cannot approve the scanned request (\(kindName))." + return String( + format: NSLocalizedString( + "This wallet cannot approve the scanned request (%@).", + comment: "DashConnect: the placeholder is the kind of the scanned state transition"), + kindName) case .devnetLoginContractNotConfigured: return NSLocalizedString( "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings.", @@ -172,6 +193,16 @@ enum DashConnectPlatformError: LocalizedError, Equatable { } } +/// What a disconnect found besides the session keys it disabled. +struct AppConnectRevocation: Equatable { + /// A grant record shows the app with a live key on another identity of + /// this wallet. + let liveOnAnotherIdentity: Bool + /// The keys of an earlier two-QR login to the app are still live on this + /// identity. + let twoQRKeysRemain: Bool +} + struct DashConnectLoginKeyResponseDraft: Equatable { let properties: [String: AnyHashable] let walletEphemeralPublicKey: Data @@ -445,8 +476,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } + // Which login this network gets is settled here, so the sheet can + // show what the app is given. With the version unknown the request + // says so, and the sheet offers nothing to approve. The lookup runs + // alongside the two below. + async let resolvedProtocolVersion = try? Self.networkProtocolVersion(sdk: context.sdk) let metadata = await resolveAppMetadata(for: loginRequest, sdk: context.sdk) let walletUsername = await resolveWalletUsername(context: context) + let protocolVersion = await resolvedProtocolVersion return ConnectionRequest( loginRequest: loginRequest, @@ -454,15 +491,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { appUrl: metadata.url, walletUsername: walletUsername, walletIdentityId: context.identityId.toBase58String(), - existingConnection: existingConnection + existingConnection: existingConnection, + sessionKeyTerms: protocolVersion.flatMap(AppConnect.sessionKeyTerms(protocolVersion:)), + isLoginUnresolved: protocolVersion == nil ) } - func approveLogin(_ request: DashKeyRequest) async throws -> DAppConnection { + func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { Self.logger.info("🔗 DASHCONNECT :: approveLogin started") try validateNetwork(request.network) + guard consent.appContractId == request.contractId.toBase58String(), !consent.isLoginUnresolved else { + throw DashConnectPlatformError.approvalOutOfDate + } - let context: Context + var context: Context do { context = try await requireContext() } catch { @@ -483,22 +525,34 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") throw error } + // The sheet showed the login `makeConnectionRequest` resolved: its + // terms, or none for the two-QR login. If the network now gets the + // other one, what was approved is not what would run. Either login + // acts for the identity that was on the sheet: it has to be the + // active one here, and again after the PIN prompt. + let terms = AppConnect.sessionKeyTerms(protocolVersion: protocolVersion) + guard consent.sessionKeyTerms == terms, + consent.walletIdentityId == context.identityId.toBase58String() else { + Self.logger.error("🔗 DASHCONNECT :: the approved sign-in no longer matches the network or the identity") + throw DashConnectPlatformError.approvalOutOfDate + } do { try await authorize() } catch { Self.logger.error("🔗 DASHCONNECT :: authorization failed — \(error.localizedDescription, privacy: .public)") throw error } - if AppConnect.isAvailable(protocolVersion: protocolVersion) { + // The PIN prompt can outlast a wallet or identity switch: sign with + // what is active now, and only if it is still the identity that was + // shown. + let authorized = try await requireContext() + guard authorized.identityId == context.identityId else { + throw DashConnectPlatformError.approvalOutOfDate + } + context = authorized + if let terms { Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") - // The PIN prompt can outlast a wallet or identity switch, and this - // path puts a spend-capable key on the identity: sign with what is - // active now, and only if it is still the identity that was shown. - let authorized = try await requireContext() - guard authorized.identityId == context.identityId else { - throw DashConnectPlatformError.noIdentity - } - return try await approveAppConnectLogin(request, context: authorized) + return try await approveAppConnectLogin(request, consent: consent, terms: terms, context: context) } Self.logger.info("🔗 DASHCONNECT :: authorized; deriving login key") @@ -547,8 +601,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse document written") - let preview = await makeConnectionRequest(from: request) - Self.logger.info("🔗 DASHCONNECT :: connection preview resolved") let connection: DAppConnection do { var derivedMaterial = try Self.deriveKeyRegistrationMaterial( @@ -574,9 +626,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { encryptionPublicKey: derivedMaterial.encryptionPublicKey, currentIdentityPublicKeys: currentPublicKeys ) { - connection = Self.makeConnection(preview: preview, status: .active, updatedAt: now()) + connection = Self.makeConnection(preview: consent, status: .active, updatedAt: now()) } else { - connection = Self.makeConnection(preview: preview, status: .approved, updatedAt: now()) + connection = Self.makeConnection(preview: consent, status: .approved, updatedAt: now()) } } catch { Self.logger.error( @@ -584,7 +636,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) // Conservative fallback: asking for a QR is safer than claiming the // registration is already on the identity when we could not verify it. - connection = Self.makeConnection(preview: preview, status: .approved, updatedAt: now()) + connection = Self.makeConnection(preview: consent, status: .approved, updatedAt: now()) } var current = subject.value.filter { $0.id != connection.id } @@ -617,6 +669,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// does nothing more. private func approveAppConnectLogin( _ request: DashKeyRequest, + consent: ConnectionRequest, + terms: AppConnect.SessionKeyTerms, context: Context ) async throws -> DAppConnection { guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { @@ -654,6 +708,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let requestHash = sealed.appEphemeralPubKeyHash.toHexString() let signer = KeychainSigner(modelContainer: context.modelContainer) let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) + func isGrantForRequest(_ grant: AppConnectGrant) -> Bool { + grant.identityId == identityId && grant.appContractId == appContractId + && grant.values.appEphemeralPubKeyHash == requestHash + } + + // Read only for a key that is already on the identity. If the store + // cannot be read, such a key needs a grant record instead. + var bindings: [AppConnect.KeyBinding] = [] + var grantedKeyIds: Set = [] + if currentPublicKeys.contains(where: { $0.keyType == .ecdsaHash160 && $0.data == sessionKeyHash160 }) { + bindings = (try? Self.storedKeyBindings( + identityId: identityId, modelContainer: context.modelContainer)) ?? [] + grantedKeyIds = Set(responseStore.load().filter(isGrantForRequest).map(\.sessionKeyId)) + } let sessionKeyId: UInt32 var totalBudget: UInt64? @@ -661,6 +729,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { switch AppConnect.sessionKeyState( publicKeyHash160: sessionKeyHash160, currentIdentityPublicKeys: currentPublicKeys, + appContractId: request.contractId, + bindings: bindings, + grantedKeyIds: grantedKeyIds, + terms: terms, now: now() ) { case .unusable: @@ -673,8 +745,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { expiresAt = registered?.expiresAt.map { UInt64(max(0, $0)) } case .absent: let keyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) - let budget = AppConnect.sessionKeyBudgetCredits - let expiry = AppConnect.expiresAt(from: now()) + let budget = terms.budgetCredits + let expiry = terms.expiresAt(from: now()) let key = AppConnect.sessionIdentityPubkey( keyId: keyId, publicKeyHash160: sessionKeyHash160, @@ -703,10 +775,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // recorded for this request keeps its values: if an earlier publish // landed without confirming, those are the ones on Platform. let grant = updateGrants { grants -> AppConnectGrant in - if let existing = grants.first(where: { - $0.identityId == identityId && $0.appContractId == appContractId - && $0.sessionKeyId == sessionKeyId && $0.values.appEphemeralPubKeyHash == requestHash - }) { + if let existing = grants.first(where: { isGrantForRequest($0) && $0.sessionKeyId == sessionKeyId }) { return existing } let new = AppConnectGrant( @@ -723,13 +792,21 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return new } - let preview = await makeConnectionRequest(from: request) let connection = Self.makeConnection( - preview: preview, status: .active, updatedAt: now(), loginKind: .oneQR) + preview: consent, status: .active, updatedAt: now(), loginKind: .oneQR) var current = subject.value.filter { $0.id != connection.id } current.append(connection) persistAndSend(current) + // The store was writable when the login started. If the record did + // not land all the same, a response published now could not be found + // again. The key is live, so the row above stays: a disconnect finds + // the key by its contract bound. + guard responseStore.load().contains(where: { $0.key == grant.key }) else { + Self.logger.error("🔗 DASHCONNECT :: the session key was registered but its record could not be saved") + throw DashConnectPlatformError.grantNotRecorded + } + // A response deleted by a later login to this app is published again // when its own request comes back. guard !grant.hasDeletableResponse else { @@ -751,6 +828,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) + // Recorded before the publish is submitted: a response this record + // had as deleted may be back on Platform after a publish that fails + // to confirm, and a disconnect must then look for it. + updateGrants { grants in + guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } + grants[index].markPublishStarted() + } + Self.logger.info("🔗 DASHCONNECT :: publishing loginKeyResponse") let documentId: Data var publishedValues = grant.values @@ -982,21 +1067,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.noApprovedConnectionAwaitingKeyRegistration } - // `deriveIdentityAuthKeyAtSlot` is main-actor isolated in the SDK. - var chainKey = try await MainActor.run { - try context.wallet.deriveIdentityAuthKeyAtSlot( - identityIndex: context.identityIndex, - keyId: UInt32(LoginKeyDerivation.defaultKeyIndex), - network: context.network - ).privateKeyData - } - defer { Self.zero(&chainKey) } - - var derivedMaterial = try Self.deriveKeyRegistrationMaterial( - chainKeyPrivateBytes: chainKey, - identityId: context.identityId, - appContractId: pendingAppContractId - ) + var derivedMaterial = try await deriveKeyRegistrationMaterial( + appContractId: pendingAppContractId, context: context) defer { Self.zero(&derivedMaterial.loginKey) Self.zero(&derivedMaterial.authenticationPrivateKey) @@ -1245,15 +1317,17 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func disconnect(id: String) async throws { let isOneQR = subject.value.first { $0.id == id }?.loginKind == .oneQR let hasGrants = responseStore.load().contains { $0.appContractId == id } + var twoQRKeysRemain = false if isOneQR || hasGrants { - let liveElsewhere = try await revokeAppConnectGrants(appContractId: id, checksUnrecordedKeys: isOneQR) + let revocation = try await revokeAppConnectGrants(appContractId: id, checksUnrecordedKeys: isOneQR) // The row stands for the app, and the app still holds a key on // another identity of this wallet. That key can only be disabled // while its identity is the active one, so the row stays to get // there; this identity's key is off. - if liveElsewhere { return } + if revocation.liveOnAnotherIdentity { return } + twoQRKeysRemain = revocation.twoQRKeysRemain } - if isOneQR { + if isOneQR, !twoQRKeysRemain { // Nothing is left of a one-QR connection once its key is disabled: // the same QR can no longer be approved and there is no second // step to wait for, so the row goes instead of sitting in the @@ -1265,7 +1339,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let disconnectedAt = now() // Local-only for a two-QR connection: its `loginKeyResponse` document // stays, and re-approving the same `dash-key:` QR returns it to - // `.active` while the identity keys are still registered. + // `.active` while the identity keys are still registered. A one-QR + // connection that replaced a two-QR one ends up here as well while + // the two-QR keys are still on the identity: its session keys are + // off, and the row goes back to what a two-QR disconnect leaves. persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } return DAppConnection( @@ -1293,7 +1370,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// record stays on Platform. It can only be found by its request hash, /// which the record held. /// - /// Returns whether a grant record shows the app with a live key on + /// Reports whether a grant record shows the app with a live key on /// another identity of this wallet. When this identity gave it none, that /// is thrown instead: nothing was turned off. /// TODO(app-connect-other-identity-keys): a key on another identity that @@ -1303,8 +1380,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// `checksUnrecordedKeys` is set for a row made by the one-QR login: with /// no record for this identity the keys are still looked for on it. When /// it holds none bound to the app, there was nothing to turn off here and - /// the call returns without an error. - private func revokeAppConnectGrants(appContractId: String, checksUnrecordedKeys: Bool) async throws -> Bool { + /// the call returns without an error. For such a row it also reports + /// whether the keys of an earlier two-QR login to the app are still live + /// on this identity, and throws once the session keys are off when that + /// cannot be told. + private func revokeAppConnectGrants( + appContractId: String, + checksUnrecordedKeys: Bool + ) async throws -> AppConnectRevocation { var context = try await requireContext() let identityId = context.identityId.toBase58String() func isGranted(_ grant: AppConnectGrant) -> Bool { @@ -1326,7 +1409,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { .contains { $0.singleContractId == appContract && !$0.isDisabled && $0.isSessionKeyShaped } if !holdsUnrecordedKey { if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } - if !checksUnrecordedKeys { return false } + if !checksUnrecordedKeys { + return AppConnectRevocation(liveOnAnotherIdentity: false, twoQRKeysRemain: false) + } } } @@ -1363,11 +1448,25 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // as turned off. throw DashConnectPlatformError.identityKeysOutOfDate } + // The keys of an earlier two-QR login to the app, for a row made by + // the one-QR login. They are not disabled: that login derives the + // same keys every time, so the app could never be given them again. + // `nil` when they could not be derived. + var twoQRKeys: (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data)? + if checksUnrecordedKeys { + do { + twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: two-QR keys not derived — \(error.localizedDescription, privacy: .public)") + } + } let keyIds = AppConnect.sessionKeyIdsToDisable( for: granted, appContractId: appContract, bindings: bindings, - currentIdentityPublicKeys: currentPublicKeys + currentIdentityPublicKeys: currentPublicKeys, + twoQRAuthenticationKeyHash160: twoQRKeys?.authenticationPublicKeyHash160 ) if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity @@ -1387,16 +1486,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: session key(s) disabled") } - // Every key this identity gave the app is now off. Records whose - // response is known to be gone are done; the rest wait for their - // response to be deleted, or to be found if its publish never - // confirmed. - updateGrants { grants in - grants.removeAll { isGranted($0) && $0.responseDeleted == true } - for index in grants.indices where isGranted(grants[index]) { - grants[index].keyDisabled = true - } - } + // Every session key this identity gave the app is now off. + updateGrants { AppConnect.markKeysDisabled(in: &$0, where: isGranted) } if let responseContractId = Self.decodeIdentifier(AppConnect.contractId) { await deleteAppConnectResponses( @@ -1406,7 +1497,38 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - return hasLiveGrantElsewhere() + // The session keys are off. The two-QR keys were left out of the + // update, so the list fetched before it still tells whether they are + // live. If they could not be derived that is unknown, and the row + // stays as it is with an error rather than go or change on a guess. + var twoQRKeysRemain = false + if checksUnrecordedKeys { + guard let twoQRKeys else { throw DashConnectPlatformError.twoQRKeysNotChecked } + twoQRKeysRemain = Self.hasAnyRegisteredLoginKey( + authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, + encryptionPublicKey: twoQRKeys.encryptionPublicKey, + currentIdentityPublicKeys: currentPublicKeys + ) + } + return AppConnectRevocation( + liveOnAnotherIdentity: hasLiveGrantElsewhere(), + twoQRKeysRemain: twoQRKeysRemain) + } + + /// The public halves of the keys the two-QR login derives for this + /// identity and app. + private func twoQRLoginPublicKeys( + appContractId: Data, + context: Context + ) async throws -> (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data) { + var derivedMaterial = try await deriveKeyRegistrationMaterial( + appContractId: appContractId, context: context) + defer { + Self.zero(&derivedMaterial.loginKey) + Self.zero(&derivedMaterial.authenticationPrivateKey) + Self.zero(&derivedMaterial.encryptionPrivateKey) + } + return (derivedMaterial.authenticationPublicKeyHash160, derivedMaterial.encryptionPublicKey) } static func buildLoginKeyResponseDraft( @@ -1468,6 +1590,28 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } + /// The two-QR login's keys for the active identity and one app. The + /// caller wipes the returned private keys. + private func deriveKeyRegistrationMaterial( + appContractId: Data, + context: Context + ) async throws -> DashConnectKeyRegistrationDerivedMaterial { + // `deriveIdentityAuthKeyAtSlot` is main-actor isolated in the SDK. + var chainKey = try await MainActor.run { + try context.wallet.deriveIdentityAuthKeyAtSlot( + identityIndex: context.identityIndex, + keyId: UInt32(LoginKeyDerivation.defaultKeyIndex), + network: context.network + ).privateKeyData + } + defer { Self.zero(&chainKey) } + return try Self.deriveKeyRegistrationMaterial( + chainKeyPrivateBytes: chainKey, + identityId: context.identityId, + appContractId: appContractId + ) + } + private static func deriveKeyRegistrationMaterial( chainKeyPrivateBytes: Data, identityId: Data, @@ -1581,6 +1725,22 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } + /// Whether either key of the two-QR login is live on the identity: the + /// app can still use whichever one is. + static func hasAnyRegisteredLoginKey( + authenticationPublicKeyHash160: Data, + encryptionPublicKey: Data, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> Bool { + hasRegisteredAuthenticationKey( + authenticationPublicKeyHash160: authenticationPublicKeyHash160, + currentIdentityPublicKeys: currentIdentityPublicKeys + ) || hasRegisteredEncryptionKey( + encryptionPublicKey: encryptionPublicKey, + currentIdentityPublicKeys: currentIdentityPublicKeys + ) + } + static func missingKeyRegistrationKeys( _ validated: DashConnectKeyRegistrationValidationResult, currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index 6472c0b50b..e070c553c4 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -70,7 +70,18 @@ struct ApproveConnectionSheet: View { reloginNotice(existingConnection) } - if isRelogin { + // The one-QR login gives the app a key with limits of its + // own, so its terms are spelled out on a repeat sign-in + // too, and when it replaces a two-QR connection. + if request.isLoginUnresolved { + Text(NSLocalizedString( + "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again.", + comment: "DashConnect")) + .font(.subhead) + .foregroundColor(.primaryText) + } else if let terms = request.sessionKeyTerms { + sessionKeyPermissions(terms) + } else if isRelogin { reloginPermissionsSummary } else { fullPermissions @@ -120,7 +131,7 @@ struct ApproveConnectionSheet: View { style: .filledBlue, size: .large, stretch: true, - isEnabled: !isLoading, + isEnabled: !isLoading && !request.isLoginUnresolved, isLoading: isLoading, action: onApprove ) @@ -168,20 +179,65 @@ struct ApproveConnectionSheet: View { } private var fullPermissions: some View { + permissions( + granted: [ + NSLocalizedString("See your username", comment: "DashConnect"), + NSLocalizedString("Verify your identity", comment: "DashConnect"), + ], + withheld: [ + NSLocalizedString("Your private keys", comment: "DashConnect"), + NSLocalizedString("Withdraw funds", comment: "DashConnect"), + ] + ) + } + + /// The one-QR login gives the app a key of its own on the identity, so + /// the sheet names what that key can spend and when it stops working. + private func sessionKeyPermissions(_ terms: AppConnect.SessionKeyTerms) -> some View { + VStack(alignment: .leading, spacing: 20) { + permissions( + granted: [ + NSLocalizedString("See your username", comment: "DashConnect"), + NSLocalizedString("Verify your identity", comment: "DashConnect"), + NSLocalizedString("Act as you in this app without asking each time", comment: "DashConnect one-QR login"), + // Per sign-in: an earlier sign-in to the app keeps its + // own key and limit until the app is disconnected. + String( + format: NSLocalizedString( + "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit.", + comment: "DashConnect one-QR login: the placeholder is an amount with its unit, e.g. 0.05 DASH"), + terms.budgetText + ), + ], + withheld: [ + NSLocalizedString("Your recovery phrase or wallet keys", comment: "DashConnect one-QR login"), + NSLocalizedString("Your Dash balance", comment: "DashConnect one-QR login"), + ] + ) + + Text( + String( + format: NSLocalizedString( + "This access ends after %d days, or when you disconnect the app.", + comment: "DashConnect one-QR login"), + terms.lifetimeDays + ) + ) + .font(.footnote) + .foregroundColor(.secondaryText) + } + } + + private func permissions(granted: [String], withheld: [String]) -> some View { VStack(alignment: .leading, spacing: 20) { VStack(alignment: .leading, spacing: 12) { Text(NSLocalizedString("This app will be able to:", comment: "DashConnect")) .font(.subhead) .foregroundColor(.primaryText) - PermissionRow( - icon: .custom("dashconnect.check.circle", maxHeight: 18), - text: NSLocalizedString("See your username", comment: "DashConnect") - ) - PermissionRow( - icon: .custom("dashconnect.check.circle", maxHeight: 18), - text: NSLocalizedString("Verify your identity", comment: "DashConnect") - ) + ForEach(granted, id: \.self) { text in + PermissionRow(icon: .custom("dashconnect.check.circle", maxHeight: 18), text: text) + } } VStack(alignment: .leading, spacing: 12) { @@ -189,14 +245,9 @@ struct ApproveConnectionSheet: View { .font(.subhead) .foregroundColor(.primaryText) - PermissionRow( - icon: .custom("dashconnect.xmark.circle", maxHeight: 18), - text: NSLocalizedString("Your private keys", comment: "DashConnect") - ) - PermissionRow( - icon: .custom("dashconnect.xmark.circle", maxHeight: 18), - text: NSLocalizedString("Withdraw funds", comment: "DashConnect") - ) + ForEach(withheld, id: \.self) { text in + PermissionRow(icon: .custom("dashconnect.xmark.circle", maxHeight: 18), text: text) + } } } } @@ -248,13 +299,14 @@ private struct PermissionRow: View { let text: String var body: some View { - HStack(spacing: 6) { + HStack(alignment: .top, spacing: 6) { Icon(name: icon) .frame(width: 18, height: 18) Text(text) .font(.subhead) .foregroundColor(.primaryText) + .fixedSize(horizontal: false, vertical: true) } } } @@ -309,6 +361,22 @@ private let dashConnectTruncateMiddleCheck: Bool = { ) } +#Preview("Approve One-QR") { + ApproveConnectionSheet( + request: ConnectionRequest( + loginRequest: MockDashConnectDataSource.sampleLoginRequest, + appLabel: "Yappr", + appUrl: "yap.pr", + walletUsername: "dashuser", + walletIdentityId: "5DbLwAxEWR695MsqP4KybNQD5n7CUDWydJYNg63FzUo8", + existingConnection: nil, + sessionKeyTerms: .current + ), + onApprove: {}, + onDeny: {} + ) +} + #Preview("Approve Re-Login") { ApproveConnectionSheet( request: ConnectionRequest( diff --git a/DashWallet/Sources/UI/DashConnect/Components/ApproveSheetPresentation.swift b/DashWallet/Sources/UI/DashConnect/Components/ApproveSheetPresentation.swift index 49b2d99318..ef9ec48bf8 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ApproveSheetPresentation.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ApproveSheetPresentation.swift @@ -24,19 +24,21 @@ import SwiftUI /// once rather than repeated per availability branch. struct ApproveSheetPresentation: ViewModifier { let isLoading: Bool + /// Full height, for content that does not fit the fixed one. + var isTall = false - private let detentHeight: CGFloat = 620 + private var detent: PresentationDetent { isTall ? .large : .height(620) } private let cornerRadius: CGFloat = 32 func body(content: Content) -> some View { if #available(iOS 16.4, *) { content - .presentationDetents([.height(detentHeight)]) + .presentationDetents([detent]) .presentationCornerRadius(cornerRadius) .interactiveDismissDisabled(isLoading) } else if #available(iOS 16.0, *) { content - .presentationDetents([.height(detentHeight)]) + .presentationDetents([detent]) .interactiveDismissDisabled(isLoading) } else { content @@ -46,7 +48,7 @@ struct ApproveSheetPresentation: ViewModifier { extension View { /// Presents this view as the approve-connection sheet body. - func approveSheetPresentation(isLoading: Bool) -> some View { - modifier(ApproveSheetPresentation(isLoading: isLoading)) + func approveSheetPresentation(isLoading: Bool, isTall: Bool = false) -> some View { + modifier(ApproveSheetPresentation(isLoading: isLoading, isTall: isTall)) } } diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift index 00ac7e770c..467799815a 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift @@ -91,7 +91,8 @@ struct ConnectionRow: View { /// depends on the login that made the connection (see /// `DashConnectDataSource.disconnect`): a one-QR connection has the app's /// key disabled on the identity and its row removed; a two-QR connection - /// is downgraded to `.approved` locally and the app keeps its keys. + /// is downgraded to `.approved` locally and the app keeps its keys. A + /// one-QR connection that replaced a two-QR one gets both. private var activeSwitch: some View { ZStack { SwitchView(isOn: .constant(true)) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index a7189422e5..95104f95da 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -113,7 +113,9 @@ struct ConnectionsScreen: View { onApprove: { viewModel.approvePendingRequest() }, onDeny: { viewModel.denyPendingRequest() } ) - .approveSheetPresentation(isLoading: viewModel.isApproving) + // The one-QR terms make the sheet longer than the fixed height + // shows; who pays and when access ends must not sit below the fold. + .approveSheetPresentation(isLoading: viewModel.isApproving, isTall: request.sessionKeyTerms != nil) } private func tokenPurchaseSheet(for purchase: DashConnectTokenPurchaseRequest) -> some View { diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 22ce543aa8..c0a3b3ec42 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -200,7 +200,7 @@ final class ConnectionsViewModel: ObservableObject { // `isResolvingRequest` guards the window where a newer request has been // accepted but has not published yet: approving during it would // authorize the request on screen moments before it is replaced. - guard pendingRequest != nil, let pendingLoginRequest, !isApproving, !isResolvingRequest else { return } + guard let consent = pendingRequest, let pendingLoginRequest, !isApproving, !isResolvingRequest else { return } isApproving = true approveError = nil @@ -209,10 +209,17 @@ final class ConnectionsViewModel: ObservableObject { defer { isApproving = false } do { - _ = try await dataSource.approveLogin(pendingLoginRequest) + _ = try await dataSource.approveLogin(pendingLoginRequest, consent: consent) self.pendingRequest = nil self.pendingLoginRequest = nil self.approveError = nil + } catch DashConnectPlatformError.approvalOutOfDate { + // Another identity became active, or the network now answers + // with the other login: what the sheet showed is not what + // would run. Nothing was signed. The sheet is rebuilt from + // the same request as it stands now, for a new decision. + self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) + self.approveError = DashConnectPlatformError.approvalOutOfDate.localizedDescription } catch { // Keep the sheet up so the user can retry without rescanning the QR. self.approveError = String( diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index b7e1ba7721..15c06597b2 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "تم تسجيل ”%@“. هل تريد إرسال طلب جهة اتصال إلى الشخص الذي دعاك؟"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 959cbf52f2..fa1acb7632 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ беше регистрирано. Да се изпрати ли заявка за контакт до човека, който ви покани?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index a52361094c..4ded93138f 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» s'ha registrat. Vols enviar una sol·licitud de contacte a la persona que t'ha convidat?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 4ccf33f284..351218530f 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ bylo zaregistrováno. Poslat žádost o kontakt osobě, která vás pozvala?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 24bcc296da..8b88d3bfa6 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” er blevet registreret. Vil du sende en kontaktanmodning til den person, der inviterede dig?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index b68953730a..eeeab92a29 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ wurde registriert. Möchtest du der Person, die dich eingeladen hat, eine Kontaktanfrage senden?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 9cc83637f3..06faac5783 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "Το «%@» καταχωρίστηκε. Να σταλεί αίτημα επαφής στο άτομο που σας προσκάλεσε;"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 7ad66de2d6..f0d23940f6 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6103,9 +6103,24 @@ "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; /* Wallet preparation and support */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app." = "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; +"Your Dash balance" = "Your Dash balance"; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "Your wallet could not be opened. Do not delete this app. Try again or contact support for help." = "Your wallet could not be opened. Do not delete this app. Try again or contact support for help."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 00b2de2433..d0d282f894 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ estis registrita. Ĉu sendi kontaktpeton al la persono kiu vin invitis?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 063d294700..7046e8d05f 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» se ha registrado. ¿Quieres enviar una solicitud de contacto a la persona que te invitó?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 26f5a7b707..077d46ffbc 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ on registreeritud. Kas saata kontaktitaotlus inimesele, kes sind kutsus?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index d350ebbe05..f16def9aa4 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» ثبت شد. برای کسی که شما را دعوت کرده درخواست تماس فرستاده شود؟"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 873de00936..e8470bc91a 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "”%@” on rekisteröity. Lähetetäänkö yhteyspyyntö sinut kutsuneelle henkilölle?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index f587a7f93d..b123af4139 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "Nairehistro na ang “%@”. Magpadala ng kahilingan sa pakikipag-ugnay sa taong nag-imbita sa iyo?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 73a1c57deb..cc4cbde6ea 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "« %@ » a été enregistré. Envoyer une demande de contact à la personne qui vous a invité ?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 3b2706d41c..1998f549c7 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ je registrirano. Poslati zahtjev za kontakt osobi koja vas je pozvala?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 57b9f7b9ba..928cac2833 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "A(z) „%@” regisztrálva. Küldesz kapcsolatkérést annak, aki meghívott?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 84c60a462c..d3e3684a34 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” telah terdaftar. Kirim permintaan kontak ke orang yang mengundang Anda?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 8312cc323b..88d201b142 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» è stato registrato. Vuoi inviare una richiesta di contatto alla persona che ti ha invitato?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index ae09c8757f..85d23f71fc 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "「%@」が登録されました。招待してくれた相手に連絡先リクエストを送りますか?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index e897b42ded..343be990d9 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@”이(가) 등록되었습니다. 초대해 준 사람에게 연락처 요청을 보낼까요?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 12fc77356f..4d21e14708 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ е регистрирано. Да се испрати барање за контакт до лицето што ве покани?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 0195c80d72..13dfe42586 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” telah didaftarkan. Hantar permintaan kenalan kepada orang yang menjemput anda?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 24f9a41a6a..480430b4e3 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» er registrert. Vil du sende en kontaktforespørsel til personen som inviterte deg?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 5f7bd14a5a..599070868c 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” is geregistreerd. Wil je een contactverzoek sturen naar de persoon die je heeft uitgenodigd?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 7470646aad..15a6014b07 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@” zostało zarejestrowane. Wysłać zaproszenie do kontaktów osobie, która Cię zaprosiła?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 6c99082afb..76ea435846 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” foi registrado. Enviar uma solicitação de contato para a pessoa que convidou você?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index d3ee7c149d..3070060e00 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@” a fost înregistrat. Trimiți o cerere de contact persoanei care te-a invitat?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index b046a26ad8..db056772a5 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» зарегистрировано. Отправить запрос на добавление в контакты человеку, который вас пригласил?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index cd9ab9aa26..89048c1532 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ bolo zaregistrované. Poslať žiadosť o kontakt osobe, ktorá vás pozvala?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index e96a78cb79..0536d9733b 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "»%@« je bilo registrirano. Želite poslati zahtevo za stik osebi, ki vas je povabila?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 27684b4bf6..0565c21773 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "»%@« je bilo registrirano. Želite poslati zahtevo za stik osebi, ki vas je povabila?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 90bd026198..a0dc081897 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ u regjistrua. Të dërgohet një kërkesë kontakti te personi që ju ftoi?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index dcf5990d53..92ed7ddce2 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ je registrovano. Poslati zahtev za kontakt osobi koja vas je pozvala?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 3e122bf181..8c9554890b 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "”%@” har registrerats. Vill du skicka en kontaktförfrågan till personen som bjöd in dig?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index c072df3895..e92ba31dce 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "ลงทะเบียน “%@” แล้ว ต้องการส่งคำขอการติดต่อไปยังคนที่เชิญคุณไหม"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 67bd2abe5f..d0484e7a61 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” kaydedildi. Sizi davet eden kişiye bir iletişim isteği gönderilsin mi?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 7eed7bc642..13a2bd9202 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» зареєстровано. Надіслати запит на додавання до контактів людині, яка вас запросила?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 085d905758..1012589365 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” đã được đăng ký. Gửi yêu cầu liên hệ tới người đã mời bạn chứ?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index e394388742..e89822cd0b 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@”已注册。要向邀请您的人发送联系人请求吗?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index a1452fd025..1a836cb6d2 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "「%@」已註冊。要向邀請您的人發送聯繫請求嗎?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index aa585bcc34..8e32533dd8 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@”已注册。要向邀请您的人发送联系人请求吗?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 6168a7f66c..7988106954 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "「%@」已註冊。要向邀請您的人發送聯繫請求嗎?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWalletTests/DashConnect/DashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/DashConnectDataSourceTests.swift index 25fee3c446..27f03143ed 100644 --- a/DashWalletTests/DashConnect/DashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/DashConnectDataSourceTests.swift @@ -122,7 +122,8 @@ final class DashConnectDataSourceTests: XCTestCase { ) let dataSource = MockDashConnectDataSource(initial: [existing]) - _ = try await dataSource.approveLogin(MockDashConnectDataSource.sampleLoginRequest) + _ = try await dataSource.approveLogin( + MockDashConnectDataSource.sampleLoginRequest, consent: MockDashConnectDataSource.sampleRequest) XCTAssertEqual(dataSource.connectionsSnapshot.count, 1) XCTAssertEqual(dataSource.connectionsSnapshot.first?.id, existing.id) diff --git a/DashWalletTests/DashConnect/DashConnectStoreTests.swift b/DashWalletTests/DashConnect/DashConnectStoreTests.swift index 4761ac5207..2d7f0819ee 100644 --- a/DashWalletTests/DashConnect/DashConnectStoreTests.swift +++ b/DashWalletTests/DashConnect/DashConnectStoreTests.swift @@ -160,7 +160,8 @@ final class DashConnectStoreTests: XCTestCase { let store = makeStore(network: .testnet, walletIdHex: "wallet-a") let first = MockDashConnectDataSource(store: store) - _ = try await first.approveLogin(MockDashConnectDataSource.sampleLoginRequest) + _ = try await first.approveLogin( + MockDashConnectDataSource.sampleLoginRequest, consent: MockDashConnectDataSource.sampleRequest) let second = MockDashConnectDataSource(store: store) @@ -172,7 +173,8 @@ final class DashConnectStoreTests: XCTestCase { func testRemovePersistsAcrossFreshMockInstances() async throws { let store = makeStore(network: .testnet, walletIdHex: "wallet-a") let first = MockDashConnectDataSource(store: store) - _ = try await first.approveLogin(MockDashConnectDataSource.sampleLoginRequest) + _ = try await first.approveLogin( + MockDashConnectDataSource.sampleLoginRequest, consent: MockDashConnectDataSource.sampleRequest) await first.remove(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F") diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 1daf7c54e8..013f63f137 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -919,6 +919,37 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { ) } + /// A disconnect of a one-QR connection keeps the row while either key of + /// an earlier two-QR login is live: the app can still use that one. + func testEitherLiveTwoQrLoginKeyCountsAsRemainingAccess() { + let authentication = Data(repeating: 0x51, count: 20) + let encryption = Data(repeating: 0x52, count: 33) + func remains(_ keys: [ManagedIdentity.IdentityPublicKeyInfo]) -> Bool { + PlatformDashConnectDataSource.hasAnyRegisteredLoginKey( + authenticationPublicKeyHash160: authentication, + encryptionPublicKey: encryption, + currentIdentityPublicKeys: keys) + } + let authenticationKey = makeIdentityPublicKeyInfo( + keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: authentication) + let encryptionKey = makeIdentityPublicKeyInfo( + keyId: 101, purpose: .encryption, securityLevel: .medium, keyType: .ecdsaSecp256k1, data: encryption) + let disabledAuthenticationKey = makeIdentityPublicKeyInfo( + keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, + data: authentication, disabledAt: 1) + // A one-QR session key: same kind as the two-QR authentication key, + // another payload. + let sessionKey = makeIdentityPublicKeyInfo( + keyId: 102, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, + data: Data(repeating: 0x53, count: 20)) + + XCTAssertTrue(remains([authenticationKey, encryptionKey])) + XCTAssertTrue(remains([authenticationKey])) + XCTAssertTrue(remains([disabledAuthenticationKey, encryptionKey])) + XCTAssertFalse(remains([disabledAuthenticationKey, sessionKey])) + XCTAssertFalse(remains([])) + } + func testMissingKeyRegistrationKeysReturnsOnlyMissingEncryptionKey() throws { let chainKey = Data(repeating: 0x22, count: 32) let identityId = Data(repeating: 0x33, count: 32) @@ -1326,6 +1357,56 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertNil(viewModel.message) } + func testApprovingALoginPassesTheRequestAsTheSheetShowedIt() async { + let shown = Self.consent(identityId: "identity-a", terms: .current) + let spy = LoginApprovalSpy(shown: [shown]) + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.onQRScanned("login") + await waitUntil { viewModel.pendingRequest != nil } + viewModel.approvePendingRequest() + await waitUntil { viewModel.pendingRequest == nil } + + XCTAssertEqual(spy.approvedConsents, [shown]) + XCTAssertNil(viewModel.approveError) + } + + /// Another identity became active, or the network answers with the other + /// login, while the sheet was up: nothing is approved on the old sheet, + /// and the user decides again on what is true now. + func testAnApprovalThatIsOutOfDateShowsTheRequestAgainAsItStands() async { + let shown = Self.consent(identityId: "identity-a", terms: nil) + let current = Self.consent(identityId: "identity-b", terms: .current) + let spy = LoginApprovalSpy(shown: [shown, current]) + spy.approveFailures = [DashConnectPlatformError.approvalOutOfDate] + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.onQRScanned("login") + await waitUntil { viewModel.pendingRequest != nil } + viewModel.approvePendingRequest() + await waitUntil { !viewModel.isApproving } + + XCTAssertEqual(viewModel.pendingRequest, current) + XCTAssertEqual(viewModel.approveError, DashConnectPlatformError.approvalOutOfDate.localizedDescription) + + viewModel.approvePendingRequest() + await waitUntil { viewModel.pendingRequest == nil } + + XCTAssertEqual(spy.approvedConsents, [shown, current]) + XCTAssertNil(viewModel.approveError) + } + + private static func consent(identityId: String, terms: AppConnect.SessionKeyTerms?) -> ConnectionRequest { + ConnectionRequest( + loginRequest: MockDashConnectDataSource.sampleLoginRequest, + appLabel: "App", + appUrl: "", + walletUsername: nil, + walletIdentityId: identityId, + existingConnection: nil, + sessionKeyTerms: terms) + } + private static let connection = DAppConnection( id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", name: "App", url: "", status: .active, updatedAt: Date(timeIntervalSince1970: 1_000)) @@ -1416,7 +1497,7 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { return ConnectionRequest(loginRequest: loginRequest) } - func approveLogin(_ request: DashKeyRequest) async throws -> DAppConnection { + func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { throw PurchaseSpyError.unsupported } @@ -1449,6 +1530,67 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { } } +/// A `DashConnectDataSource` for the login approval: every QR is the sample +/// login, each resolution of it hands out the next request in `shown` (the +/// last one from then on), and approvals are recorded with what they carried. +private final class LoginApprovalSpy: DashConnectDataSource { + /// Guards every stored property: the protocol's methods are nonisolated, + /// so they run off the main actor the test asserts from. + private let lock = NSLock() + private var shown: [ConnectionRequest] + private var storedApproveFailures: [Error] = [] + private var storedApprovedConsents: [ConnectionRequest] = [] + + init(shown: [ConnectionRequest]) { + self.shown = shown + } + + /// Thrown by the approvals in order, one each; later approvals succeed. + var approveFailures: [Error] { + get { lock.withLock { storedApproveFailures } } + set { lock.withLock { storedApproveFailures = newValue } } + } + + var approvedConsents: [ConnectionRequest] { + lock.withLock { storedApprovedConsents } + } + + var connections: AnyPublisher<[DAppConnection], Never> { + Just([DAppConnection]()).eraseToAnyPublisher() + } + + func parseQR(_ content: String) async throws -> DashConnectQr { + .login(MockDashConnectDataSource.sampleLoginRequest) + } + + func makeConnectionRequest(from loginRequest: DashKeyRequest) async -> ConnectionRequest { + lock.withLock { shown.count > 1 ? shown.removeFirst() : shown[0] } + } + + func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { + let failure = lock.withLock { () -> Error? in + storedApprovedConsents.append(consent) + return storedApproveFailures.isEmpty ? nil : storedApproveFailures.removeFirst() + } + if let failure { throw failure } + return MockDashConnectDataSource.sample(.active) + } + + func handleStateTransition(_ request: DashStRequest) async throws -> DashConnectStAction { + throw PurchaseSpyError.unsupported + } + + func approveTokenPurchase(_ request: DashConnectTokenPurchaseRequest) async throws { + throw PurchaseSpyError.unsupported + } + + func disconnect(id: String) async throws { + throw PurchaseSpyError.unsupported + } + + func remove(id: String) async {} +} + private enum PurchaseSpyError: LocalizedError { case refused case unsupported @@ -1509,47 +1651,111 @@ final class AppConnectLoginTests: XCTestCase { } func testSessionKeyIsAbsentUntilItsHashIsOnTheIdentity() { - let hash = Data(repeating: 0x11, count: 20) let other = Self.key(keyId: 4, data: Data(repeating: 0x22, count: 20)) - XCTAssertEqual( - AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [other], now: Self.now), - .absent) + XCTAssertEqual(Self.sessionKeyState(keys: [other]), .absent) // The same bytes under another key type are a different key. - let sameBytesOtherType = Self.key(keyId: 5, keyType: .ecdsaSecp256k1, data: hash) - XCTAssertEqual( - AppConnect.sessionKeyState( - publicKeyHash160: hash, currentIdentityPublicKeys: [sameBytesOtherType], now: Self.now), - .absent) + let sameBytesOtherType = Self.key(keyId: 5, keyType: .ecdsaSecp256k1, data: Self.sessionKeyHash) + XCTAssertEqual(Self.sessionKeyState(keys: [sameBytesOtherType]), .absent) } - func testRegisteredSessionKeyIsUsableWithItsKeyId() { - let hash = Data(repeating: 0x11, count: 20) - let live = Self.key(keyId: 9, data: hash, expiresAt: Self.nowMilliseconds + 1) - XCTAssertEqual( - AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [live], now: Self.now), - .usable(keyId: 9)) - let unlimited = Self.key(keyId: 9, data: hash) - XCTAssertEqual( - AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [unlimited], now: Self.now), - .usable(keyId: 9)) + func testRegisteredSessionKeyOfTheAppIsUsableWithItsKeyId() { + XCTAssertEqual(Self.sessionKeyState(keys: [Self.sessionKey()]), .usable(keyId: 9)) + // Registered a moment ago by a clock that has since been set back. + let afterClockCorrection = Self.sessionKey(expiresAt: Self.nowMilliseconds + 3_600_000 + 60_000) + XCTAssertEqual(Self.sessionKeyState(keys: [afterClockCorrection]), .usable(keyId: 9)) + // Limits narrower than the approved terms are within them. + let narrower = Self.sessionKey( + totalBudget: Self.terms.budgetCredits - 1, expiresAt: Self.nowMilliseconds + 1) + XCTAssertEqual(Self.sessionKeyState(keys: [narrower]), .usable(keyId: 9)) } func testDisabledExpiredOrMisregisteredSessionKeyIsUnusable() { - let hash = Data(repeating: 0x11, count: 20) + let latestExpiry = Int64(Self.terms.expiresAt(from: Self.now.addingTimeInterval(AppConnect.clockTolerance))) let unusable: [(String, ManagedIdentity.IdentityPublicKeyInfo)] = [ - ("disabled", Self.key(keyId: 9, data: hash, disabledAt: 1)), - ("expired", Self.key(keyId: 9, data: hash, expiresAt: Self.nowMilliseconds)), - ("wrong level", Self.key(keyId: 9, securityLevel: .critical, data: hash)), - ("wrong purpose", Self.key(keyId: 9, purpose: .transfer, data: hash)), + ("disabled", Self.sessionKey(disabledAt: 1)), + ("expired", Self.sessionKey(expiresAt: Self.nowMilliseconds)), + ("wrong level", Self.sessionKey(securityLevel: .critical)), + ("wrong purpose", Self.sessionKey(purpose: .transfer)), + ("no budget", Self.sessionKey(totalBudget: nil)), + ("no expiry", Self.sessionKey(expiresAt: nil)), + ("budget above the approved one", Self.sessionKey(totalBudget: Self.terms.budgetCredits + 1)), + ("expiry after the approved one", Self.sessionKey(expiresAt: latestExpiry + 1)), ] for (name, key) in unusable { + XCTAssertEqual(Self.sessionKeyState(keys: [key]), .unusable, name) + } + } + + /// The key is derived from the identity and the request's ephemeral key + /// alone, so a request that repeats another app's ephemeral key finds + /// that app's key on the identity. + func testARegisteredSessionKeyBoundToAnotherAppIsUnusable() { + let otherApp = Data(repeating: 0xB2, count: 32) + let boundElsewhere = [AppConnect.KeyBinding(keyId: 9, data: Self.sessionKeyHash, singleContractId: otherApp)] + XCTAssertEqual(Self.sessionKeyState(keys: [Self.sessionKey()], bindings: boundElsewhere), .unusable) + // A grant record does not outweigh a bound the store can read. + XCTAssertEqual( + Self.sessionKeyState(keys: [Self.sessionKey()], bindings: boundElsewhere, grantedKeyIds: [9]), + .unusable) + let unbound = [AppConnect.KeyBinding(keyId: 9, data: Self.sessionKeyHash, singleContractId: nil)] + XCTAssertEqual(Self.sessionKeyState(keys: [Self.sessionKey()], bindings: unbound), .unusable) + } + + func testARegisteredSessionKeyTheStoreCannotPlaceNeedsAGrantRecord() { + let unplaced: [[AppConnect.KeyBinding]] = [ + [], + // The stored row under this id is for a different key. + [AppConnect.KeyBinding(keyId: 9, data: Data([0xFF]), singleContractId: Self.app)], + [AppConnect.KeyBinding( + keyId: 9, data: Self.sessionKeyHash, singleContractId: nil, hasUnreadableBound: true)], + ] + for bindings in unplaced { + XCTAssertEqual(Self.sessionKeyState(keys: [Self.sessionKey()], bindings: bindings), .unusable) XCTAssertEqual( - AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [key], now: Self.now), - .unusable, - name) + Self.sessionKeyState(keys: [Self.sessionKey()], bindings: bindings, grantedKeyIds: [8]), + .unusable) + XCTAssertEqual( + Self.sessionKeyState(keys: [Self.sessionKey()], bindings: bindings, grantedKeyIds: [9]), + .usable(keyId: 9)) } } + func testTheOneQrLoginHasTermsAndTheTwoQrLoginHasNone() { + XCTAssertNil(AppConnect.sessionKeyTerms(protocolVersion: 13)) + XCTAssertEqual(AppConnect.sessionKeyTerms(protocolVersion: 14), .current) + XCTAssertEqual(AppConnect.SessionKeyTerms.current.budgetCredits, AppConnect.sessionKeyBudgetCredits) + XCTAssertEqual(AppConnect.SessionKeyTerms.current.lifetime, AppConnect.sessionKeyLifetime) + } + + func testTheApprovalSheetNamesTheBudgetInDashAndTheLifetimeInDays() { + let terms = AppConnect.SessionKeyTerms(budgetCredits: 5_000_000_000, lifetime: 90 * 24 * 60 * 60) + XCTAssertEqual(terms.budgetText.filter { $0.isNumber || $0.isLetter }, "005DASH") + XCTAssertEqual(terms.lifetimeDays, 90) + } + + /// A response an earlier login deleted is published again when its + /// request comes back. If that publish never confirms, the record must + /// not say the response is gone: a disconnect would drop it and leave + /// the response on Platform with nothing pointing at it. + func testARepublishThatNeverConfirmsKeepsItsRecordThroughADisconnect() { + var republished = Self.grant(sessionKeyId: 9) + republished.responseDeleted = true + republished.markPublishStarted() + XCTAssertNil(republished.documentId) + XCTAssertTrue(republished.hasUnconfirmedResponse) + + var knownGone = Self.grant(sessionKeyId: 10) + knownGone.responseDeleted = true + var otherApp = Self.grant(sessionKeyId: 11) + otherApp.responseDeleted = true + var grants = [republished, knownGone, otherApp] + AppConnect.markKeysDisabled(in: &grants) { $0.sessionKeyId != 11 } + + XCTAssertEqual(grants.map(\.sessionKeyId), [9, 11]) + XCTAssertEqual(grants.map(\.keyDisabled), [true, nil]) + XCTAssertTrue(grants[0].hasUnconfirmedResponse, "the disconnect still has a response to look for") + } + func testNextKeyIdFollowsTheHighestKeyOnTheIdentity() { XCTAssertEqual(AppConnect.nextKeyId(currentIdentityPublicKeys: []), 1) XCTAssertEqual( @@ -1629,6 +1835,16 @@ final class AppConnectLoginTests: XCTestCase { AppConnect.sessionKeyIdsToDisable( for: [], appContractId: otherApp, bindings: bindings, currentIdentityPublicKeys: keys), [10]) + // Key 7 is the two-QR login's authentication key, given limits by + // its `dash-st:` registration: it stays unless a grant names it. + XCTAssertEqual( + AppConnect.sessionKeyIdsToDisable( + for: [Self.grant(sessionKeyId: 9)], + appContractId: app, + bindings: bindings, + currentIdentityPublicKeys: keys, + twoQRAuthenticationKeyHash160: Data([7])), + [6, 9]) } func testOnlyAWholeSingleContractBoundNamesTheApp() { @@ -1733,8 +1949,8 @@ final class AppConnectLoginTests: XCTestCase { func testExpiryIsTheLifetimeAfterNowInMilliseconds() { XCTAssertEqual( - AppConnect.expiresAt(from: Date(timeIntervalSince1970: 1_000)), - UInt64((1_000 + AppConnect.sessionKeyLifetime) * 1000)) + AppConnect.SessionKeyTerms(budgetCredits: 1, lifetime: 60).expiresAt(from: Date(timeIntervalSince1970: 1_000)), + 1_060_000) } func testResponseCarriesTheSessionKeyOnlyTheAppCanDecrypt() throws { @@ -1888,8 +2104,11 @@ final class AppConnectLoginTests: XCTestCase { let key = "scope.app-connect-responses.v1" let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } + XCTAssertTrue(store.canPersist) for stored in [Data(#"{"rows":[]}"#.utf8), Data([0xFF, 0x00])] { defaults.set(stored, forKey: key) + // Nothing new would be kept, so a login must not start. + XCTAssertFalse(store.canPersist) XCTAssertEqual(store.load().count, 0) store.save([Self.grant(sessionKeyId: 7)]) XCTAssertEqual(defaults.data(forKey: key), stored) @@ -1940,6 +2159,41 @@ final class AppConnectLoginTests: XCTestCase { private static let now = Date(timeIntervalSince1970: 1_800_000_000) private static let nowMilliseconds: Int64 = 1_800_000_000_000 + private static let app = Data(repeating: 0xA1, count: 32) + private static let sessionKeyHash = Data(repeating: 0x11, count: 20) + private static let terms = AppConnect.SessionKeyTerms(budgetCredits: 500, lifetime: 3_600) + + /// Key 9 as the one-QR login registers it, within `terms`. + private static func sessionKey( + purpose: KeyPurpose = .authentication, + securityLevel: SecurityLevel = .high, + disabledAt: Int64? = nil, + totalBudget: UInt64? = terms.budgetCredits, + expiresAt: Int64? = nowMilliseconds + 3_600_000 + ) -> ManagedIdentity.IdentityPublicKeyInfo { + key( + keyId: 9, purpose: purpose, securityLevel: securityLevel, data: sessionKeyHash, + disabledAt: disabledAt, totalBudget: totalBudget, expiresAt: expiresAt) + } + + /// The state of the session key for `app`; by default the store shows + /// key 9 bound to it. + private static func sessionKeyState( + keys: [ManagedIdentity.IdentityPublicKeyInfo], + bindings: [AppConnect.KeyBinding] = [ + AppConnect.KeyBinding(keyId: 9, data: sessionKeyHash, singleContractId: app), + ], + grantedKeyIds: Set = [] + ) -> AppConnect.SessionKeyState { + AppConnect.sessionKeyState( + publicKeyHash160: sessionKeyHash, + currentIdentityPublicKeys: keys, + appContractId: app, + bindings: bindings, + grantedKeyIds: grantedKeyIds, + terms: terms, + now: now) + } private static func key( keyId: Int32, From 430b3c0d54496712faa5bfe628747b3ec0bb4fa7 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 14:59:05 +0300 Subject: [PATCH 011/108] fix(dashpay): model an unresolved sign-in as its own state and keep two-QR keys out of a disconnect - A connection request says which login it would run: unresolved, two-QR or one-QR with its terms. One built without asking the network is unresolved, and the sheet then offers another try instead of an approval. - A disconnect derives the two-QR keys before it disables anything. When they cannot be derived, only the recorded session keys are disabled and the row stays with an error. - An expired two-QR key no longer keeps the row. - The connection row is named from a lookup made at approval again. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 24 ++++- .../DashConnect/DashConnectDataSource.swift | 11 ++- .../DashConnect/DashConnectModels.swift | 14 +-- .../PlatformDashConnectDataSource.swift | 87 ++++++++++--------- .../DashConnect/ApproveConnectionSheet.swift | 19 ++-- .../UI/DashConnect/ConnectionsScreen.swift | 2 +- .../UI/DashConnect/ConnectionsViewModel.swift | 7 ++ DashWallet/ar.lproj/Localizable.strings | 4 +- DashWallet/bg.lproj/Localizable.strings | 4 +- DashWallet/ca.lproj/Localizable.strings | 4 +- DashWallet/cs.lproj/Localizable.strings | 4 +- DashWallet/da.lproj/Localizable.strings | 4 +- DashWallet/de.lproj/Localizable.strings | 4 +- DashWallet/el.lproj/Localizable.strings | 4 +- DashWallet/en.lproj/Localizable.strings | 4 +- DashWallet/eo.lproj/Localizable.strings | 4 +- DashWallet/es.lproj/Localizable.strings | 4 +- DashWallet/et.lproj/Localizable.strings | 4 +- DashWallet/fa.lproj/Localizable.strings | 4 +- DashWallet/fi.lproj/Localizable.strings | 4 +- DashWallet/fil.lproj/Localizable.strings | 4 +- DashWallet/fr.lproj/Localizable.strings | 4 +- DashWallet/hr.lproj/Localizable.strings | 4 +- DashWallet/hu.lproj/Localizable.strings | 4 +- DashWallet/id.lproj/Localizable.strings | 4 +- DashWallet/it.lproj/Localizable.strings | 4 +- DashWallet/ja.lproj/Localizable.strings | 4 +- DashWallet/ko.lproj/Localizable.strings | 4 +- DashWallet/mk.lproj/Localizable.strings | 4 +- DashWallet/ms.lproj/Localizable.strings | 4 +- DashWallet/nb.lproj/Localizable.strings | 4 +- DashWallet/nl.lproj/Localizable.strings | 4 +- DashWallet/pl.lproj/Localizable.strings | 4 +- DashWallet/pt.lproj/Localizable.strings | 4 +- DashWallet/ro.lproj/Localizable.strings | 4 +- DashWallet/ru.lproj/Localizable.strings | 4 +- DashWallet/sk.lproj/Localizable.strings | 4 +- DashWallet/sl.lproj/Localizable.strings | 4 +- DashWallet/sl_SI.lproj/Localizable.strings | 4 +- DashWallet/sq.lproj/Localizable.strings | 4 +- DashWallet/sr.lproj/Localizable.strings | 4 +- DashWallet/sv.lproj/Localizable.strings | 4 +- DashWallet/th.lproj/Localizable.strings | 4 +- DashWallet/tr.lproj/Localizable.strings | 4 +- DashWallet/uk.lproj/Localizable.strings | 4 +- DashWallet/vi.lproj/Localizable.strings | 4 +- DashWallet/zh-Hans.lproj/Localizable.strings | 4 +- .../zh-Hant-TW.lproj/Localizable.strings | 4 +- DashWallet/zh.lproj/Localizable.strings | 4 +- DashWallet/zh_TW.lproj/Localizable.strings | 4 +- .../PlatformDashConnectDataSourceTests.swift | 41 ++++++++- 51 files changed, 221 insertions(+), 156 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 3fc476f359..25a8bd48f7 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -48,10 +48,26 @@ enum AppConnect { protocolVersion >= minimumProtocolVersion } - /// The terms of the login a network at `protocolVersion` gets: the - /// session key's for the one-QR login, none for the two-QR login. - static func sessionKeyTerms(protocolVersion: UInt32) -> SessionKeyTerms? { - isAvailable(protocolVersion: protocolVersion) ? .current : nil + /// Which login an approval would run, as far as the wallet could tell + /// when it built the approval sheet. + enum Login: Equatable { + /// The network did not say which login it takes, so what approving + /// would give the app is unknown and there is nothing to approve. + case unresolved + /// Registers no key at approval. + case twoQR + /// Registers a session key with these terms. + case oneQR(SessionKeyTerms) + + var sessionKeyTerms: SessionKeyTerms? { + if case .oneQR(let terms) = self { return terms } + return nil + } + } + + /// The login a network at `protocolVersion` gets. + static func login(protocolVersion: UInt32) -> Login { + isAvailable(protocolVersion: protocolVersion) ? .oneQR(.current) : .twoQR } /// The DIP-13 leaf of the session key: `hash256` of the app's ephemeral diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index ce3c450fc8..caf926dab4 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -131,7 +131,11 @@ final class MockDashConnectDataSource: DashConnectDataSource { network: .testnet ) static let sampleLoginQRCode = DashConnectSampleQR.keyUri(for: sampleLoginRequest) - static let sampleRequest = ConnectionRequest(loginRequest: sampleLoginRequest) + static let sampleRequest: ConnectionRequest = { + var request = ConnectionRequest(loginRequest: sampleLoginRequest) + request.login = .twoQR + return request + }() static func sample(_ status: ConnectionStatus) -> DAppConnection { DAppConnection( @@ -215,7 +219,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { throw DashConnectMockError.approveFailed } - let connectionRequest = consent + let connectionRequest = await makeConnectionRequest(from: request) let connection = DAppConnection( id: connectionRequest.appContractId, name: connectionRequest.appLabel.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : connectionRequest.appLabel, @@ -238,7 +242,8 @@ final class MockDashConnectDataSource: DashConnectDataSource { appUrl: fallback.appUrl, walletUsername: nil, walletIdentityId: nil, - existingConnection: existingConnection(for: fallback.appContractId) + existingConnection: existingConnection(for: fallback.appContractId), + login: .twoQR ) } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 0f1546599f..fb3a3fc0aa 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -199,12 +199,8 @@ struct ConnectionRequest: Equatable { let walletUsername: String? let walletIdentityId: String? let existingConnection: DAppConnection? - /// What the one-QR login gives the app. `nil` for the two-QR login, which - /// registers no key at approval. - var sessionKeyTerms: AppConnect.SessionKeyTerms? = nil - /// The network did not say which login it takes, so what approving would - /// give the app is unknown and there is nothing to approve yet. - var isLoginUnresolved = false + /// The login approving this request would run. + var login: AppConnect.Login = .unresolved } extension ConnectionRequest { @@ -233,8 +229,7 @@ extension ConnectionRequest { walletUsername: String?, walletIdentityId: String?, existingConnection: DAppConnection?, - sessionKeyTerms: AppConnect.SessionKeyTerms? = nil, - isLoginUnresolved: Bool = false + login: AppConnect.Login = .unresolved ) { self.init( appLabel: appLabel.trimmingCharacters(in: .whitespacesAndNewlines), @@ -243,8 +238,7 @@ extension ConnectionRequest { walletUsername: walletUsername, walletIdentityId: walletIdentityId, existingConnection: existingConnection, - sessionKeyTerms: sessionKeyTerms, - isLoginUnresolved: isLoginUnresolved + login: login ) } } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 0ebc43e477..2a5afc948f 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -143,7 +143,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { comment: "DashConnect") case .twoQRKeysNotChecked: return NSLocalizedString( - "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again.", + "This wallet could not check every key the app may hold, so the app may still have access. Try again.", comment: "DashConnect") case .approvalOutOfDate: return NSLocalizedString( @@ -492,15 +492,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { walletUsername: walletUsername, walletIdentityId: context.identityId.toBase58String(), existingConnection: existingConnection, - sessionKeyTerms: protocolVersion.flatMap(AppConnect.sessionKeyTerms(protocolVersion:)), - isLoginUnresolved: protocolVersion == nil + login: protocolVersion.map(AppConnect.login(protocolVersion:)) ?? .unresolved ) } func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { Self.logger.info("🔗 DASHCONNECT :: approveLogin started") try validateNetwork(request.network) - guard consent.appContractId == request.contractId.toBase58String(), !consent.isLoginUnresolved else { + guard consent.appContractId == request.contractId.toBase58String(), consent.login != .unresolved else { throw DashConnectPlatformError.approvalOutOfDate } @@ -525,13 +524,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") throw error } - // The sheet showed the login `makeConnectionRequest` resolved: its - // terms, or none for the two-QR login. If the network now gets the - // other one, what was approved is not what would run. Either login - // acts for the identity that was on the sheet: it has to be the - // active one here, and again after the PIN prompt. - let terms = AppConnect.sessionKeyTerms(protocolVersion: protocolVersion) - guard consent.sessionKeyTerms == terms, + // The sheet showed the login `makeConnectionRequest` resolved, with + // its terms for the one-QR login. If the network now gets the other + // one, what was approved is not what would run. Either login acts + // for the identity that was on the sheet: it has to be the active + // one here, and again after the PIN prompt. + let login = AppConnect.login(protocolVersion: protocolVersion) + guard consent.login == login, consent.walletIdentityId == context.identityId.toBase58String() else { Self.logger.error("🔗 DASHCONNECT :: the approved sign-in no longer matches the network or the identity") throw DashConnectPlatformError.approvalOutOfDate @@ -550,9 +549,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.approvalOutOfDate } context = authorized - if let terms { + if let terms = login.sessionKeyTerms { Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") - return try await approveAppConnectLogin(request, consent: consent, terms: terms, context: context) + return try await approveAppConnectLogin(request, terms: terms, context: context) } Self.logger.info("🔗 DASHCONNECT :: authorized; deriving login key") @@ -601,6 +600,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse document written") + let preview = await makeConnectionRequest(from: request) + Self.logger.info("🔗 DASHCONNECT :: connection preview resolved") let connection: DAppConnection do { var derivedMaterial = try Self.deriveKeyRegistrationMaterial( @@ -626,9 +627,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { encryptionPublicKey: derivedMaterial.encryptionPublicKey, currentIdentityPublicKeys: currentPublicKeys ) { - connection = Self.makeConnection(preview: consent, status: .active, updatedAt: now()) + connection = Self.makeConnection(preview: preview, status: .active, updatedAt: now()) } else { - connection = Self.makeConnection(preview: consent, status: .approved, updatedAt: now()) + connection = Self.makeConnection(preview: preview, status: .approved, updatedAt: now()) } } catch { Self.logger.error( @@ -636,7 +637,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) // Conservative fallback: asking for a QR is safer than claiming the // registration is already on the identity when we could not verify it. - connection = Self.makeConnection(preview: consent, status: .approved, updatedAt: now()) + connection = Self.makeConnection(preview: preview, status: .approved, updatedAt: now()) } var current = subject.value.filter { $0.id != connection.id } @@ -669,7 +670,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// does nothing more. private func approveAppConnectLogin( _ request: DashKeyRequest, - consent: ConnectionRequest, terms: AppConnect.SessionKeyTerms, context: Context ) async throws -> DAppConnection { @@ -792,8 +792,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return new } + let preview = await makeConnectionRequest(from: request) let connection = Self.makeConnection( - preview: consent, status: .active, updatedAt: now(), loginKind: .oneQR) + preview: preview, status: .active, updatedAt: now(), loginKind: .oneQR) var current = subject.value.filter { $0.id != connection.id } current.append(connection) persistAndSend(current) @@ -1448,23 +1449,22 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // as turned off. throw DashConnectPlatformError.identityKeysOutOfDate } - // The keys of an earlier two-QR login to the app, for a row made by - // the one-QR login. They are not disabled: that login derives the - // same keys every time, so the app could never be given them again. - // `nil` when they could not be derived. + // The keys of an earlier two-QR login to the app. They are not + // disabled: that login derives the same keys every time, so the app + // could never be given them again. `nil` when they could not be + // derived; a key without a grant record could then be one of them, + // so only the recorded session keys are disabled. var twoQRKeys: (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data)? - if checksUnrecordedKeys { - do { - twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) - } catch { - Self.logger.error( - "🔗 DASHCONNECT :: two-QR keys not derived — \(error.localizedDescription, privacy: .public)") - } + do { + twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: two-QR keys not derived — \(error.localizedDescription, privacy: .public)") } let keyIds = AppConnect.sessionKeyIdsToDisable( for: granted, appContractId: appContract, - bindings: bindings, + bindings: twoQRKeys == nil ? [] : bindings, currentIdentityPublicKeys: currentPublicKeys, twoQRAuthenticationKeyHash160: twoQRKeys?.authenticationPublicKeyHash160 ) @@ -1497,17 +1497,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - // The session keys are off. The two-QR keys were left out of the - // update, so the list fetched before it still tells whether they are - // live. If they could not be derived that is unknown, and the row - // stays as it is with an error rather than go or change on a guess. + // The recorded session keys are off. The two-QR keys were left out + // of the update, so the list fetched before it still tells whether + // they are live. If they could not be derived, that and the keys + // without a record are unknown: the row stays as it is, with an + // error, rather than go or change on a guess. var twoQRKeysRemain = false if checksUnrecordedKeys { guard let twoQRKeys else { throw DashConnectPlatformError.twoQRKeysNotChecked } twoQRKeysRemain = Self.hasAnyRegisteredLoginKey( authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, encryptionPublicKey: twoQRKeys.encryptionPublicKey, - currentIdentityPublicKeys: currentPublicKeys + currentIdentityPublicKeys: currentPublicKeys, + now: now() ) } return AppConnectRevocation( @@ -1725,19 +1727,22 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } - /// Whether either key of the two-QR login is live on the identity: the - /// app can still use whichever one is. + /// Whether either key of the two-QR login is live on the identity, not + /// disabled and not expired: the app can still use whichever one is. static func hasAnyRegisteredLoginKey( authenticationPublicKeyHash160: Data, encryptionPublicKey: Data, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + now: Date ) -> Bool { - hasRegisteredAuthenticationKey( + let nowMilliseconds = Int64((now.timeIntervalSince1970 * 1000).rounded()) + let unexpired = currentIdentityPublicKeys.filter { $0.expiresAt.map { $0 > nowMilliseconds } ?? true } + return hasRegisteredAuthenticationKey( authenticationPublicKeyHash160: authenticationPublicKeyHash160, - currentIdentityPublicKeys: currentIdentityPublicKeys + currentIdentityPublicKeys: unexpired ) || hasRegisteredEncryptionKey( encryptionPublicKey: encryptionPublicKey, - currentIdentityPublicKeys: currentIdentityPublicKeys + currentIdentityPublicKeys: unexpired ) } diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index e070c553c4..f4a969908b 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -73,13 +73,13 @@ struct ApproveConnectionSheet: View { // The one-QR login gives the app a key with limits of its // own, so its terms are spelled out on a repeat sign-in // too, and when it replaces a two-QR connection. - if request.isLoginUnresolved { + if request.login == .unresolved { Text(NSLocalizedString( - "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again.", + "This wallet could not check with the network what this sign-in would give the app.", comment: "DashConnect")) .font(.subhead) .foregroundColor(.primaryText) - } else if let terms = request.sessionKeyTerms { + } else if let terms = request.login.sessionKeyTerms { sessionKeyPermissions(terms) } else if isRelogin { reloginPermissionsSummary @@ -127,11 +127,15 @@ struct ApproveConnectionSheet: View { } DashButton( - text: NSLocalizedString("Approve", comment: "DashConnect"), + // With the login unresolved there is nothing to approve: + // the same action asks the network again instead. + text: request.login == .unresolved + ? NSLocalizedString("Try again", comment: "") + : NSLocalizedString("Approve", comment: "DashConnect"), style: .filledBlue, size: .large, stretch: true, - isEnabled: !isLoading && !request.isLoginUnresolved, + isEnabled: !isLoading, isLoading: isLoading, action: onApprove ) @@ -370,7 +374,7 @@ private let dashConnectTruncateMiddleCheck: Bool = { walletUsername: "dashuser", walletIdentityId: "5DbLwAxEWR695MsqP4KybNQD5n7CUDWydJYNg63FzUo8", existingConnection: nil, - sessionKeyTerms: .current + login: .oneQR(.current) ), onApprove: {}, onDeny: {} @@ -385,7 +389,8 @@ private let dashConnectTruncateMiddleCheck: Bool = { appUrl: "yap.pr", walletUsername: "dashuser", walletIdentityId: "5DbLwAxEWR695MsqP4KybNQD5n7CUDWydJYNg63FzUo8", - existingConnection: MockDashConnectDataSource.sample(.active) + existingConnection: MockDashConnectDataSource.sample(.active), + login: .twoQR ), onApprove: {}, onDeny: {} diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 95104f95da..c15152bf96 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -115,7 +115,7 @@ struct ConnectionsScreen: View { ) // The one-QR terms make the sheet longer than the fixed height // shows; who pays and when access ends must not sit below the fold. - .approveSheetPresentation(isLoading: viewModel.isApproving, isTall: request.sessionKeyTerms != nil) + .approveSheetPresentation(isLoading: viewModel.isApproving, isTall: request.login.sessionKeyTerms != nil) } private func tokenPurchaseSheet(for purchase: DashConnectTokenPurchaseRequest) -> some View { diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index c0a3b3ec42..d4782c1468 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -208,6 +208,13 @@ final class ConnectionsViewModel: ObservableObject { Task { defer { isApproving = false } + // The wallet could not tell which login this would be, so the + // sheet offered no approval, only another try at finding out. + guard consent.login != .unresolved else { + self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) + return + } + do { _ = try await dataSource.approveLogin(pendingLoginRequest, consent: consent) self.pendingRequest = nil diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 15c06597b2..20f81405cc 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index fa1acb7632..4f61d074a9 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 4ded93138f..83cb5d1344 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 351218530f..8950fafe49 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 8b88d3bfa6..0d4759bda4 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index eeeab92a29..10bf0f0461 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 06faac5783..7ef8f0fd22 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index f0d23940f6..8d3332305e 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6109,7 +6109,6 @@ "Couldn't open your wallet data" = "Couldn't open your wallet data"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app." = "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6117,7 +6116,8 @@ "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Your Dash balance" = "Your Dash balance"; "Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index d0d282f894..11d261ff45 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 7046e8d05f..a9d017ede0 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 077d46ffbc..b223dd68df 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index f16def9aa4..a042f20618 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index e8470bc91a..23b700021b 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index b123af4139..ed537b06ef 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index cc4cbde6ea..ad33cfad8d 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 1998f549c7..57c05a3738 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 928cac2833..33fad602aa 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index d3e3684a34..2d2a4a1898 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 88d201b142..25b0009349 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 85d23f71fc..bf82ac932d 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 343be990d9..ff2b1ff277 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 4d21e14708..d7b899a326 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 13dfe42586..b53aa5f5ea 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 480430b4e3..ffe6dffbf3 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 599070868c..2e85abf30a 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 15a6014b07..21f02f0511 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 76ea435846..8cb893e980 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 3070060e00..01f7a37e99 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index db056772a5..8cb3689bc5 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 89048c1532..8970835e40 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 0536d9733b..8a10583189 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 0565c21773..65feed6e8a 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index a0dc081897..96a7986447 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 92ed7ddce2..8fba8ab4ca 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 8c9554890b..acd57caa09 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index e92ba31dce..1b5605e51f 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index d0484e7a61..af8f1de081 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 13a2bd9202..ee7f5b88c6 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 1012589365..75169f34c9 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index e89822cd0b..8244282b3e 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 1a836cb6d2..2a5f7f7b92 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 8e32533dd8..4179fa1428 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 7988106954..5474ffebb7 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 013f63f137..d19c049910 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -928,7 +928,8 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { PlatformDashConnectDataSource.hasAnyRegisteredLoginKey( authenticationPublicKeyHash160: authentication, encryptionPublicKey: encryption, - currentIdentityPublicKeys: keys) + currentIdentityPublicKeys: keys, + now: Date(timeIntervalSince1970: 1_000)) } let authenticationKey = makeIdentityPublicKeyInfo( keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: authentication) @@ -948,6 +949,14 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { XCTAssertTrue(remains([disabledAuthenticationKey, encryptionKey])) XCTAssertFalse(remains([disabledAuthenticationKey, sessionKey])) XCTAssertFalse(remains([])) + // A `dash-st:` registration may have put an expiry on the key. + func expiringAuthenticationKey(expiresAt: Int64) -> ManagedIdentity.IdentityPublicKeyInfo { + ManagedIdentity.IdentityPublicKeyInfo( + keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, + readOnly: false, disabledAt: nil, data: authentication, totalBudget: 5, expiresAt: expiresAt) + } + XCTAssertFalse(remains([expiringAuthenticationKey(expiresAt: 1_000_000)])) + XCTAssertTrue(remains([expiringAuthenticationKey(expiresAt: 1_000_001)])) } func testMissingKeyRegistrationKeysReturnsOnlyMissingEncryptionKey() throws { @@ -1357,6 +1366,25 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertNil(viewModel.message) } + /// With the login unresolved the sheet's action asks again and approves + /// nothing. + func testAnUnresolvedLoginIsAskedForAgainInsteadOfApproved() async { + let unresolved = ConnectionRequest(loginRequest: MockDashConnectDataSource.sampleLoginRequest) + let resolved = Self.consent(identityId: "identity-a", terms: .current) + let spy = LoginApprovalSpy(shown: [unresolved, resolved]) + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.onQRScanned("login") + await waitUntil { viewModel.pendingRequest != nil } + XCTAssertEqual(viewModel.pendingRequest?.login, .unresolved) + viewModel.approvePendingRequest() + await waitUntil { !viewModel.isApproving } + + XCTAssertEqual(viewModel.pendingRequest, resolved) + XCTAssertEqual(spy.approvedConsents, []) + XCTAssertNil(viewModel.approveError) + } + func testApprovingALoginPassesTheRequestAsTheSheetShowedIt() async { let shown = Self.consent(identityId: "identity-a", terms: .current) let spy = LoginApprovalSpy(shown: [shown]) @@ -1404,7 +1432,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { walletUsername: nil, walletIdentityId: identityId, existingConnection: nil, - sessionKeyTerms: terms) + login: terms.map(AppConnect.Login.oneQR) ?? .twoQR) } private static let connection = DAppConnection( @@ -1721,8 +1749,13 @@ final class AppConnectLoginTests: XCTestCase { } func testTheOneQrLoginHasTermsAndTheTwoQrLoginHasNone() { - XCTAssertNil(AppConnect.sessionKeyTerms(protocolVersion: 13)) - XCTAssertEqual(AppConnect.sessionKeyTerms(protocolVersion: 14), .current) + XCTAssertEqual(AppConnect.login(protocolVersion: 13), .twoQR) + XCTAssertEqual(AppConnect.login(protocolVersion: 14), .oneQR(.current)) + XCTAssertNil(AppConnect.Login.twoQR.sessionKeyTerms) + XCTAssertNil(AppConnect.Login.unresolved.sessionKeyTerms) + XCTAssertEqual(AppConnect.Login.oneQR(.current).sessionKeyTerms, .current) + // A request built without asking the network is not a two-QR one. + XCTAssertEqual(ConnectionRequest(loginRequest: MockDashConnectDataSource.sampleLoginRequest).login, .unresolved) XCTAssertEqual(AppConnect.SessionKeyTerms.current.budgetCredits, AppConnect.sessionKeyBudgetCredits) XCTAssertEqual(AppConnect.SessionKeyTerms.current.lifetime, AppConnect.sessionKeyLifetime) } From fdc5d4cfb21015f02ba1a410d0d12b2a17d6938c Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 15:37:24 +0300 Subject: [PATCH 012/108] fix(dashpay): turning off a one-QR connection also disables the app's two-QR keys A one-QR connection that replaced a two-QR one left that login's keys live on the identity after a disconnect. The disconnect now derives them first, disables them with the session keys in the same updates, and removes the row; if they cannot be derived nothing is turned off. A two-QR connection stays local-only as before. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 7 +- .../DashConnect/DashConnectDataSource.swift | 6 +- .../PlatformDashConnectDataSource.swift | 153 +++++++----------- .../DashConnect/ApproveConnectionSheet.swift | 2 +- .../Components/ConnectionRow.swift | 3 +- DashWallet/ar.lproj/Localizable.strings | 5 +- DashWallet/bg.lproj/Localizable.strings | 5 +- DashWallet/ca.lproj/Localizable.strings | 5 +- DashWallet/cs.lproj/Localizable.strings | 5 +- DashWallet/da.lproj/Localizable.strings | 5 +- DashWallet/de.lproj/Localizable.strings | 5 +- DashWallet/el.lproj/Localizable.strings | 5 +- DashWallet/en.lproj/Localizable.strings | 5 +- DashWallet/eo.lproj/Localizable.strings | 5 +- DashWallet/es.lproj/Localizable.strings | 5 +- DashWallet/et.lproj/Localizable.strings | 5 +- DashWallet/fa.lproj/Localizable.strings | 5 +- DashWallet/fi.lproj/Localizable.strings | 5 +- DashWallet/fil.lproj/Localizable.strings | 5 +- DashWallet/fr.lproj/Localizable.strings | 5 +- DashWallet/hr.lproj/Localizable.strings | 5 +- DashWallet/hu.lproj/Localizable.strings | 5 +- DashWallet/id.lproj/Localizable.strings | 5 +- DashWallet/it.lproj/Localizable.strings | 5 +- DashWallet/ja.lproj/Localizable.strings | 5 +- DashWallet/ko.lproj/Localizable.strings | 5 +- DashWallet/mk.lproj/Localizable.strings | 5 +- DashWallet/ms.lproj/Localizable.strings | 5 +- DashWallet/nb.lproj/Localizable.strings | 5 +- DashWallet/nl.lproj/Localizable.strings | 5 +- DashWallet/pl.lproj/Localizable.strings | 5 +- DashWallet/pt.lproj/Localizable.strings | 5 +- DashWallet/ro.lproj/Localizable.strings | 5 +- DashWallet/ru.lproj/Localizable.strings | 5 +- DashWallet/sk.lproj/Localizable.strings | 5 +- DashWallet/sl.lproj/Localizable.strings | 5 +- DashWallet/sl_SI.lproj/Localizable.strings | 5 +- DashWallet/sq.lproj/Localizable.strings | 5 +- DashWallet/sr.lproj/Localizable.strings | 5 +- DashWallet/sv.lproj/Localizable.strings | 5 +- DashWallet/th.lproj/Localizable.strings | 5 +- DashWallet/tr.lproj/Localizable.strings | 5 +- DashWallet/uk.lproj/Localizable.strings | 5 +- DashWallet/vi.lproj/Localizable.strings | 5 +- DashWallet/zh-Hans.lproj/Localizable.strings | 5 +- .../zh-Hant-TW.lproj/Localizable.strings | 5 +- DashWallet/zh.lproj/Localizable.strings | 5 +- DashWallet/zh_TW.lproj/Localizable.strings | 5 +- .../PlatformDashConnectDataSourceTests.swift | 30 ++-- 49 files changed, 165 insertions(+), 251 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 25a8bd48f7..1ee7aa77d2 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -220,9 +220,10 @@ enum AppConnect { /// has no grant record for. A key that is gone, already disabled, or of /// another shape is left alone, including one another wallet gave the /// app with a document-type bound, a single limit or another key type. - /// So is the two-QR login's authentication key, named by - /// `twoQRAuthenticationKeyHash160`: it has the same kind and bound, and a - /// `dash-st:` registration may have put limits on it. + /// The two-QR login's authentication key, named by + /// `twoQRAuthenticationKeyHash160`, is not picked here either: it has the + /// same kind and bound, a `dash-st:` registration may have put limits on + /// it, and whether it goes is the caller's decision. static func sessionKeyIdsToDisable( for grants: [AppConnectGrant], appContractId: Data, diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index caf926dab4..f83976ce2d 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -46,9 +46,9 @@ protocol DashConnectDataSource { /// the app holds a key on another identity of the wallet. For a two-QR /// connection it only changes the local status: that login derives the /// same key every time and Platform never re-adds a disabled key, so - /// disabling it would lock the app out for good. A one-QR connection that - /// replaced a two-QR one gets both: its session keys are disabled, and it - /// stays, in that local status, while the two-QR keys are on the identity. + /// disabling it would lock the app out for good. Turning off a one-QR + /// connection that replaced a two-QR one does disable those keys too: + /// the app is left with no key on the identity. func disconnect(id: String) async throws func remove(id: String) async } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 2a5afc948f..e6e64e7333 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -77,7 +77,6 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case grantStoreUnavailable case approvalOutOfDate case grantNotRecorded - case twoQRKeysNotChecked case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -139,11 +138,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { comment: "DashConnect") case .grantNotRecorded: return NSLocalizedString( - "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key.", - comment: "DashConnect") - case .twoQRKeysNotChecked: - return NSLocalizedString( - "This wallet could not check every key the app may hold, so the app may still have access. Try again.", + "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key.", comment: "DashConnect") case .approvalOutOfDate: return NSLocalizedString( @@ -193,16 +188,6 @@ enum DashConnectPlatformError: LocalizedError, Equatable { } } -/// What a disconnect found besides the session keys it disabled. -struct AppConnectRevocation: Equatable { - /// A grant record shows the app with a live key on another identity of - /// this wallet. - let liveOnAnotherIdentity: Bool - /// The keys of an earlier two-QR login to the app are still live on this - /// identity. - let twoQRKeysRemain: Bool -} - struct DashConnectLoginKeyResponseDraft: Equatable { let properties: [String: AnyHashable] let walletEphemeralPublicKey: Data @@ -484,6 +469,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let metadata = await resolveAppMetadata(for: loginRequest, sdk: context.sdk) let walletUsername = await resolveWalletUsername(context: context) let protocolVersion = await resolvedProtocolVersion + if protocolVersion == nil { + Self.logger.error("🔗 DASHCONNECT :: protocol version unknown; the sign-in is shown as unresolved") + } return ConnectionRequest( loginRequest: loginRequest, @@ -1318,21 +1306,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func disconnect(id: String) async throws { let isOneQR = subject.value.first { $0.id == id }?.loginKind == .oneQR let hasGrants = responseStore.load().contains { $0.appContractId == id } - var twoQRKeysRemain = false if isOneQR || hasGrants { - let revocation = try await revokeAppConnectGrants(appContractId: id, checksUnrecordedKeys: isOneQR) + let liveElsewhere = try await revokeAppConnectGrants(appContractId: id, checksUnrecordedKeys: isOneQR) // The row stands for the app, and the app still holds a key on // another identity of this wallet. That key can only be disabled // while its identity is the active one, so the row stays to get - // there; this identity's key is off. - if revocation.liveOnAnotherIdentity { return } - twoQRKeysRemain = revocation.twoQRKeysRemain - } - if isOneQR, !twoQRKeysRemain { - // Nothing is left of a one-QR connection once its key is disabled: - // the same QR can no longer be approved and there is no second - // step to wait for, so the row goes instead of sitting in the - // two-QR "approved" state. + // there; this identity's keys are off. + if liveElsewhere { return } + } + if isOneQR { + // Nothing is left of a one-QR connection once its keys are + // disabled, those of an earlier two-QR login included: the same + // QR can no longer be approved and there is no second step to + // wait for, so the row goes instead of sitting in the two-QR + // "approved" state. persistAndSend(subject.value.filter { $0.id != id }) return } @@ -1340,10 +1327,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let disconnectedAt = now() // Local-only for a two-QR connection: its `loginKeyResponse` document // stays, and re-approving the same `dash-key:` QR returns it to - // `.active` while the identity keys are still registered. A one-QR - // connection that replaced a two-QR one ends up here as well while - // the two-QR keys are still on the identity: its session keys are - // off, and the row goes back to what a two-QR disconnect leaves. + // `.active` while the identity keys are still registered. persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } return DAppConnection( @@ -1371,7 +1355,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// record stays on Platform. It can only be found by its request hash, /// which the record held. /// - /// Reports whether a grant record shows the app with a live key on + /// For a row made by the one-QR login the keys of an earlier two-QR + /// login to the app are disabled as well, so that turning the app off + /// leaves it no key on this identity. That login derives the same keys + /// every time and Platform never re-adds a key, so the app cannot sign + /// in with two QRs again. A two-QR row keeps them. + /// + /// Returns whether a grant record shows the app with a live key on /// another identity of this wallet. When this identity gave it none, that /// is thrown instead: nothing was turned off. /// TODO(app-connect-other-identity-keys): a key on another identity that @@ -1381,14 +1371,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// `checksUnrecordedKeys` is set for a row made by the one-QR login: with /// no record for this identity the keys are still looked for on it. When /// it holds none bound to the app, there was nothing to turn off here and - /// the call returns without an error. For such a row it also reports - /// whether the keys of an earlier two-QR login to the app are still live - /// on this identity, and throws once the session keys are off when that - /// cannot be told. - private func revokeAppConnectGrants( - appContractId: String, - checksUnrecordedKeys: Bool - ) async throws -> AppConnectRevocation { + /// the call returns without an error. + private func revokeAppConnectGrants(appContractId: String, checksUnrecordedKeys: Bool) async throws -> Bool { var context = try await requireContext() let identityId = context.identityId.toBase58String() func isGranted(_ grant: AppConnectGrant) -> Bool { @@ -1410,9 +1394,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { .contains { $0.singleContractId == appContract && !$0.isDisabled && $0.isSessionKeyShaped } if !holdsUnrecordedKey { if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } - if !checksUnrecordedKeys { - return AppConnectRevocation(liveOnAnotherIdentity: false, twoQRKeysRemain: false) - } + if !checksUnrecordedKeys { return false } } } @@ -1449,30 +1431,30 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // as turned off. throw DashConnectPlatformError.identityKeysOutOfDate } - // The keys of an earlier two-QR login to the app. They are not - // disabled: that login derives the same keys every time, so the app - // could never be given them again. `nil` when they could not be - // derived; a key without a grant record could then be one of them, - // so only the recorded session keys are disabled. - var twoQRKeys: (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data)? - do { - twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) - } catch { - Self.logger.error( - "🔗 DASHCONNECT :: two-QR keys not derived — \(error.localizedDescription, privacy: .public)") - } - let keyIds = AppConnect.sessionKeyIdsToDisable( + // The keys the two-QR login derives for this app, known before + // anything is disabled: its authentication key has the kind and the + // bound of a session key, and which of the two it is decides what + // happens to it. If they cannot be derived, nothing is turned off. + let twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) + var keyIds = AppConnect.sessionKeyIdsToDisable( for: granted, appContractId: appContract, - bindings: twoQRKeys == nil ? [] : bindings, + bindings: bindings, currentIdentityPublicKeys: currentPublicKeys, - twoQRAuthenticationKeyHash160: twoQRKeys?.authenticationPublicKeyHash160 + twoQRAuthenticationKeyHash160: twoQRKeys.authenticationPublicKeyHash160 ) + if checksUnrecordedKeys { + keyIds = Array(Set(keyIds).union(Self.liveLoginKeyIds( + authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, + encryptionPublicKey: twoQRKeys.encryptionPublicKey, + currentIdentityPublicKeys: currentPublicKeys + ))).sorted() + } if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } if !keyIds.isEmpty { - Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) session key(s)") + Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) app key(s)") // Platform takes a limited number of keys per update. A failure // part way leaves the rest live and the row in place; the next // attempt picks up what is still live. @@ -1483,7 +1465,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - Self.logger.info("🔗 DASHCONNECT :: session key(s) disabled") + Self.logger.info("🔗 DASHCONNECT :: app key(s) disabled") } // Every session key this identity gave the app is now off. @@ -1497,24 +1479,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - // The recorded session keys are off. The two-QR keys were left out - // of the update, so the list fetched before it still tells whether - // they are live. If they could not be derived, that and the keys - // without a record are unknown: the row stays as it is, with an - // error, rather than go or change on a guess. - var twoQRKeysRemain = false - if checksUnrecordedKeys { - guard let twoQRKeys else { throw DashConnectPlatformError.twoQRKeysNotChecked } - twoQRKeysRemain = Self.hasAnyRegisteredLoginKey( - authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, - encryptionPublicKey: twoQRKeys.encryptionPublicKey, - currentIdentityPublicKeys: currentPublicKeys, - now: now() - ) - } - return AppConnectRevocation( - liveOnAnotherIdentity: hasLiveGrantElsewhere(), - twoQRKeysRemain: twoQRKeysRemain) + return hasLiveGrantElsewhere() } /// The public halves of the keys the two-QR login derives for this @@ -1727,23 +1692,25 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } - /// Whether either key of the two-QR login is live on the identity, not - /// disabled and not expired: the app can still use whichever one is. - static func hasAnyRegisteredLoginKey( + /// The ids of the two-QR login's keys that are on the identity and not + /// disabled. + static func liveLoginKeyIds( authenticationPublicKeyHash160: Data, encryptionPublicKey: Data, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], - now: Date - ) -> Bool { - let nowMilliseconds = Int64((now.timeIntervalSince1970 * 1000).rounded()) - let unexpired = currentIdentityPublicKeys.filter { $0.expiresAt.map { $0 > nowMilliseconds } ?? true } - return hasRegisteredAuthenticationKey( - authenticationPublicKeyHash160: authenticationPublicKeyHash160, - currentIdentityPublicKeys: unexpired - ) || hasRegisteredEncryptionKey( - encryptionPublicKey: encryptionPublicKey, - currentIdentityPublicKeys: unexpired - ) + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> [UInt32] { + currentIdentityPublicKeys + .filter { key in + hasRegisteredAuthenticationKey( + authenticationPublicKeyHash160: authenticationPublicKeyHash160, + currentIdentityPublicKeys: [key] + ) || hasRegisteredEncryptionKey( + encryptionPublicKey: encryptionPublicKey, + currentIdentityPublicKeys: [key] + ) + } + .map { UInt32(bitPattern: $0.keyId) } + .sorted() } static func missingKeyRegistrationKeys( diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index f4a969908b..b377d1d07d 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -75,7 +75,7 @@ struct ApproveConnectionSheet: View { // too, and when it replaces a two-QR connection. if request.login == .unresolved { Text(NSLocalizedString( - "This wallet could not check with the network what this sign-in would give the app.", + "This wallet could not check what this sign-in would give the app.", comment: "DashConnect")) .font(.subhead) .foregroundColor(.primaryText) diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift index 467799815a..00ac7e770c 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift @@ -91,8 +91,7 @@ struct ConnectionRow: View { /// depends on the login that made the connection (see /// `DashConnectDataSource.disconnect`): a one-QR connection has the app's /// key disabled on the identity and its row removed; a two-QR connection - /// is downgraded to `.approved` locally and the app keeps its keys. A - /// one-QR connection that replaced a two-QR one gets both. + /// is downgraded to `.approved` locally and the app keeps its keys. private var activeSwitch: some View { ZStack { SwitchView(isOn: .constant(true)) diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 20f81405cc..5b5520fff8 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 4f61d074a9..ef0b671de4 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 83cb5d1344..9278c79401 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 8950fafe49..ba2ab9b3a4 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 0d4759bda4..b70f0d1c9d 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 10bf0f0461..1bf9aa1c26 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 7ef8f0fd22..9827fd6716 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 8d3332305e..b33f64b90b 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6108,7 +6108,7 @@ "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app." = "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6116,8 +6116,7 @@ "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Your Dash balance" = "Your Dash balance"; "Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 11d261ff45..20b4770296 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index a9d017ede0..efa1f15b75 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index b223dd68df..aded8233f8 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index a042f20618..9abbeb402a 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 23b700021b..a1fda04138 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index ed537b06ef..994206e025 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index ad33cfad8d..83aa4d6c70 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 57c05a3738..ab6bb171f6 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 33fad602aa..c7eb3efe62 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 2d2a4a1898..2781bfcbce 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 25b0009349..bfcc832d72 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index bf82ac932d..1e58fec0f0 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index ff2b1ff277..9284ecfb23 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index d7b899a326..6181349ac0 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index b53aa5f5ea..65a4e2e7af 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index ffe6dffbf3..07d9424ddb 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 2e85abf30a..8f9511639d 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 21f02f0511..f50bf8eb8e 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 8cb893e980..946957e6d9 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 01f7a37e99..694c36affb 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 8cb3689bc5..6e4bb365a2 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 8970835e40..b37ae4f192 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 8a10583189..a08d0e6aee 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 65feed6e8a..38b2ec3541 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 96a7986447..299dc0aca6 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 8fba8ab4ca..8b54567700 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index acd57caa09..2ad8db7854 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 1b5605e51f..2d9d6cad0d 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index af8f1de081..0e67336cd6 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index ee7f5b88c6..a098598676 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 75169f34c9..2dc524cb5c 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 8244282b3e..e28073ed12 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 2a5f7f7b92..18bf7abed9 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 4179fa1428..cad7e068bf 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 5474ffebb7..bb44239f6c 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index d19c049910..8bfb4b9133 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -919,17 +919,16 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { ) } - /// A disconnect of a one-QR connection keeps the row while either key of - /// an earlier two-QR login is live: the app can still use that one. - func testEitherLiveTwoQrLoginKeyCountsAsRemainingAccess() { + /// Turning off a one-QR connection that replaced a two-QR one disables + /// what is left of the two-QR login's keys as well. + func testADisconnectFindsTheLiveTwoQrLoginKeysByTheirDerivedPayload() { let authentication = Data(repeating: 0x51, count: 20) let encryption = Data(repeating: 0x52, count: 33) - func remains(_ keys: [ManagedIdentity.IdentityPublicKeyInfo]) -> Bool { - PlatformDashConnectDataSource.hasAnyRegisteredLoginKey( + func live(_ keys: [ManagedIdentity.IdentityPublicKeyInfo]) -> [UInt32] { + PlatformDashConnectDataSource.liveLoginKeyIds( authenticationPublicKeyHash160: authentication, encryptionPublicKey: encryption, - currentIdentityPublicKeys: keys, - now: Date(timeIntervalSince1970: 1_000)) + currentIdentityPublicKeys: keys) } let authenticationKey = makeIdentityPublicKeyInfo( keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: authentication) @@ -944,19 +943,10 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { keyId: 102, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: Data(repeating: 0x53, count: 20)) - XCTAssertTrue(remains([authenticationKey, encryptionKey])) - XCTAssertTrue(remains([authenticationKey])) - XCTAssertTrue(remains([disabledAuthenticationKey, encryptionKey])) - XCTAssertFalse(remains([disabledAuthenticationKey, sessionKey])) - XCTAssertFalse(remains([])) - // A `dash-st:` registration may have put an expiry on the key. - func expiringAuthenticationKey(expiresAt: Int64) -> ManagedIdentity.IdentityPublicKeyInfo { - ManagedIdentity.IdentityPublicKeyInfo( - keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, - readOnly: false, disabledAt: nil, data: authentication, totalBudget: 5, expiresAt: expiresAt) - } - XCTAssertFalse(remains([expiringAuthenticationKey(expiresAt: 1_000_000)])) - XCTAssertTrue(remains([expiringAuthenticationKey(expiresAt: 1_000_001)])) + XCTAssertEqual(live([encryptionKey, sessionKey, authenticationKey]), [100, 101]) + XCTAssertEqual(live([disabledAuthenticationKey, encryptionKey]), [101]) + XCTAssertEqual(live([disabledAuthenticationKey, sessionKey]), []) + XCTAssertEqual(live([]), []) } func testMissingKeyRegistrationKeysReturnsOnlyMissingEncryptionKey() throws { From d61a1df5120190483060060c9b71a4fcd007d180 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 15:46:55 +0300 Subject: [PATCH 013/108] fix(dashpay): a one-QR disconnect reaches the two-QR keys with no session key on the identity - A one-QR row goes on to the PIN prompt when the identity holds no session key of the app: its two-QR keys can only be looked for after it. - An unresolved sign-in says why, and the sheet retries through its own action; the approval cannot be reached from that state. - Comments state what a disconnect disables, not more. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 9 ++-- .../DashConnect/DashConnectDataSource.swift | 3 +- .../DashConnect/DashConnectModels.swift | 8 ++- .../PlatformDashConnectDataSource.swift | 52 ++++++++++++------- .../DashConnect/ApproveConnectionSheet.swift | 13 +++-- .../UI/DashConnect/ConnectionsScreen.swift | 1 + .../UI/DashConnect/ConnectionsViewModel.swift | 26 +++++++--- .../PlatformDashConnectDataSourceTests.swift | 2 + 8 files changed, 75 insertions(+), 39 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 1ee7aa77d2..e98805d40e 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -220,10 +220,11 @@ enum AppConnect { /// has no grant record for. A key that is gone, already disabled, or of /// another shape is left alone, including one another wallet gave the /// app with a document-type bound, a single limit or another key type. - /// The two-QR login's authentication key, named by - /// `twoQRAuthenticationKeyHash160`, is not picked here either: it has the - /// same kind and bound, a `dash-st:` registration may have put limits on - /// it, and whether it goes is the caller's decision. + /// A key without a grant record whose payload is + /// `twoQRAuthenticationKeyHash160` is left alone as well: the two-QR + /// login's authentication key has the same kind and bound, and a + /// `dash-st:` registration may have put limits on it. The caller passes + /// it when that key is to stay. static func sessionKeyIdsToDisable( for grants: [AppConnectGrant], appContractId: Data, diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index f83976ce2d..664900989b 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -47,8 +47,7 @@ protocol DashConnectDataSource { /// connection it only changes the local status: that login derives the /// same key every time and Platform never re-adds a disabled key, so /// disabling it would lock the app out for good. Turning off a one-QR - /// connection that replaced a two-QR one does disable those keys too: - /// the app is left with no key on the identity. + /// connection that replaced a two-QR one does disable those keys too. func disconnect(id: String) async throws func remove(id: String) async } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index fb3a3fc0aa..1c26886965 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -201,6 +201,8 @@ struct ConnectionRequest: Equatable { let existingConnection: DAppConnection? /// The login approving this request would run. var login: AppConnect.Login = .unresolved + /// Why the login is unresolved, when the wallet knows. + var unresolvedLoginReason: String? = nil } extension ConnectionRequest { @@ -229,7 +231,8 @@ extension ConnectionRequest { walletUsername: String?, walletIdentityId: String?, existingConnection: DAppConnection?, - login: AppConnect.Login = .unresolved + login: AppConnect.Login = .unresolved, + unresolvedLoginReason: String? = nil ) { self.init( appLabel: appLabel.trimmingCharacters(in: .whitespacesAndNewlines), @@ -238,7 +241,8 @@ extension ConnectionRequest { walletUsername: walletUsername, walletIdentityId: walletIdentityId, existingConnection: existingConnection, - login: login + login: login, + unresolvedLoginReason: unresolvedLoginReason ) } } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index e6e64e7333..9fa938dd8f 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -450,14 +450,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let fallback = ConnectionRequest(loginRequest: loginRequest) let existingConnection = existingConnection(for: fallback.appContractId) - guard let context = try? await requireContext() else { + let context: Context + do { + context = try await requireContext() + } catch { return ConnectionRequest( loginRequest: loginRequest, appLabel: fallback.appLabel, appUrl: fallback.appUrl, walletUsername: nil, walletIdentityId: nil, - existingConnection: existingConnection + existingConnection: existingConnection, + unresolvedLoginReason: error.localizedDescription ) } @@ -465,12 +469,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // show what the app is given. With the version unknown the request // says so, and the sheet offers nothing to approve. The lookup runs // alongside the two below. - async let resolvedProtocolVersion = try? Self.networkProtocolVersion(sdk: context.sdk) + async let resolvedProtocolVersion = Result { try await Self.networkProtocolVersion(sdk: context.sdk) } let metadata = await resolveAppMetadata(for: loginRequest, sdk: context.sdk) let walletUsername = await resolveWalletUsername(context: context) - let protocolVersion = await resolvedProtocolVersion - if protocolVersion == nil { - Self.logger.error("🔗 DASHCONNECT :: protocol version unknown; the sign-in is shown as unresolved") + let protocolVersion: UInt32? + var unresolvedLoginReason: String? + switch await resolvedProtocolVersion { + case .success(let version): + protocolVersion = version + case .failure(let error): + Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") + protocolVersion = nil + unresolvedLoginReason = error.localizedDescription } return ConnectionRequest( @@ -480,7 +490,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { walletUsername: walletUsername, walletIdentityId: context.identityId.toBase58String(), existingConnection: existingConnection, - login: protocolVersion.map(AppConnect.login(protocolVersion:)) ?? .unresolved + login: protocolVersion.map(AppConnect.login(protocolVersion:)) ?? .unresolved, + unresolvedLoginReason: unresolvedLoginReason ) } @@ -859,7 +870,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } grants[index].documentId = documentId.toBase58String() grants[index].values = publishedValues - grants[index].responseDeleted = nil } return connection } @@ -1315,11 +1325,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if liveElsewhere { return } } if isOneQR { - // Nothing is left of a one-QR connection once its keys are - // disabled, those of an earlier two-QR login included: the same - // QR can no longer be approved and there is no second step to - // wait for, so the row goes instead of sitting in the two-QR - // "approved" state. + // The session keys are disabled, and so are the keys of an + // earlier two-QR login that were found: the same QR can no + // longer be approved and there is no second step to wait for, + // so the row goes instead of sitting in the two-QR "approved" + // state. persistAndSend(subject.value.filter { $0.id != id }) return } @@ -1356,8 +1366,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// which the record held. /// /// For a row made by the one-QR login the keys of an earlier two-QR - /// login to the app are disabled as well, so that turning the app off - /// leaves it no key on this identity. That login derives the same keys + /// login to the app are disabled as well. That login derives the same keys /// every time and Platform never re-adds a key, so the app cannot sign /// in with two QRs again. A two-QR row keeps them. /// @@ -1392,9 +1401,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let holdsUnrecordedKey = try checksUnrecordedKeys && Self .storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) .contains { $0.singleContractId == appContract && !$0.isDisabled && $0.isSessionKeyShaped } - if !holdsUnrecordedKey { + // A one-QR row goes on to the PIN prompt either way: the keys of + // an earlier two-QR login can only be looked for after it. + if !holdsUnrecordedKey, !checksUnrecordedKeys { if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } - if !checksUnrecordedKeys { return false } + return false } } @@ -1433,15 +1444,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } // The keys the two-QR login derives for this app, known before // anything is disabled: its authentication key has the kind and the - // bound of a session key, and which of the two it is decides what - // happens to it. If they cannot be derived, nothing is turned off. + // bound of a session key. A one-QR row disables both of them; a + // two-QR row keeps them, so there the authentication key is named + // as one to leave. If they cannot be derived, nothing is turned off. let twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) var keyIds = AppConnect.sessionKeyIdsToDisable( for: granted, appContractId: appContract, bindings: bindings, currentIdentityPublicKeys: currentPublicKeys, - twoQRAuthenticationKeyHash160: twoQRKeys.authenticationPublicKeyHash160 + twoQRAuthenticationKeyHash160: checksUnrecordedKeys ? nil : twoQRKeys.authenticationPublicKeyHash160 ) if checksUnrecordedKeys { keyIds = Array(Set(keyIds).union(Self.liveLoginKeyIds( diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index b377d1d07d..757125a5b2 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -38,6 +38,9 @@ struct ApproveConnectionSheet: View { /// would otherwise see nothing at all. var errorText: String? var onApprove: () -> Void + /// Asks again which login this would be. The sheet offers it in place of + /// Approve while that is unresolved. + var onRetry: () -> Void = {} var onDeny: () -> Void var body: some View { @@ -79,6 +82,11 @@ struct ApproveConnectionSheet: View { comment: "DashConnect")) .font(.subhead) .foregroundColor(.primaryText) + if let reason = request.unresolvedLoginReason { + Text(reason) + .font(.footnote) + .foregroundColor(.secondaryText) + } } else if let terms = request.login.sessionKeyTerms { sessionKeyPermissions(terms) } else if isRelogin { @@ -127,8 +135,7 @@ struct ApproveConnectionSheet: View { } DashButton( - // With the login unresolved there is nothing to approve: - // the same action asks the network again instead. + // With the login unresolved there is nothing to approve. text: request.login == .unresolved ? NSLocalizedString("Try again", comment: "") : NSLocalizedString("Approve", comment: "DashConnect"), @@ -137,7 +144,7 @@ struct ApproveConnectionSheet: View { stretch: true, isEnabled: !isLoading, isLoading: isLoading, - action: onApprove + action: request.login == .unresolved ? onRetry : onApprove ) DashButton( diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index c15152bf96..cba07666f1 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -111,6 +111,7 @@ struct ConnectionsScreen: View { isLoading: viewModel.isApproving, errorText: viewModel.approveError, onApprove: { viewModel.approvePendingRequest() }, + onRetry: { viewModel.retryPendingRequest() }, onDeny: { viewModel.denyPendingRequest() } ) // The one-QR terms make the sheet longer than the fixed height diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index d4782c1468..1887b16a5b 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -200,7 +200,10 @@ final class ConnectionsViewModel: ObservableObject { // `isResolvingRequest` guards the window where a newer request has been // accepted but has not published yet: approving during it would // authorize the request on screen moments before it is replaced. - guard let consent = pendingRequest, let pendingLoginRequest, !isApproving, !isResolvingRequest else { return } + // An unresolved login has nothing to approve; the sheet offers + // `retryPendingRequest` for it instead. + guard let consent = pendingRequest, consent.login != .unresolved, + let pendingLoginRequest, !isApproving, !isResolvingRequest else { return } isApproving = true approveError = nil @@ -208,13 +211,6 @@ final class ConnectionsViewModel: ObservableObject { Task { defer { isApproving = false } - // The wallet could not tell which login this would be, so the - // sheet offered no approval, only another try at finding out. - guard consent.login != .unresolved else { - self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) - return - } - do { _ = try await dataSource.approveLogin(pendingLoginRequest, consent: consent) self.pendingRequest = nil @@ -237,6 +233,20 @@ final class ConnectionsViewModel: ObservableObject { } } + /// Builds the pending request again, for a sheet that could not tell + /// which login it would run. Approves nothing. + func retryPendingRequest() { + guard pendingRequest != nil, let pendingLoginRequest, !isApproving, !isResolvingRequest else { return } + + isApproving = true + approveError = nil + + Task { + defer { isApproving = false } + self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) + } + } + func denyPendingRequest() { guard !isApproving else { return } pendingRequest = nil diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 8bfb4b9133..1e93efa220 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1368,6 +1368,8 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { await waitUntil { viewModel.pendingRequest != nil } XCTAssertEqual(viewModel.pendingRequest?.login, .unresolved) viewModel.approvePendingRequest() + XCTAssertFalse(viewModel.isApproving, "an unresolved login cannot be approved") + viewModel.retryPendingRequest() await waitUntil { !viewModel.isApproving } XCTAssertEqual(viewModel.pendingRequest, resolved) From aa8488d944e1066407c884bbde7e5bccb559f889 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 16:33:49 +0300 Subject: [PATCH 014/108] fix(dashpay): a one-QR disconnect looks for the app's keys on the wallet's other identities - Before a one-QR row is removed, the wallet's store is read for keys of the app on its other identities that no grant record names: a session key bound to the app's contract, or a key the two-QR login derives for it. The row stays while one is found, and stays with an error when that could not be checked. - The id for a new session key no longer overflows after the last key id; the sign-in is refused instead. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 32 +++- .../PlatformDashConnectDataSource.swift | 141 ++++++++++++++++-- DashWallet/ar.lproj/Localizable.strings | 2 + DashWallet/bg.lproj/Localizable.strings | 2 + DashWallet/ca.lproj/Localizable.strings | 2 + DashWallet/cs.lproj/Localizable.strings | 2 + DashWallet/da.lproj/Localizable.strings | 2 + DashWallet/de.lproj/Localizable.strings | 2 + DashWallet/el.lproj/Localizable.strings | 2 + DashWallet/en.lproj/Localizable.strings | 2 + DashWallet/eo.lproj/Localizable.strings | 2 + DashWallet/es.lproj/Localizable.strings | 2 + DashWallet/et.lproj/Localizable.strings | 2 + DashWallet/fa.lproj/Localizable.strings | 2 + DashWallet/fi.lproj/Localizable.strings | 2 + DashWallet/fil.lproj/Localizable.strings | 2 + DashWallet/fr.lproj/Localizable.strings | 2 + DashWallet/hr.lproj/Localizable.strings | 2 + DashWallet/hu.lproj/Localizable.strings | 2 + DashWallet/id.lproj/Localizable.strings | 2 + DashWallet/it.lproj/Localizable.strings | 2 + DashWallet/ja.lproj/Localizable.strings | 2 + DashWallet/ko.lproj/Localizable.strings | 2 + DashWallet/mk.lproj/Localizable.strings | 2 + DashWallet/ms.lproj/Localizable.strings | 2 + DashWallet/nb.lproj/Localizable.strings | 2 + DashWallet/nl.lproj/Localizable.strings | 2 + DashWallet/pl.lproj/Localizable.strings | 2 + DashWallet/pt.lproj/Localizable.strings | 2 + DashWallet/ro.lproj/Localizable.strings | 2 + DashWallet/ru.lproj/Localizable.strings | 2 + DashWallet/sk.lproj/Localizable.strings | 2 + DashWallet/sl.lproj/Localizable.strings | 2 + DashWallet/sl_SI.lproj/Localizable.strings | 2 + DashWallet/sq.lproj/Localizable.strings | 2 + DashWallet/sr.lproj/Localizable.strings | 2 + DashWallet/sv.lproj/Localizable.strings | 2 + DashWallet/th.lproj/Localizable.strings | 2 + DashWallet/tr.lproj/Localizable.strings | 2 + DashWallet/uk.lproj/Localizable.strings | 2 + DashWallet/vi.lproj/Localizable.strings | 2 + DashWallet/zh-Hans.lproj/Localizable.strings | 2 + .../zh-Hant-TW.lproj/Localizable.strings | 2 + DashWallet/zh.lproj/Localizable.strings | 2 + DashWallet/zh_TW.lproj/Localizable.strings | 2 + .../PlatformDashConnectDataSourceTests.swift | 50 +++++++ 46 files changed, 295 insertions(+), 14 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index e98805d40e..2659c8e41f 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -139,10 +139,13 @@ enum AppConnect { return .usable(keyId: keyId) } + /// The id for a new key: one above the highest on the identity, disabled + /// keys included. `nil` when that id is the last one a key can have. static func nextKeyId( currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] - ) -> UInt32 { - (currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }.max() ?? 0) + 1 + ) -> UInt32? { + let highest = currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }.max() ?? 0 + return highest == .max ? nil : highest + 1 } /// The key an app is given: it can only sign for the contract the request @@ -182,6 +185,31 @@ enum AppConnect { /// The store has a bound for the key that this build cannot read, so /// the key's app is unknown rather than "another one". var hasUnreadableBound = false + /// The stored key has the type, purpose and level of the two-QR + /// login's authentication key, or of its encryption key. + var isTwoQRAuthenticationKeyShaped = false + var isTwoQREncryptionKeyShaped = false + } + + /// Whether the store shows either key of the two-QR login, not disabled, + /// in the kind that login registers it. A two-QR login leaves no grant + /// record, so on an identity that is not the active one this is how its + /// keys are recognised. + static func holdsLiveTwoQRLoginKey( + authenticationPublicKeyHash160: Data, + encryptionPublicKey: Data, + bindings: [KeyBinding] + ) -> Bool { + bindings.contains { + !$0.isDisabled + && (($0.isTwoQRAuthenticationKeyShaped && $0.data == authenticationPublicKeyHash160) + || ($0.isTwoQREncryptionKeyShaped && $0.data == encryptionPublicKey)) + } + } + + /// Whether the store shows a live session key bound to `appContractId`. + static func holdsLiveSessionKey(appContractId: Data, bindings: [KeyBinding]) -> Bool { + bindings.contains { $0.singleContractId == appContractId && !$0.isDisabled && $0.isSessionKeyShaped } } /// The most keys one identity update may disable (Platform consensus). diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 9fa938dd8f..c78737f5d3 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -77,6 +77,8 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case grantStoreUnavailable case approvalOutOfDate case grantNotRecorded + case noFreeKeyId + case otherIdentitiesNotChecked case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -140,6 +142,12 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key.", comment: "DashConnect") + case .otherIdentitiesNotChecked: + return NSLocalizedString( + "The app's keys on this identity are off, but this wallet could not check its other identities. Try again.", + comment: "DashConnect") + case .noFreeKeyId: + return NSLocalizedString("This identity cannot take another key.", comment: "DashConnect") case .approvalOutOfDate: return NSLocalizedString( "The details of this sign-in changed while it was on screen. Check them and approve again.", @@ -743,7 +751,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { totalBudget = registered?.totalBudget expiresAt = registered?.expiresAt.map { UInt64(max(0, $0)) } case .absent: - let keyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) + guard let keyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) else { + throw DashConnectPlatformError.noFreeKeyId + } let budget = terms.budgetCredits let expiry = terms.expiresAt(from: now()) let key = AppConnect.sessionIdentityPubkey( @@ -1373,9 +1383,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// Returns whether a grant record shows the app with a live key on /// another identity of this wallet. When this identity gave it none, that /// is thrown instead: nothing was turned off. - /// TODO(app-connect-other-identity-keys): a key on another identity that - /// has no grant record is not seen, so the row can go while that key is - /// live. Only the active identity's keys are looked up. + /// For a row made by the one-QR login that also covers keys on another + /// identity that no grant record names, as far as the wallet's store + /// shows them. /// /// `checksUnrecordedKeys` is set for a row made by the one-QR login: with /// no record for this identity the keys are still looked for on it. When @@ -1462,7 +1472,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { currentIdentityPublicKeys: currentPublicKeys ))).sorted() } - if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() { + // For a one-QR row, the keys on another identity that no grant + // record shows. `nil` when that could not be told. + let heldOnAnotherIdentity: Bool? = checksUnrecordedKeys + ? await anotherIdentityHoldsAppKeys(appContractId: appContract, context: context) + : false + if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { throw DashConnectPlatformError.grantOnAnotherIdentity } if !keyIds.isEmpty { @@ -1491,17 +1506,99 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - return hasLiveGrantElsewhere() + if hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { return true } + // This identity's keys are off. Whether another one holds a key of + // the app could not be read from the store, so the row stays, with + // an error rather than without one. + guard heldOnAnotherIdentity != nil else { throw DashConnectPlatformError.otherIdentitiesNotChecked } + return false + } + + /// Whether the wallet's store shows another identity of this wallet with + /// a live key of the app that no grant record names: a session key bound + /// to the app's contract, or a key the two-QR login derives for it. + /// `nil` when the store could not be read or the keys not derived. + /// + /// The store is as fresh as each identity's last load, and an identity + /// it does not hold is not seen. + private func anotherIdentityHoldsAppKeys(appContractId: Data, context: Context) async -> Bool? { + do { + let others = try Self.storedWalletIdentities( + walletId: context.wallet.walletId, + network: context.network, + modelContainer: context.modelContainer + ).filter { $0.identityId != context.identityId } + for other in others { + let bindings = try Self.storedKeyBindings( + identityId: other.identityId.toBase58String(), modelContainer: context.modelContainer) + if AppConnect.holdsLiveSessionKey(appContractId: appContractId, bindings: bindings) { return true } + // Derive only for an identity that has a live key of either + // two-QR kind at all. + guard bindings.contains(where: { + !$0.isDisabled && ($0.isTwoQRAuthenticationKeyShaped || $0.isTwoQREncryptionKeyShaped) + }) else { continue } + let twoQRKeys = try await twoQRLoginPublicKeys( + appContractId: appContractId, + identityId: other.identityId, + identityIndex: other.identityIndex, + context: context) + if AppConnect.holdsLiveTwoQRLoginKey( + authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, + encryptionPublicKey: twoQRKeys.encryptionPublicKey, + bindings: bindings + ) { + return true + } + } + return false + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: keys on other identities not checked — \(error.localizedDescription, privacy: .public)") + return nil + } + } + + /// The identities the SDK's store attaches to this wallet on `network`. + private static func storedWalletIdentities( + walletId: Data, + network: Network, + modelContainer: ModelContainer + ) throws -> [(identityId: Data, identityIndex: UInt32)] { + let descriptor = FetchDescriptor(predicate: PersistentIdentity.predicate(network: network)) + let modelContext = ModelContext(modelContainer) + // The rows are only readable while their context is alive. + return try withExtendedLifetime(modelContext) { + try modelContext.fetch(descriptor) + .filter { $0.wallet?.walletId == walletId } + .map { ($0.identityId, $0.identityIndex) } + } } - /// The public halves of the keys the two-QR login derives for this - /// identity and app. + /// The public halves of the keys the two-QR login derives for the active + /// identity and an app. private func twoQRLoginPublicKeys( appContractId: Data, context: Context + ) async throws -> (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data) { + try await twoQRLoginPublicKeys( + appContractId: appContractId, + identityId: context.identityId, + identityIndex: context.identityIndex, + context: context) + } + + /// The same for any identity of the active wallet, by its index. + private func twoQRLoginPublicKeys( + appContractId: Data, + identityId: Data, + identityIndex: UInt32, + context: Context ) async throws -> (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data) { var derivedMaterial = try await deriveKeyRegistrationMaterial( - appContractId: appContractId, context: context) + appContractId: appContractId, + identityId: identityId, + identityIndex: identityIndex, + context: context) defer { Self.zero(&derivedMaterial.loginKey) Self.zero(&derivedMaterial.authenticationPrivateKey) @@ -1574,11 +1671,25 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private func deriveKeyRegistrationMaterial( appContractId: Data, context: Context + ) async throws -> DashConnectKeyRegistrationDerivedMaterial { + try await deriveKeyRegistrationMaterial( + appContractId: appContractId, + identityId: context.identityId, + identityIndex: context.identityIndex, + context: context) + } + + /// The same for any identity of the active wallet, by its index. + private func deriveKeyRegistrationMaterial( + appContractId: Data, + identityId: Data, + identityIndex: UInt32, + context: Context ) async throws -> DashConnectKeyRegistrationDerivedMaterial { // `deriveIdentityAuthKeyAtSlot` is main-actor isolated in the SDK. var chainKey = try await MainActor.run { try context.wallet.deriveIdentityAuthKeyAtSlot( - identityIndex: context.identityIndex, + identityIndex: identityIndex, keyId: UInt32(LoginKeyDerivation.defaultKeyIndex), network: context.network ).privateKeyData @@ -1586,7 +1697,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { defer { Self.zero(&chainKey) } return try Self.deriveKeyRegistrationMaterial( chainKeyPrivateBytes: chainKey, - identityId: context.identityId, + identityId: identityId, appContractId: appContractId ) } @@ -1947,7 +2058,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { hasUnreadableBound: !AppConnect.isReadableBound( boundsKind: $0.effectiveContractBoundsKind, boundIds: $0.contractBounds - ) + ), + isTwoQRAuthenticationKeyShaped: $0.keyTypeEnum == .ecdsaHash160 + && $0.purposeEnum == .authentication + && $0.securityLevelEnum == .high, + isTwoQREncryptionKeyShaped: $0.keyTypeEnum == .ecdsaSecp256k1 + && $0.purposeEnum == .encryption + && $0.securityLevelEnum == .medium ) } } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 5b5520fff8..4ffd8683e4 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index ef0b671de4..a5649d7a5e 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 9278c79401..38b8295a1e 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index ba2ab9b3a4..48e5449609 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index b70f0d1c9d..ad37330aea 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 1bf9aa1c26..19aed04c65 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 9827fd6716..4bb3cf98c5 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index b33f64b90b..099b5eccea 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6109,10 +6109,12 @@ "Couldn't open your wallet data" = "Couldn't open your wallet data"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app." = "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 20b4770296..6b899e96d3 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index efa1f15b75..bb6a482738 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index aded8233f8..c2b852ab98 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 9abbeb402a..21837cfd17 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index a1fda04138..4e32bd4451 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 994206e025..0ce459b834 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 83aa4d6c70..cbc16fef66 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index ab6bb171f6..612a1716d4 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index c7eb3efe62..4c1635791c 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 2781bfcbce..2d39f1c572 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index bfcc832d72..1d97b6f1ac 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 1e58fec0f0..d06740fc89 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 9284ecfb23..25fb69f94b 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 6181349ac0..76b985cd4c 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 65a4e2e7af..9ee12ee052 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 07d9424ddb..c7a786a32f 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 8f9511639d..b9a559798f 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index f50bf8eb8e..45b74a8c30 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 946957e6d9..21db751d2e 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 694c36affb..10ecb31aaa 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 6e4bb365a2..61851e35f6 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index b37ae4f192..c160e4f082 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index a08d0e6aee..550121a446 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 38b2ec3541..70459eea3b 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 299dc0aca6..d2bf1a6649 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 8b54567700..b852cb9595 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 2ad8db7854..37cbf74032 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 2d9d6cad0d..2267ccda5f 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 0e67336cd6..34ba75e5b0 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index a098598676..3251357a09 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 2dc524cb5c..9750cfd874 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index e28073ed12..efca41259b 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 18bf7abed9..800a902073 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index cad7e068bf..480bbb48b5 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index bb44239f6c..9eb440b1a5 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 1e93efa220..7000e2f6c3 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1792,6 +1792,17 @@ final class AppConnectLoginTests: XCTestCase { 8) } + func testThereIsNoNextKeyIdAfterTheLastOne() { + // A key id is a UInt32 the SDK carries as an Int32 bit pattern. + let last = Self.key(keyId: -1, data: Data([1])) + XCTAssertNil(AppConnect.nextKeyId(currentIdentityPublicKeys: [last])) + let disabledLast = Self.key(keyId: -1, data: Data([1]), disabledAt: 1) + XCTAssertNil(AppConnect.nextKeyId(currentIdentityPublicKeys: [Self.key(keyId: 3, data: Data([3])), disabledLast])) + XCTAssertEqual( + AppConnect.nextKeyId(currentIdentityPublicKeys: [Self.key(keyId: -2, data: Data([2]))]), + .max) + } + func testDisconnectDisablesOnlyTheLiveSessionKeysItGranted() { let grants = [9, 11, 12, 13].map { Self.grant(sessionKeyId: $0) } let keys = [ @@ -1872,6 +1883,45 @@ final class AppConnectLoginTests: XCTestCase { [6, 9]) } + /// Keys of the app on an identity that is not the active one are + /// recognised from the wallet's store: no grant record names them. + func testTheStoreShowsAnAppKeyHeldOnAnotherIdentityWhileItIsLive() { + let app = Data(repeating: 0xA1, count: 32) + let authentication = Data(repeating: 0x51, count: 20) + let encryption = Data(repeating: 0x52, count: 33) + func holdsTwoQR(_ bindings: [AppConnect.KeyBinding]) -> Bool { + AppConnect.holdsLiveTwoQRLoginKey( + authenticationPublicKeyHash160: authentication, encryptionPublicKey: encryption, bindings: bindings) + } + func authenticationKey(data: Data = authentication, isDisabled: Bool = false) -> AppConnect.KeyBinding { + AppConnect.KeyBinding( + keyId: 3, data: data, singleContractId: app, isDisabled: isDisabled, + isTwoQRAuthenticationKeyShaped: true) + } + let encryptionKey = AppConnect.KeyBinding( + keyId: 4, data: encryption, singleContractId: nil, isTwoQREncryptionKeyShaped: true) + + XCTAssertTrue(holdsTwoQR([authenticationKey()])) + XCTAssertTrue(holdsTwoQR([authenticationKey(isDisabled: true), encryptionKey])) + XCTAssertFalse(holdsTwoQR([authenticationKey(isDisabled: true)])) + // Another app's key: same kind, another payload. + XCTAssertFalse(holdsTwoQR([authenticationKey(data: Data(repeating: 0x53, count: 20))])) + // The same bytes under another kind are not that key. + XCTAssertFalse(holdsTwoQR([AppConnect.KeyBinding(keyId: 5, data: authentication, singleContractId: app)])) + XCTAssertFalse(holdsTwoQR([])) + + let sessionKey = AppConnect.KeyBinding( + keyId: 6, data: Data([6]), singleContractId: app, isSessionKeyShaped: true) + var disabledSessionKey = sessionKey + disabledSessionKey.isDisabled = true + XCTAssertTrue(AppConnect.holdsLiveSessionKey(appContractId: app, bindings: [sessionKey])) + XCTAssertFalse(AppConnect.holdsLiveSessionKey(appContractId: app, bindings: [disabledSessionKey])) + XCTAssertFalse( + AppConnect.holdsLiveSessionKey(appContractId: Data(repeating: 0xB2, count: 32), bindings: [sessionKey])) + // The two-QR authentication key is bound to the app but carries no limits. + XCTAssertFalse(AppConnect.holdsLiveSessionKey(appContractId: app, bindings: [authenticationKey()])) + } + func testOnlyAWholeSingleContractBoundNamesTheApp() { let app = Data(repeating: 0xA1, count: 32) XCTAssertEqual(AppConnect.singleContractId(boundsKind: 1, boundIds: [app]), app) From 957ea9486aeeaaed5e3d4edce8b4d5e29e086a41 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 16:40:55 +0300 Subject: [PATCH 015/108] fix(dashpay): say when an app's key on another identity keeps the connection, and keep unknown apart from none A disconnect that leaves the row because another identity of the wallet holds a key of the app now reports that instead of returning silently. The store check goes through every other identity: one that cannot be told no longer hides a key found on another, and an identity whose keys are not in the store counts as unknown rather than as holding none. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/DashConnectDataSource.swift | 2 +- .../PlatformDashConnectDataSource.swift | 48 +++++++++++++------ 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index 664900989b..09b190c364 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -42,7 +42,7 @@ protocol DashConnectDataSource { /// Turns a connection off. For a one-QR connection this disables the key /// the app was given on the identity and deletes the published response, /// and throws when the key could not be disabled — the connection then - /// stays as it was. The connection also stays, without an error, while + /// stays as it was. The connection also stays, and that is thrown, while /// the app holds a key on another identity of the wallet. For a two-QR /// connection it only changes the local status: that login derives the /// same key every time and Platform never re-adds a disabled key, so diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index c78737f5d3..68ab5acb69 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1331,8 +1331,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // The row stands for the app, and the app still holds a key on // another identity of this wallet. That key can only be disabled // while its identity is the active one, so the row stays to get - // there; this identity's keys are off. - if liveElsewhere { return } + // there, and the user is told; this identity's keys are off. + if liveElsewhere { throw DashConnectPlatformError.grantOnAnotherIdentity } } if isOneQR { // The session keys are disabled, and so are the keys of an @@ -1474,7 +1474,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } // For a one-QR row, the keys on another identity that no grant // record shows. `nil` when that could not be told. - let heldOnAnotherIdentity: Bool? = checksUnrecordedKeys + let heldOnAnotherIdentity: Bool? = checksUnrecordedKeys && !hasLiveGrantElsewhere() ? await anotherIdentityHoldsAppKeys(appContractId: appContract, context: context) : false if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { @@ -1517,21 +1517,41 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// Whether the wallet's store shows another identity of this wallet with /// a live key of the app that no grant record names: a session key bound /// to the app's contract, or a key the two-QR login derives for it. - /// `nil` when the store could not be read or the keys not derived. - /// - /// The store is as fresh as each identity's last load, and an identity - /// it does not hold is not seen. + /// `nil` when no identity shows one and at least one could not be told: + /// its keys are not in the store, a live session-shaped key there has a + /// bound this build cannot read, or its two-QR keys could not be derived. + /// TODO(app-connect-other-identity-keys): the store is as fresh as each + /// identity's last load from Platform, and an identity it does not hold + /// is not seen, so the row can go while such a key is live. private func anotherIdentityHoldsAppKeys(appContractId: Data, context: Context) async -> Bool? { + let others: [(identityId: Data, identityIndex: UInt32)] do { - let others = try Self.storedWalletIdentities( + others = try Self.storedWalletIdentities( walletId: context.wallet.walletId, network: context.network, modelContainer: context.modelContainer ).filter { $0.identityId != context.identityId } - for other in others { + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: other identities not read — \(error.localizedDescription, privacy: .public)") + return nil + } + // One identity that cannot be told does not hide a key found on + // another. + var hasUnknown = false + for other in others { + do { let bindings = try Self.storedKeyBindings( identityId: other.identityId.toBase58String(), modelContainer: context.modelContainer) if AppConnect.holdsLiveSessionKey(appContractId: appContractId, bindings: bindings) { return true } + // An identity always has keys, so none stored means not + // loaded; and a session-shaped key with an unreadable bound + // may be the app's. + if bindings.isEmpty || bindings.contains(where: { + !$0.isDisabled && $0.isSessionKeyShaped && $0.hasUnreadableBound + }) { + hasUnknown = true + } // Derive only for an identity that has a live key of either // two-QR kind at all. guard bindings.contains(where: { @@ -1549,13 +1569,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) { return true } + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: keys of another identity not checked — \(error.localizedDescription, privacy: .public)") + hasUnknown = true } - return false - } catch { - Self.logger.error( - "🔗 DASHCONNECT :: keys on other identities not checked — \(error.localizedDescription, privacy: .public)") - return nil } + return hasUnknown ? nil : false } /// The identities the SDK's store attaches to this wallet on `network`. From c5fdbd314b70a9cf519f030e918c2db471c9aede Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 18:47:53 +0300 Subject: [PATCH 016/108] fix(dashpay): keep DashConnect rows and grant records with the wallet an operation ran for The connection and grant stores follow the active wallet, and an approval or a disconnect waits on the network and on a PIN prompt. Each operation now works through one pair of stores fixed to the wallet of its context, so a wallet switch while it is suspended cannot move its records to the wallet that became active. - requireContext refuses while the SDK wallet is not the active one. - The published list is tracked by wallet and network scope on the main actor, reloaded when the active wallet changes, and a disconnect or a remove picked from another wallet's list is refused. - A dash-st: key registration resolves the context again after the PIN. - The protocol version lookup in the request preview no longer passes an async closure to Result's synchronous initializer. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 49 ++- .../Models/DashConnect/DashConnectStore.swift | 23 ++ .../PlatformDashConnectDataSource.swift | 331 +++++++++++++----- DashWallet/ar.lproj/Localizable.strings | 1 + DashWallet/bg.lproj/Localizable.strings | 1 + DashWallet/ca.lproj/Localizable.strings | 1 + DashWallet/cs.lproj/Localizable.strings | 1 + DashWallet/da.lproj/Localizable.strings | 1 + DashWallet/de.lproj/Localizable.strings | 1 + DashWallet/el.lproj/Localizable.strings | 1 + DashWallet/en.lproj/Localizable.strings | 1 + DashWallet/eo.lproj/Localizable.strings | 1 + DashWallet/es.lproj/Localizable.strings | 1 + DashWallet/et.lproj/Localizable.strings | 1 + DashWallet/fa.lproj/Localizable.strings | 1 + DashWallet/fi.lproj/Localizable.strings | 1 + DashWallet/fil.lproj/Localizable.strings | 1 + DashWallet/fr.lproj/Localizable.strings | 1 + DashWallet/hr.lproj/Localizable.strings | 1 + DashWallet/hu.lproj/Localizable.strings | 1 + DashWallet/id.lproj/Localizable.strings | 1 + DashWallet/it.lproj/Localizable.strings | 1 + DashWallet/ja.lproj/Localizable.strings | 1 + DashWallet/ko.lproj/Localizable.strings | 1 + DashWallet/mk.lproj/Localizable.strings | 1 + DashWallet/ms.lproj/Localizable.strings | 1 + DashWallet/nb.lproj/Localizable.strings | 1 + DashWallet/nl.lproj/Localizable.strings | 1 + DashWallet/pl.lproj/Localizable.strings | 1 + DashWallet/pt.lproj/Localizable.strings | 1 + DashWallet/ro.lproj/Localizable.strings | 1 + DashWallet/ru.lproj/Localizable.strings | 1 + DashWallet/sk.lproj/Localizable.strings | 1 + DashWallet/sl.lproj/Localizable.strings | 1 + DashWallet/sl_SI.lproj/Localizable.strings | 1 + DashWallet/sq.lproj/Localizable.strings | 1 + DashWallet/sr.lproj/Localizable.strings | 1 + DashWallet/sv.lproj/Localizable.strings | 1 + DashWallet/th.lproj/Localizable.strings | 1 + DashWallet/tr.lproj/Localizable.strings | 1 + DashWallet/uk.lproj/Localizable.strings | 1 + DashWallet/vi.lproj/Localizable.strings | 1 + DashWallet/zh-Hans.lproj/Localizable.strings | 1 + .../zh-Hant-TW.lproj/Localizable.strings | 1 + DashWallet/zh.lproj/Localizable.strings | 1 + DashWallet/zh_TW.lproj/Localizable.strings | 1 + .../DashConnect/DashConnectStoreTests.swift | 35 ++ .../PlatformDashConnectDataSourceTests.swift | 197 ++++++++++- 48 files changed, 571 insertions(+), 107 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 2659c8e41f..dbfac6e2d8 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -534,6 +534,9 @@ protocol AppConnectResponseStore { var canPersist: Bool { get } func load() -> [AppConnectGrant] func save(_ grants: [AppConnectGrant]) + /// This store fixed to one wallet, and to the network scope it has now, + /// like `DashConnectStore.pinned(toWalletIdHex:)`. + func pinned(toWalletIdHex walletIdHex: String) -> any AppConnectResponseStore } extension AppConnectResponseStore { @@ -545,7 +548,7 @@ extension AppConnectResponseStore { /// chain and the key ids are visible on the identity. final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { private let defaults: UserDefaults - private let scopeKeyProvider: () -> String? + private let scope: Scope private let encoder: JSONEncoder private let decoder: JSONDecoder @@ -553,18 +556,28 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { subsystem: "org.dashfoundation.dash", category: "dashconnect.app-connect-store") - init( + /// Where the scope comes from. + enum Scope { + /// Borrowed from a connection store, so both keep one wallet's data. + case connections(UserDefaultsDashConnectStore) + /// Handed in as it is; it names no wallet. + case key(() -> String?) + } + + convenience init( defaults: UserDefaults = .standard, network: DashConnectNetwork, scopeKeyProvider: (() -> String?)? = nil ) { + self.init( + defaults: defaults, + scope: scopeKeyProvider.map(Scope.key) + ?? .connections(UserDefaultsDashConnectStore(defaults: defaults, network: network))) + } + + init(defaults: UserDefaults, scope: Scope) { self.defaults = defaults - if let scopeKeyProvider { - self.scopeKeyProvider = scopeKeyProvider - } else { - let connections = UserDefaultsDashConnectStore(defaults: defaults, network: network) - self.scopeKeyProvider = { connections.storageKey } - } + self.scope = scope let encoder = JSONEncoder() encoder.dateEncodingStrategy = .millisecondsSince1970 @@ -576,7 +589,25 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { } private var storageKey: String? { - scopeKeyProvider().map { "\($0).app-connect-responses.v1" } + let scopeKey: String? + switch scope { + case .connections(let connections): scopeKey = connections.storageKey + case .key(let provider): scopeKey = provider() + } + return scopeKey.map { "\($0).app-connect-responses.v1" } + } + + func pinned(toWalletIdHex walletIdHex: String) -> any AppConnectResponseStore { + switch scope { + case .connections(let connections): + return UserDefaultsAppConnectResponseStore( + defaults: defaults, scope: .connections(connections.pinnedStore(toWalletIdHex: walletIdHex))) + case .key(let provider): + // A handed-in scope names no wallet to replace: it is fixed to + // the value it has now. + let scopeKey = provider() + return UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .key { scopeKey }) + } } /// False as well while the stored value is not a list of rows: `save` diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift index 507ed2d726..0bd2b0cc1a 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift @@ -23,6 +23,13 @@ import os protocol DashConnectStore { func load() -> [DAppConnection] func save(_ connections: [DAppConnection]) + /// Names the wallet and network whose rows this store reads and writes + /// right now; `nil` when it has no scope. + var scopeKey: String? { get } + /// This store fixed to one wallet, and to the network scope it has now. + /// An operation that outlasts a wallet switch reads and writes through + /// it, so its rows stay with the wallet it ran for. + func pinned(toWalletIdHex walletIdHex: String) -> any DashConnectStore } final class UserDefaultsDashConnectStore: DashConnectStore { @@ -76,6 +83,22 @@ final class UserDefaultsDashConnectStore: DashConnectStore { return "dashconnect.connections.v1.\(networkScope).\(walletScope)" } + var scopeKey: String? { storageKey } + + func pinned(toWalletIdHex walletIdHex: String) -> any DashConnectStore { + pinnedStore(toWalletIdHex: walletIdHex) + } + + func pinnedStore(toWalletIdHex walletIdHex: String) -> UserDefaultsDashConnectStore { + let devnetName = devnetNameProvider() + return UserDefaultsDashConnectStore( + defaults: defaults, + network: network, + walletIdHexProvider: { walletIdHex }, + devnetNameProvider: { devnetName } + ) + } + private var networkScope: String? { guard network == .devnet else { return network.rawValue } guard let name = devnetNameProvider()? diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 68ab5acb69..de627b580a 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -79,6 +79,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case grantNotRecorded case noFreeKeyId case otherIdentitiesNotChecked + case walletChanged case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -146,6 +147,8 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "The app's keys on this identity are off, but this wallet could not check its other identities. Try again.", comment: "DashConnect") + case .walletChanged: + return NSLocalizedString("The active wallet or identity changed. Try again.", comment: "DashConnect") case .noFreeKeyId: return NSLocalizedString("This identity cannot take another key.", comment: "DashConnect") case .approvalOutOfDate: @@ -375,6 +378,35 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let identityId: Data let identityIndex: UInt32 let storedUsername: String? + /// One pair for the whole operation: a context resolved again after + /// a PIN prompt takes over the pair of the one it replaces. + var stores: Stores + } + + /// The connection rows and grant records of one wallet. A context carries + /// the pair fixed to its own wallet: the stores follow the active wallet, + /// and an operation that waits on the network or a PIN prompt must still + /// write to the wallet whose identity it changed. + private struct Stores { + let walletIdHex: String + let connections: any DashConnectStore + let grants: any AppConnectResponseStore + + /// Names what the rows belong to: the wallet, and the network scope + /// the connection store was fixed to, which tells two devnets of one + /// wallet apart. + var scope: String { "\(walletIdHex) \(connections.scopeKey ?? "")" } + } + + /// The scope of the rows `subject` holds. Read and written on the main + /// actor together with every send, so the two cannot come apart. + @MainActor + private final class ShownRows { + var scope: String? + + nonisolated init(scope: String?) { + self.scope = scope + } } private static let logger = Logger( @@ -396,6 +428,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private let store: any DashConnectStore private let responseStore: any AppConnectResponseStore private let subject: CurrentValueSubject<[DAppConnection], Never> + private let shownRows: ShownRows + private let activeWalletIdHex: () -> String? + private var walletChangeObserver: AnyCancellable? private let authorizer: DWIdentityAuthorizer private let stateTransitionParser: any DashConnectStateTransitionParsing private let now: () -> Date @@ -416,8 +451,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { supportedNetwork: DashConnectNetwork = PlatformDashConnectDataSource.currentEnvironmentNetwork(), store: (any DashConnectStore)? = nil, responseStore: (any AppConnectResponseStore)? = nil, + activeWalletIdHex: @escaping () -> String? = { WalletEnvironment.activeWalletIdHex as String? }, authorizer: DWIdentityAuthorizer = DWIdentityAuthorizer(), stateTransitionParser: any DashConnectStateTransitionParsing = PlatformWalletDashConnectStateTransitionParser(), + notificationCenter: NotificationCenter = .default, now: @escaping () -> Date = Date.init ) { assert( @@ -429,7 +466,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { self.authorizer = authorizer self.stateTransitionParser = stateTransitionParser self.now = now - self.subject = CurrentValueSubject(self.store.load()) + self.activeWalletIdHex = activeWalletIdHex + let active = Self.pinnedStores( + walletIdHex: activeWalletIdHex(), store: self.store, responseStore: self.responseStore) + self.shownRows = ShownRows(scope: active?.scope) + self.subject = CurrentValueSubject(active?.connections.load() ?? []) + // The list is loaded once, and the active wallet can change while + // this data source lives. + self.walletChangeObserver = notificationCenter + .publisher(for: SwiftDashSDKWalletState.activeWalletDidChangeNotification) + .sink { [weak self] _ in + Task { @MainActor in self?.showActiveWalletRows() } + } } var connections: AnyPublisher<[DAppConnection], Never> { @@ -456,12 +504,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func makeConnectionRequest(from loginRequest: DashKeyRequest) async -> ConnectionRequest { let fallback = ConnectionRequest(loginRequest: loginRequest) - let existingConnection = existingConnection(for: fallback.appContractId) + await showActiveWalletRows() let context: Context do { context = try await requireContext() } catch { + let existingConnection = await shownRow(id: fallback.appContractId) return ConnectionRequest( loginRequest: loginRequest, appLabel: fallback.appLabel, @@ -473,19 +522,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } + let existingConnection = await rows(in: context.stores).first { $0.id == fallback.appContractId } + // Which login this network gets is settled here, so the sheet can // show what the app is given. With the version unknown the request // says so, and the sheet offers nothing to approve. The lookup runs // alongside the two below. - async let resolvedProtocolVersion = Result { try await Self.networkProtocolVersion(sdk: context.sdk) } + async let resolvedProtocolVersion = Self.networkProtocolVersion(sdk: context.sdk) let metadata = await resolveAppMetadata(for: loginRequest, sdk: context.sdk) let walletUsername = await resolveWalletUsername(context: context) let protocolVersion: UInt32? var unresolvedLoginReason: String? - switch await resolvedProtocolVersion { - case .success(let version): - protocolVersion = version - case .failure(let error): + do { + protocolVersion = try await resolvedProtocolVersion + } catch { Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") protocolVersion = nil unresolvedLoginReason = error.localizedDescription @@ -506,6 +556,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { Self.logger.info("🔗 DASHCONNECT :: approveLogin started") try validateNetwork(request.network) + await showActiveWalletRows() guard consent.appContractId == request.contractId.toBase58String(), consent.login != .unresolved else { throw DashConnectPlatformError.approvalOutOfDate } @@ -551,11 +602,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // The PIN prompt can outlast a wallet or identity switch: sign with // what is active now, and only if it is still the identity that was // shown. - let authorized = try await requireContext() - guard authorized.identityId == context.identityId else { + do { + context = try await contextAfterAuthorization(matching: context) + } catch DashConnectPlatformError.walletChanged { throw DashConnectPlatformError.approvalOutOfDate } - context = authorized if let terms = login.sessionKeyTerms { Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") return try await approveAppConnectLogin(request, terms: terms, context: context) @@ -647,9 +698,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { connection = Self.makeConnection(preview: preview, status: .approved, updatedAt: now()) } - var current = subject.value.filter { $0.id != connection.id } - current.append(connection) - persistAndSend(current) + await updateRows(in: context.stores) { rows in + rows.filter { $0.id != connection.id } + [connection] + } return connection } @@ -683,7 +734,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { throw DashConnectPlatformError.loginContractUnavailable } - guard responseStore.canPersist else { + let stores = context.stores + guard stores.grants.canPersist else { throw DashConnectPlatformError.grantStoreUnavailable } @@ -727,7 +779,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if currentPublicKeys.contains(where: { $0.keyType == .ecdsaHash160 && $0.data == sessionKeyHash160 }) { bindings = (try? Self.storedKeyBindings( identityId: identityId, modelContainer: context.modelContainer)) ?? [] - grantedKeyIds = Set(responseStore.load().filter(isGrantForRequest).map(\.sessionKeyId)) + grantedKeyIds = Set(stores.grants.load().filter(isGrantForRequest).map(\.sessionKeyId)) } let sessionKeyId: UInt32 @@ -783,7 +835,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // show the connection, before anything else can fail. A grant already // recorded for this request keeps its values: if an earlier publish // landed without confirming, those are the ones on Platform. - let grant = updateGrants { grants -> AppConnectGrant in + let grant = updateGrants(in: stores) { grants -> AppConnectGrant in if let existing = grants.first(where: { isGrantForRequest($0) && $0.sessionKeyId == sessionKeyId }) { return existing } @@ -804,15 +856,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let preview = await makeConnectionRequest(from: request) let connection = Self.makeConnection( preview: preview, status: .active, updatedAt: now(), loginKind: .oneQR) - var current = subject.value.filter { $0.id != connection.id } - current.append(connection) - persistAndSend(current) + await updateRows(in: stores) { rows in + rows.filter { $0.id != connection.id } + [connection] + } // The store was writable when the login started. If the record did // not land all the same, a response published now could not be found // again. The key is live, so the row above stays: a disconnect finds // the key by its contract bound. - guard responseStore.load().contains(where: { $0.key == grant.key }) else { + guard stores.grants.load().contains(where: { $0.key == grant.key }) else { Self.logger.error("🔗 DASHCONNECT :: the session key was registered but its record could not be saved") throw DashConnectPlatformError.grantNotRecorded } @@ -841,7 +893,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // Recorded before the publish is submitted: a response this record // had as deleted may be back on Platform after a publish that fails // to confirm, and a disconnect must then look for it. - updateGrants { grants in + updateGrants(in: stores) { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } grants[index].markPublishStarted() } @@ -876,7 +928,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { publishedValues = published.values } - updateGrants { grants in + updateGrants(in: stores) { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } grants[index].documentId = documentId.toBase58String() grants[index].values = publishedValues @@ -919,10 +971,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// suspension point in between, so an approval and a disconnect that /// overlap cannot write a stale copy over each other's change. @discardableResult - private func updateGrants(_ change: (inout [AppConnectGrant]) -> T) -> T { - var grants = responseStore.load() + private func updateGrants(in stores: Stores, _ change: (inout [AppConnectGrant]) -> T) -> T { + var grants = stores.grants.load() let result = change(&grants) - responseStore.save(grants) + stores.grants.save(grants) return result } @@ -944,7 +996,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) async { await resolveUnconfirmedAppConnectResponses( where: matches, responseContractId: responseContractId, context: context) - let pending = responseStore.load().filter { matches($0) && $0.hasDeletableResponse } + let pending = context.stores.grants.load().filter { matches($0) && $0.hasDeletableResponse } for grant in pending { do { guard let documentIdText = grant.documentId, @@ -964,7 +1016,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signingKeyId: signingKeyId, signer: signer ) - markAppConnectResponseGone(grant) + markAppConnectResponseGone(grant, in: context.stores) } catch { Self.logger.error( "🔗 DASHCONNECT :: previous loginKeyResponse not deleted — \(error.localizedDescription, privacy: .public)") @@ -979,7 +1031,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { responseContractId: responseContractId, sdk: context.sdk ) - if remaining == nil { markAppConnectResponseGone(grant) } + if remaining == nil { markAppConnectResponseGone(grant, in: context.stores) } } catch { continue } @@ -990,8 +1042,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// Records that a grant has no response on Platform any more. The record /// of a live key stays for a disconnect to disable that key by; the /// record of a disabled key has no further use. - private func markAppConnectResponseGone(_ grant: AppConnectGrant) { - updateGrants { grants in + private func markAppConnectResponseGone(_ grant: AppConnectGrant, in stores: Stores) { + updateGrants(in: stores) { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } if grants[index].keyDisabled == true { grants.remove(at: index) @@ -1010,7 +1062,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { responseContractId: Data, context: Context ) async { - for grant in responseStore.load() where matches(grant) && grant.hasUnconfirmedResponse { + for grant in context.stores.grants.load() where matches(grant) && grant.hasUnconfirmedResponse { guard let hash = AppConnect.data(fromHex: grant.values.appEphemeralPubKeyHash) else { continue } do { let published = try await findAppConnectResponse( @@ -1020,10 +1072,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { sdk: context.sdk ) guard let published else { - markAppConnectResponseGone(grant) + markAppConnectResponseGone(grant, in: context.stores) continue } - updateGrants { grants in + updateGrants(in: context.stores) { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } grants[index].documentId = published.documentId.toBase58String() grants[index].values = published.values @@ -1037,6 +1089,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func handleStateTransition(_ request: DashStRequest) async throws -> DashConnectStAction { try validateNetwork(request.network) + await showActiveWalletRows() let context = try await requireContext() // The incoming bytes are parsed only to learn the intent — they are // never signed. Each branch validates the parsed values and rebuilds @@ -1069,7 +1122,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // keys usually do, in their contract bounds. Picking the most // recently approved connection instead would derive app B's keys for // a QR scanned from app A. - let pendingConnection = try pendingApprovedConnectionForKeyRegistration( + let pendingConnection = try Self.pendingApprovedConnectionForKeyRegistration( + in: await rows(in: context.stores), boundContractId: Self.boundAppContractId(in: transition) ) guard let pendingAppContractId = Self.decodeIdentifier(pendingConnection.id) else { @@ -1100,24 +1154,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) guard !missingKeys.isEmpty else { - persistAndSend( - subject.value.map { connection in - guard connection.id == pendingConnection.id else { return connection } - return DAppConnection( - id: connection.id, - name: connection.name, - url: connection.url, - status: .active, - updatedAt: now() - ) - } - ) + await markActive(pendingConnection, in: context.stores) return } try await authorize() + // The keys were derived and checked for the identity above. + let authorized = try await contextAfterAuthorization(matching: context) - let signer = KeychainSigner(modelContainer: context.modelContainer) + let signer = KeychainSigner(modelContainer: authorized.modelContainer) try await signer.withAdditionalSigningKeys([ ( publicKey: validated.authenticationKey.publicKeyData, @@ -1128,25 +1173,52 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { privateKey: derivedMaterial.encryptionPrivateKey ), ]) { - try await context.wallet.updateIdentity( - identityId: context.identityId, + try await authorized.wallet.updateIdentity( + identityId: authorized.identityId, addPublicKeys: missingKeys.map(Self.makeManagedIdentityPubkey), signer: signer ) } - persistAndSend( - subject.value.map { connection in + await markActive(pendingConnection, in: authorized.stores) + } + + /// The context to sign with after a PIN prompt, which can outlast a + /// wallet or identity switch: what is active now, and only while it is + /// still the identity and the wallet of `context`. + private func contextAfterAuthorization(matching context: Context) async throws -> Context { + let authorized = try await requireContext(pinnedTo: context.stores) + guard authorized.identityId == context.identityId else { + throw DashConnectPlatformError.walletChanged + } + return authorized + } + + /// What is active now, only while it is the wallet `stores` belongs to, + /// and carrying that pair. + private func requireContext(pinnedTo stores: Stores) async throws -> Context { + var context = try await requireContext() + guard context.stores.walletIdHex == stores.walletIdHex else { + throw DashConnectPlatformError.walletChanged + } + context.stores = stores + return context + } + + private func markActive(_ pendingConnection: DAppConnection, in stores: Stores) async { + let activatedAt = now() + await updateRows(in: stores) { rows in + rows.map { connection in guard connection.id == pendingConnection.id else { return connection } return DAppConnection( id: connection.id, name: connection.name, url: connection.url, status: .active, - updatedAt: now() + updatedAt: activatedAt ) } - ) + } } /// Builds the user-facing approval request for a parsed token purchase, @@ -1195,7 +1267,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return DashConnectTokenPurchaseRequest( // A connection approved earlier for the same contract names the // app; otherwise the sheet falls back to the contract id. - appName: subject.value.first { $0.id == contractIdBase58 }?.name, + appName: await rows(in: context.stores).first { $0.id == contractIdBase58 }?.name, ownerId: purchase.ownerId, dataContractId: purchase.dataContractId, tokenId: purchase.tokenId, @@ -1320,14 +1392,33 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } func remove(id: String) async { - persistAndSend(subject.value.filter { $0.id != id }) + // A list that had to change just now was another wallet's: the row + // to remove was not picked from this one. + let (active, changed) = await showActiveWalletRows() + guard let stores = active, !changed else { return } + await updateRows(in: stores) { rows in rows.filter { $0.id != id } } } func disconnect(id: String) async throws { - let isOneQR = subject.value.first { $0.id == id }?.loginKind == .oneQR - let hasGrants = responseStore.load().contains { $0.appContractId == id } + let (active, changed) = await showActiveWalletRows() + guard let stores = active else { + throw DashConnectPlatformError.noWallet + } + // The row was picked from the published list. A list that had to + // change just now was another wallet's, and nothing of that wallet + // can be turned off from here, even if this one has a row for the + // same app. + // TODO(dashconnect-row-scope): a list the wallet-change notification + // replaced between the tap and this call is not told apart; the call + // would have to name the wallet the row was shown for. + guard !changed else { + throw DashConnectPlatformError.walletChanged + } + let isOneQR = await rows(in: stores).first { $0.id == id }?.loginKind == .oneQR + let hasGrants = stores.grants.load().contains { $0.appContractId == id } if isOneQR || hasGrants { - let liveElsewhere = try await revokeAppConnectGrants(appContractId: id, checksUnrecordedKeys: isOneQR) + let liveElsewhere = try await revokeAppConnectGrants( + appContractId: id, checksUnrecordedKeys: isOneQR, stores: stores) // The row stands for the app, and the app still holds a key on // another identity of this wallet. That key can only be disabled // while its identity is the active one, so the row stays to get @@ -1340,7 +1431,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // longer be approved and there is no second step to wait for, // so the row goes instead of sitting in the two-QR "approved" // state. - persistAndSend(subject.value.filter { $0.id != id }) + await updateRows(in: stores) { rows in rows.filter { $0.id != id } } return } @@ -1348,16 +1439,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // Local-only for a two-QR connection: its `loginKeyResponse` document // stays, and re-approving the same `dash-key:` QR returns it to // `.active` while the identity keys are still registered. - persistAndSend(subject.value.map { connection in - guard connection.id == id else { return connection } - return DAppConnection( - id: connection.id, - name: connection.name, - url: connection.url, - status: .approved, - updatedAt: disconnectedAt - ) - }) + await updateRows(in: stores) { rows in + rows.map { connection in + guard connection.id == id else { return connection } + return DAppConnection( + id: connection.id, + name: connection.name, + url: connection.url, + status: .approved, + updatedAt: disconnectedAt + ) + } + } } /// Ends the access one-QR logins gave an app: disables its session keys @@ -1391,21 +1484,27 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// no record for this identity the keys are still looked for on it. When /// it holds none bound to the app, there was nothing to turn off here and /// the call returns without an error. - private func revokeAppConnectGrants(appContractId: String, checksUnrecordedKeys: Bool) async throws -> Bool { - var context = try await requireContext() + private func revokeAppConnectGrants( + appContractId: String, + checksUnrecordedKeys: Bool, + stores: Stores + ) async throws -> Bool { + // The row was picked in the wallet `stores` belongs to; another + // wallet's identity is not the one the row belongs to. + var context = try await requireContext(pinnedTo: stores) let identityId = context.identityId.toBase58String() func isGranted(_ grant: AppConnectGrant) -> Bool { grant.identityId == identityId && grant.appContractId == appContractId } func hasLiveGrantElsewhere() -> Bool { - responseStore.load().contains { + stores.grants.load().contains { $0.appContractId == appContractId && $0.identityId != identityId && $0.keyDisabled != true } } guard let appContract = Self.decodeIdentifier(appContractId) else { throw DashConnectPlatformError.loginContractUnavailable } - if !responseStore.load().contains(where: isGranted) { + if !stores.grants.load().contains(where: isGranted) { // Before the PIN prompt, from the store alone: whether this // identity holds a key of the app's that has no record. let holdsUnrecordedKey = try checksUnrecordedKeys && Self @@ -1420,16 +1519,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } try await authorize() - // The PIN prompt can outlast a wallet or network switch; sign with - // what is active now, and only if it is still the same identity. - context = try await requireContext() - guard context.identityId.toBase58String() == identityId else { - throw DashConnectPlatformError.noIdentity - } + context = try await contextAfterAuthorization(matching: context) let signer = KeychainSigner(modelContainer: context.modelContainer) let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) - let granted = responseStore.load().filter(isGranted) + let granted = stores.grants.load().filter(isGranted) guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { // Platform never removes a key, so the node that answered is // behind. A key it does not know cannot be shown to be disabled, @@ -1496,7 +1590,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } // Every session key this identity gave the app is now off. - updateGrants { AppConnect.markKeysDisabled(in: &$0, where: isGranted) } + updateGrants(in: stores) { AppConnect.markKeysDisabled(in: &$0, where: isGranted) } if let responseContractId = Self.decodeIdentifier(AppConnect.contractId) { await deleteAppConnectResponses( @@ -1921,23 +2015,58 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - private func persistAndSend(_ connections: [DAppConnection]) { - let sorted = connections.sorted(by: { $0.updatedAt > $1.updatedAt }) - store.save(sorted) - subject.send(sorted) + /// The stores fixed to one wallet; `nil` with no wallet. + private static func pinnedStores( + walletIdHex: String?, + store: any DashConnectStore, + responseStore: any AppConnectResponseStore + ) -> Stores? { + guard let walletIdHex, !walletIdHex.isEmpty else { return nil } + return Stores( + walletIdHex: walletIdHex, + connections: store.pinned(toWalletIdHex: walletIdHex), + grants: responseStore.pinned(toWalletIdHex: walletIdHex)) } - private func existingConnection(for contractId: String) -> DAppConnection? { - subject.value.first { $0.id == contractId } + /// The stores fixed to the wallet that is active at this call, read + /// once; `nil` with no wallet. + private func pinnedActiveStores() -> Stores? { + Self.pinnedStores(walletIdHex: activeWalletIdHex(), store: store, responseStore: responseStore) } - private func pendingApprovedConnectionForKeyRegistration( - boundContractId: Data? - ) throws -> DAppConnection { - try Self.pendingApprovedConnectionForKeyRegistration( - in: subject.value, - boundContractId: boundContractId - ) + /// Publishes the active wallet's rows when the published list holds + /// another wallet's. Returns the active wallet's stores, read once, and + /// whether the list had to change. + @MainActor + @discardableResult + private func showActiveWalletRows() -> (active: Stores?, changed: Bool) { + let active = pinnedActiveStores() + guard shownRows.scope != active?.scope else { return (active, false) } + shownRows.scope = active?.scope + subject.send(active?.connections.load() ?? []) + return (active, true) + } + + /// The rows of the wallet `stores` belongs to: the published list while + /// it is that wallet's, the stored rows otherwise. + @MainActor + private func rows(in stores: Stores) -> [DAppConnection] { + shownRows.scope == stores.scope ? subject.value : stores.connections.load() + } + + @MainActor + private func shownRow(id: String) -> DAppConnection? { + subject.value.first { $0.id == id } + } + + /// Changes the rows of the wallet `stores` belongs to in one step, saves + /// them there, and publishes them only while the published list is that + /// wallet's. + @MainActor + private func updateRows(in stores: Stores, _ change: ([DAppConnection]) -> [DAppConnection]) { + let sorted = change(rows(in: stores)).sorted(by: { $0.updatedAt > $1.updatedAt }) + stores.connections.save(sorted) + if shownRows.scope == stores.scope { subject.send(sorted) } } /// The contract every bounded key in the transition points at, or `nil` @@ -2128,6 +2257,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.noIdentity } + // The stores below are fixed to this wallet. While a switch is under + // way the SDK can still hold the wallet that is being left. + let walletIdHex = wallet.walletId.hexEncodedString() + guard activeWalletIdHex() == walletIdHex else { + Self.logger.error("🔗 DASHCONNECT :: the SDK wallet is not the active wallet") + throw DashConnectPlatformError.walletChanged + } + let identityIndex = try wallet.managedIdentity(identityId: identityId).getIdentityIndex() ?? 0 return Context( @@ -2137,7 +2274,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { network: network, identityId: identityId, identityIndex: identityIndex, - storedUsername: runtime.storedUsername + storedUsername: runtime.storedUsername, + stores: Stores( + walletIdHex: walletIdHex, + connections: store.pinned(toWalletIdHex: walletIdHex), + grants: responseStore.pinned(toWalletIdHex: walletIdHex)) ) } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 4ffd8683e4..4a7f4d98fb 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index a5649d7a5e..3782484b0f 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 38b8295a1e..db277f89b1 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 48e5449609..36cb1aea0f 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index ad37330aea..39490b5cbd 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 19aed04c65..81bbf8222d 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 4bb3cf98c5..f071296e3c 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 099b5eccea..2347a5978a 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6108,6 +6108,7 @@ "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 6b899e96d3..eb246d451f 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index bb6a482738..58e56d67bd 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index c2b852ab98..7cd6630755 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 21837cfd17..085d0bf9b6 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 4e32bd4451..673ba6f4c2 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 0ce459b834..0474475dbc 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index cbc16fef66..fae9a28e62 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 612a1716d4..0715d27a3b 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 4c1635791c..ae12ecacd2 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 2d39f1c572..4756d0b1fb 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 1d97b6f1ac..049b3838b0 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index d06740fc89..663b24983a 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 25fb69f94b..7b85aec733 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 76b985cd4c..d4fa98c9e3 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 9ee12ee052..352bebfa3f 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index c7a786a32f..7280233df7 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index b9a559798f..88d53dc401 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 45b74a8c30..e8e36401b3 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 21db751d2e..5bd47f0936 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 10ecb31aaa..9d874a3018 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 61851e35f6..371cfac1e4 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index c160e4f082..85309c02be 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 550121a446..445ef45c09 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 70459eea3b..d9b2a3bd54 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index d2bf1a6649..d2989f9571 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index b852cb9595..18e28d1e80 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 37cbf74032..b7d0d2be55 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 2267ccda5f..fa22522913 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 34ba75e5b0..bdd8eee0b7 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 3251357a09..5b76b0c8fd 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 9750cfd874..4734b76d7b 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index efca41259b..5a095b99ff 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 800a902073..c1ada09455 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 480bbb48b5..9b8c0fd216 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 9eb440b1a5..24a2338402 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWalletTests/DashConnect/DashConnectStoreTests.swift b/DashWalletTests/DashConnect/DashConnectStoreTests.swift index 2d7f0819ee..25f76858fa 100644 --- a/DashWalletTests/DashConnect/DashConnectStoreTests.swift +++ b/DashWalletTests/DashConnect/DashConnectStoreTests.swift @@ -225,6 +225,41 @@ final class DashConnectStoreTests: XCTestCase { XCTAssertNotEqual(devnetA.storageKey, devnetB.storageKey) } + func testAPinnedStoreStaysWithItsWalletAndDevnetWhenTheActiveOnesChange() { + var walletIdHex: String? = "wallet-a" + var devnetName: String? = "moutai" + let store = UserDefaultsDashConnectStore( + defaults: defaults, + network: .devnet, + walletIdHexProvider: { walletIdHex }, + devnetNameProvider: { devnetName } + ) + let connection = sampleConnection( + id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", + status: .active, + updatedAt: Date(timeIntervalSince1970: 10)) + + let pinned = store.pinnedStore(toWalletIdHex: "wallet-a") + XCTAssertEqual(pinned.storageKey, store.storageKey) + + walletIdHex = "wallet-b" + devnetName = "paloma" + pinned.save([connection]) + + XCTAssertNotEqual(pinned.storageKey, store.storageKey) + XCTAssertEqual(pinned.load(), [connection]) + XCTAssertEqual(store.load(), [], "the wallet that became active got none of the rows") + walletIdHex = "wallet-a" + devnetName = "moutai" + XCTAssertEqual(store.load(), [connection]) + } + + func testAPinnedStoreNamesTheWalletItWasGivenNotTheActiveOne() { + let store = makeStore(network: .testnet, walletIdHex: "wallet-b") + + XCTAssertEqual(store.pinnedStore(toWalletIdHex: "wallet-a").storageKey, "dashconnect.connections.v1.t.wallet-a") + } + func testUnnamedDevnetStoresNothing() { let store = makeStore(network: .devnet, walletIdHex: "wallet-a", devnetName: nil) store.save([sampleConnection( diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 7000e2f6c3..162fa94220 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -84,7 +84,8 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { // Explicit: the default follows the app's current network, and on // a fresh install that is mainnet, which the initializer rejects. supportedNetwork: .testnet, - store: TestDashConnectStore(initialConnections: [existing]) + store: TestDashConnectStore(initialConnections: [existing]), + activeWalletIdHex: { "wallet" } ) let request = await dataSource.makeConnectionRequest(from: MockDashConnectDataSource.sampleLoginRequest) @@ -105,7 +106,8 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { // Explicit: the default follows the app's current network, and on // a fresh install that is mainnet, which the initializer rejects. supportedNetwork: .testnet, - store: TestDashConnectStore(initialConnections: [existing]) + store: TestDashConnectStore(initialConnections: [existing]), + activeWalletIdHex: { "wallet" } ) let request = await dataSource.makeConnectionRequest(from: MockDashConnectDataSource.sampleLoginRequest) @@ -125,7 +127,8 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { // Explicit: the default follows the app's current network, and on // a fresh install that is mainnet, which the initializer rejects. supportedNetwork: .testnet, - store: TestDashConnectStore(initialConnections: [existing]) + store: TestDashConnectStore(initialConnections: [existing]), + activeWalletIdHex: { "wallet" } ) let request = try makeLoginRequest( contractId: Data(repeating: 0x44, count: 32), @@ -1256,6 +1259,10 @@ private final class TestDashConnectStore: DashConnectStore { func save(_ connections: [DAppConnection]) { self.connections = connections } + + var scopeKey: String? { nil } + + func pinned(toWalletIdHex walletIdHex: String) -> any DashConnectStore { self } } /// What the approval sheet may offer after a failed token purchase. @@ -2232,6 +2239,190 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(store.load(), []) } + func testPinnedGrantRecordsStayWithTheirWalletWhenTheActiveOneChanges() { + var walletIdHex: String? = "wallet-b" + let connections = UserDefaultsDashConnectStore( + defaults: defaults, + network: .testnet, + walletIdHexProvider: { walletIdHex }, + devnetNameProvider: { nil } + ) + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .connections(connections)) + let grant = Self.grant(sessionKeyId: 6) + + // Pinned for the wallet the operation runs for, which the active + // one has already stopped being. + let pinned = store.pinned(toWalletIdHex: "wallet-a") + XCTAssertTrue(pinned.canPersist) + pinned.save([grant]) + + XCTAssertEqual(pinned.load(), [grant]) + XCTAssertEqual(store.load(), [], "the active wallet got none of the records") + walletIdHex = "wallet-a" + XCTAssertEqual(store.load(), [grant]) + } + + func testDisconnectOfARowFromAnotherWalletIsRefusedAndTheListMovesToTheActiveWallet() async { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + let other = Self.twoQRRow(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .approved) + active.idHex = "wallet-b" + connections.save([other]) + var published: [DAppConnection] = [] + let subscription = dataSource.connections.sink { published = $0 } + defer { subscription.cancel() } + + do { + try await dataSource.disconnect(id: row.id) + XCTFail("a row of a wallet that is no longer active was disconnected") + } catch { + guard case DashConnectPlatformError.walletChanged = error else { + return XCTFail("unexpected error: \(error)") + } + } + + XCTAssertEqual(published, [other], "the list shows the wallet that is active") + + XCTAssertEqual(connections.load(), [other]) + active.idHex = "wallet-a" + XCTAssertEqual(connections.load(), [row], "the other wallet's row is untouched") + } + + func testDisconnectIsRefusedWhenTheNewlyActiveWalletHasARowForTheSameApp() async { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + active.idHex = "wallet-b" + connections.save([row]) + + do { + try await dataSource.disconnect(id: row.id) + XCTFail("the tap on one wallet's row turned off the other wallet's") + } catch { + guard case DashConnectPlatformError.walletChanged = error else { + return XCTFail("unexpected error: \(error)") + } + } + + XCTAssertEqual(connections.load().map(\.status), [.active]) + } + + func testRemoveDoesNothingWhenTheListWasAnotherWallets() async { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + active.idHex = "wallet-b" + connections.save([row]) + + await dataSource.remove(id: row.id) + XCTAssertEqual(connections.load(), [row]) + + await dataSource.remove(id: row.id) + XCTAssertEqual(connections.load(), [], "the list is this wallet's now") + } + + func testDisconnectOfATwoQRRowTurnsItOffInTheActiveWallet() async throws { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + var published: [DAppConnection] = [] + let subscription = dataSource.connections.sink { published = $0 } + defer { subscription.cancel() } + + try await dataSource.disconnect(id: row.id) + + XCTAssertEqual(connections.load().map(\.status), [.approved]) + XCTAssertEqual(published.map(\.status), [.approved]) + } + + func testTheListMovesToTheActiveWalletWhenTheWalletChangeIsAnnounced() async { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let center = NotificationCenter() + let (dataSource, connections) = makeScopedDataSource( + active: active, rows: [row], notificationCenter: center) + let other = Self.twoQRRow(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .approved) + active.idHex = "wallet-b" + connections.save([other]) + let moved = expectation(description: "the active wallet's rows are published") + let subscription = dataSource.connections.sink { rows in + if rows == [other] { moved.fulfill() } + } + defer { subscription.cancel() } + + center.post( + name: SwiftDashSDKWalletState.activeWalletDidChangeNotification, object: nil) + + await fulfillment(of: [moved], timeout: 2) + } + + func testDisconnectWithNoActiveWalletIsRefused() async { + let active = ActiveWallet(nil) + let (dataSource, _) = makeScopedDataSource(active: active) + + do { + try await dataSource.disconnect(id: Self.twoQRRow(status: .active).id) + XCTFail("disconnected with no wallet") + } catch { + guard case DashConnectPlatformError.noWallet = error else { + return XCTFail("unexpected error: \(error)") + } + } + } + + private final class ActiveWallet { + var idHex: String? + init(_ idHex: String?) { self.idHex = idHex } + } + + /// `rows` are the active wallet's, stored before the data source loads + /// its list. + private func makeScopedDataSource( + active: ActiveWallet, + rows: [DAppConnection] = [], + notificationCenter: NotificationCenter = NotificationCenter() + ) -> (PlatformDashConnectDataSource, UserDefaultsDashConnectStore) { + let connections = UserDefaultsDashConnectStore( + defaults: defaults, + network: .testnet, + walletIdHexProvider: { active.idHex }, + devnetNameProvider: { nil } + ) + connections.save(rows) + let dataSource = PlatformDashConnectDataSource( + supportedNetwork: .testnet, + store: connections, + responseStore: UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .connections(connections)), + activeWalletIdHex: { active.idHex }, + notificationCenter: notificationCenter + ) + return (dataSource, connections) + } + + private static func twoQRRow( + id: String = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", + status: ConnectionStatus + ) -> DAppConnection { + DAppConnection( + id: id, name: "Yappr", url: "yap.pr", status: status, + updatedAt: Date(timeIntervalSince1970: 1_773_132_300)) + } + + func testAPinnedHandedInScopeDoesNotFollowItsProvider() { + var scope: String? = "scope-a" + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { scope } + let grant = Self.grant(sessionKeyId: 6) + + let pinned = store.pinned(toWalletIdHex: "wallet-a") + scope = "scope-b" + pinned.save([grant]) + + XCTAssertEqual(store.load(), []) + scope = "scope-a" + XCTAssertEqual(store.load(), [grant]) + } + private static let now = Date(timeIntervalSince1970: 1_800_000_000) private static let nowMilliseconds: Int64 = 1_800_000_000_000 private static let app = Data(repeating: 0xA1, count: 32) From 1633ae0496924f0d661b7844dcbdaf9820d85778 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 21:04:49 +0300 Subject: [PATCH 017/108] fix(dashpay): a DashConnect disconnect acts only on the wallet its row was shown for A published row now names the wallet and network it was published for, and disconnect and remove take that scope back. A row picked from a list that has since moved to another wallet is refused, also when the new wallet has a row for the same app and the list was already replaced by the wallet-change notification before the call arrived. The scope is set where rows are published and cleared before they are stored. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/DashConnectDataSource.swift | 12 +- .../DashConnect/DashConnectModels.swift | 5 + .../PlatformDashConnectDataSource.swift | 64 ++++---- .../UI/DashConnect/ConnectionsViewModel.swift | 4 +- .../DashConnect/DashConnectStoreTests.swift | 4 +- .../PlatformDashConnectDataSourceTests.swift | 138 +++++++++++++----- 6 files changed, 155 insertions(+), 72 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index 09b190c364..70ee6a34ee 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -48,8 +48,12 @@ protocol DashConnectDataSource { /// same key every time and Platform never re-adds a disabled key, so /// disabling it would lock the app out for good. Turning off a one-QR /// connection that replaced a two-QR one does disable those keys too. - func disconnect(id: String) async throws - func remove(id: String) async + /// + /// `scope` is the `DAppConnection.scope` of the row that was picked: + /// both calls act only while it still names the wallet they would act + /// on. + func disconnect(id: String, scope: String?) async throws + func remove(id: String, scope: String?) async } /// Why a token purchase failed, and — the part that decides what the UI may @@ -256,7 +260,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { DashConnectMockError.stateTransitionNotSupported) } - func disconnect(id: String) async throws { + func disconnect(id: String, scope: String?) async throws { let disconnectedAt = Date() persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } @@ -270,7 +274,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { }) } - func remove(id: String) async { + func remove(id: String, scope: String?) async { persistAndSend(subject.value.filter { $0.id != id }) } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 1c26886965..dfb5304aa2 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -189,6 +189,11 @@ struct DAppConnection: Identifiable, Equatable, Hashable { let status: ConnectionStatus let updatedAt: Date var loginKind: DashConnectLoginKind = .twoQR + /// Names the wallet and network a data source published this row for; + /// `nil` on a row that was built or read from a store. Not stored. It + /// goes back with a disconnect or a remove, so a row picked from a list + /// that has since changed wallets is not acted on in the new one. + var scope: String? = nil } /// A pending request derived from a scanned login QR code. diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index de627b580a..d17602d43e 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -396,6 +396,25 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// the connection store was fixed to, which tells two devnets of one /// wallet apart. var scope: String { "\(walletIdHex) \(connections.scopeKey ?? "")" } + + /// The rows as they are published: each names this scope. + func published(_ rows: [DAppConnection]) -> [DAppConnection] { + Self.rows(rows, scope: scope) + } + + /// The rows as they are stored: without the scope a published row + /// carries. + static func stored(_ rows: [DAppConnection]) -> [DAppConnection] { + Self.rows(rows, scope: nil) + } + + private static func rows(_ rows: [DAppConnection], scope: String?) -> [DAppConnection] { + rows.map { row in + var row = row + row.scope = scope + return row + } + } } /// The scope of the rows `subject` holds. Read and written on the main @@ -470,7 +489,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let active = Self.pinnedStores( walletIdHex: activeWalletIdHex(), store: self.store, responseStore: self.responseStore) self.shownRows = ShownRows(scope: active?.scope) - self.subject = CurrentValueSubject(active?.connections.load() ?? []) + self.subject = CurrentValueSubject(active.map { $0.published($0.connections.load()) } ?? []) // The list is loaded once, and the active wallet can change while // this data source lives. self.walletChangeObserver = notificationCenter @@ -1391,27 +1410,21 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - func remove(id: String) async { - // A list that had to change just now was another wallet's: the row - // to remove was not picked from this one. - let (active, changed) = await showActiveWalletRows() - guard let stores = active, !changed else { return } + func remove(id: String, scope: String?) async { + // A row published for another wallet was not picked from this one. + guard let stores = await showActiveWalletRows(), scope == stores.scope else { return } await updateRows(in: stores) { rows in rows.filter { $0.id != id } } } - func disconnect(id: String) async throws { - let (active, changed) = await showActiveWalletRows() - guard let stores = active else { + func disconnect(id: String, scope: String?) async throws { + guard let stores = await showActiveWalletRows() else { throw DashConnectPlatformError.noWallet } - // The row was picked from the published list. A list that had to - // change just now was another wallet's, and nothing of that wallet - // can be turned off from here, even if this one has a row for the - // same app. - // TODO(dashconnect-row-scope): a list the wallet-change notification - // replaced between the tap and this call is not told apart; the call - // would have to name the wallet the row was shown for. - guard !changed else { + // The row names the wallet it was published for. When that is not + // the wallet that is active now, nothing of the row's wallet can be + // turned off from here, and a row this wallet has for the same app + // is not the one that was picked. + guard scope == stores.scope else { throw DashConnectPlatformError.walletChanged } let isOneQR = await rows(in: stores).first { $0.id == id }?.loginKind == .oneQR @@ -2035,23 +2048,22 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } /// Publishes the active wallet's rows when the published list holds - /// another wallet's. Returns the active wallet's stores, read once, and - /// whether the list had to change. + /// another wallet's. Returns the active wallet's stores, read once. @MainActor @discardableResult - private func showActiveWalletRows() -> (active: Stores?, changed: Bool) { + private func showActiveWalletRows() -> Stores? { let active = pinnedActiveStores() - guard shownRows.scope != active?.scope else { return (active, false) } + guard shownRows.scope != active?.scope else { return active } shownRows.scope = active?.scope - subject.send(active?.connections.load() ?? []) - return (active, true) + subject.send(active.map { $0.published($0.connections.load()) } ?? []) + return active } /// The rows of the wallet `stores` belongs to: the published list while /// it is that wallet's, the stored rows otherwise. @MainActor private func rows(in stores: Stores) -> [DAppConnection] { - shownRows.scope == stores.scope ? subject.value : stores.connections.load() + shownRows.scope == stores.scope ? Stores.stored(subject.value) : stores.connections.load() } @MainActor @@ -2064,9 +2076,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// wallet's. @MainActor private func updateRows(in stores: Stores, _ change: ([DAppConnection]) -> [DAppConnection]) { - let sorted = change(rows(in: stores)).sorted(by: { $0.updatedAt > $1.updatedAt }) + let sorted = Stores.stored(change(rows(in: stores))).sorted(by: { $0.updatedAt > $1.updatedAt }) stores.connections.save(sorted) - if shownRows.scope == stores.scope { subject.send(sorted) } + if shownRows.scope == stores.scope { subject.send(stores.published(sorted)) } } /// The contract every bounded key in the transition points at, or `nil` diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 1887b16a5b..b526237bc1 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -320,7 +320,7 @@ final class ConnectionsViewModel: ObservableObject { guard let self else { return } defer { self.isDisconnecting = false } do { - try await self.dataSource.disconnect(id: connection.id) + try await self.dataSource.disconnect(id: connection.id, scope: connection.scope) } catch { self.message = ConnectionsScreenMessage( kind: .error, @@ -333,7 +333,7 @@ final class ConnectionsViewModel: ObservableObject { func removeConnection(_ connection: DAppConnection) { Task { - await dataSource.remove(id: connection.id) + await dataSource.remove(id: connection.id, scope: connection.scope) } } diff --git a/DashWalletTests/DashConnect/DashConnectStoreTests.swift b/DashWalletTests/DashConnect/DashConnectStoreTests.swift index 25f76858fa..92b923c2b2 100644 --- a/DashWalletTests/DashConnect/DashConnectStoreTests.swift +++ b/DashWalletTests/DashConnect/DashConnectStoreTests.swift @@ -176,7 +176,7 @@ final class DashConnectStoreTests: XCTestCase { _ = try await first.approveLogin( MockDashConnectDataSource.sampleLoginRequest, consent: MockDashConnectDataSource.sampleRequest) - await first.remove(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F") + await first.remove(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", scope: nil) let second = MockDashConnectDataSource(store: store) XCTAssertEqual(second.connectionsSnapshot, []) @@ -195,7 +195,7 @@ final class DashConnectStoreTests: XCTestCase { store: store ) - try await first.disconnect(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F") + try await first.disconnect(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", scope: nil) let second = MockDashConnectDataSource(store: store) XCTAssertEqual(second.connectionsSnapshot.count, 1) diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 162fa94220..24c33f281c 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -90,7 +90,10 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { let request = await dataSource.makeConnectionRequest(from: MockDashConnectDataSource.sampleLoginRequest) - XCTAssertEqual(request.existingConnection, existing) + var found = request.existingConnection + XCTAssertNotNil(found?.scope, "a row from the published list names its scope") + found?.scope = nil + XCTAssertEqual(found, existing) XCTAssertEqual(request.appContractId, existing.id) } @@ -112,7 +115,10 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { let request = await dataSource.makeConnectionRequest(from: MockDashConnectDataSource.sampleLoginRequest) - XCTAssertEqual(request.existingConnection, existing) + var found = request.existingConnection + XCTAssertNotNil(found?.scope, "a row from the published list names its scope") + found?.scope = nil + XCTAssertEqual(found, existing) } func testMakeConnectionRequestReturnsNilForUnknownContract() async throws { @@ -1356,10 +1362,13 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { let spy = PurchaseApprovalSpy() let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - viewModel.disconnect(Self.connection) + var shown = Self.connection + shown.scope = "wallet-a t" + viewModel.disconnect(shown) await waitUntil { !viewModel.isDisconnecting } XCTAssertEqual(spy.disconnectedIds, [Self.connection.id]) + XCTAssertEqual(spy.disconnectedScopes, ["wallet-a t"], "the row goes back with the scope it was shown for") XCTAssertNil(viewModel.message) } @@ -1534,6 +1543,7 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { private var storedDisconnectFailure: Error? private var storedDisconnectedIds: [String] = [] + private var storedDisconnectedScopes: [String?] = [] var disconnectFailure: Error? { get { lock.withLock { storedDisconnectFailure } } @@ -1544,15 +1554,20 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { lock.withLock { storedDisconnectedIds } } - func disconnect(id: String) async throws { + var disconnectedScopes: [String?] { + lock.withLock { storedDisconnectedScopes } + } + + func disconnect(id: String, scope: String?) async throws { let failure = lock.withLock { () -> Error? in storedDisconnectedIds.append(id) + storedDisconnectedScopes.append(scope) return storedDisconnectFailure } if let failure { throw failure } } - func remove(id: String) async { + func remove(id: String, scope: String?) async { XCTFail("remove is not part of the purchase approval flow") } } @@ -1611,11 +1626,11 @@ private final class LoginApprovalSpy: DashConnectDataSource { throw PurchaseSpyError.unsupported } - func disconnect(id: String) async throws { + func disconnect(id: String, scope: String?) async throws { throw PurchaseSpyError.unsupported } - func remove(id: String) async {} + func remove(id: String, scope: String?) async {} } private enum PurchaseSpyError: LocalizedError { @@ -2266,24 +2281,14 @@ final class AppConnectLoginTests: XCTestCase { let active = ActiveWallet("wallet-a") let row = Self.twoQRRow(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + let shown = Self.shownRows(dataSource) let other = Self.twoQRRow(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .approved) active.idHex = "wallet-b" connections.save([other]) - var published: [DAppConnection] = [] - let subscription = dataSource.connections.sink { published = $0 } - defer { subscription.cancel() } - do { - try await dataSource.disconnect(id: row.id) - XCTFail("a row of a wallet that is no longer active was disconnected") - } catch { - guard case DashConnectPlatformError.walletChanged = error else { - return XCTFail("unexpected error: \(error)") - } - } - - XCTAssertEqual(published, [other], "the list shows the wallet that is active") + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + XCTAssertEqual(Self.shownRows(dataSource).map(\.id), [other.id], "the list shows the wallet that is active") XCTAssertEqual(connections.load(), [other]) active.idHex = "wallet-a" XCTAssertEqual(connections.load(), [row], "the other wallet's row is untouched") @@ -2293,32 +2298,57 @@ final class AppConnectLoginTests: XCTestCase { let active = ActiveWallet("wallet-a") let row = Self.twoQRRow(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + let shown = Self.shownRows(dataSource) active.idHex = "wallet-b" connections.save([row]) - do { - try await dataSource.disconnect(id: row.id) - XCTFail("the tap on one wallet's row turned off the other wallet's") - } catch { - guard case DashConnectPlatformError.walletChanged = error else { - return XCTFail("unexpected error: \(error)") - } - } + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } XCTAssertEqual(connections.load().map(\.status), [.active]) } - func testRemoveDoesNothingWhenTheListWasAnotherWallets() async { + func testDisconnectFromAnOldListIsRefusedAfterTheListAlreadyMovedToTheNewWallet() async throws { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let center = NotificationCenter() + let (dataSource, connections) = makeScopedDataSource( + active: active, rows: [row], notificationCenter: center) + // What the screen still holds when the tap lands. + let shown = Self.shownRows(dataSource) + active.idHex = "wallet-b" + connections.save([row]) + let moved = expectation(description: "the active wallet's rows are published") + moved.assertForOverFulfill = false + let subscription = dataSource.connections.sink { rows in + if rows.first?.scope != nil, rows.first?.scope != shown[0].scope { moved.fulfill() } + } + defer { subscription.cancel() } + center.post(name: SwiftDashSDKWalletState.activeWalletDidChangeNotification, object: nil) + await fulfillment(of: [moved], timeout: 2) + + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + await dataSource.remove(id: shown[0].id, scope: shown[0].scope) + + XCTAssertEqual(connections.load(), [row], "the new wallet's row for the same app is untouched") + // The row the new list shows is this wallet's own. + let current = Self.shownRows(dataSource) + try await dataSource.disconnect(id: current[0].id, scope: current[0].scope) + XCTAssertEqual(connections.load().map(\.status), [.approved]) + } + + func testRemoveDoesNothingForARowPublishedForAnotherWallet() async { let active = ActiveWallet("wallet-a") let row = Self.twoQRRow(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + let shown = Self.shownRows(dataSource) active.idHex = "wallet-b" connections.save([row]) - await dataSource.remove(id: row.id) + await dataSource.remove(id: shown[0].id, scope: shown[0].scope) XCTAssertEqual(connections.load(), [row]) - await dataSource.remove(id: row.id) + let current = Self.shownRows(dataSource) + await dataSource.remove(id: current[0].id, scope: current[0].scope) XCTAssertEqual(connections.load(), [], "the list is this wallet's now") } @@ -2326,14 +2356,23 @@ final class AppConnectLoginTests: XCTestCase { let active = ActiveWallet("wallet-a") let row = Self.twoQRRow(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) - var published: [DAppConnection] = [] - let subscription = dataSource.connections.sink { published = $0 } - defer { subscription.cancel() } + let shown = Self.shownRows(dataSource) - try await dataSource.disconnect(id: row.id) + try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) XCTAssertEqual(connections.load().map(\.status), [.approved]) - XCTAssertEqual(published.map(\.status), [.approved]) + XCTAssertEqual(Self.shownRows(dataSource).map(\.status), [.approved]) + } + + func testARowWithNoScopeIsNotActedOn() async { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + + await Self.expectWalletChanged { try await dataSource.disconnect(id: row.id, scope: nil) } + await dataSource.remove(id: row.id, scope: nil) + + XCTAssertEqual(connections.load(), [row]) } func testTheListMovesToTheActiveWalletWhenTheWalletChangeIsAnnounced() async { @@ -2347,7 +2386,7 @@ final class AppConnectLoginTests: XCTestCase { connections.save([other]) let moved = expectation(description: "the active wallet's rows are published") let subscription = dataSource.connections.sink { rows in - if rows == [other] { moved.fulfill() } + if rows.map(\.id) == [other.id] { moved.fulfill() } } defer { subscription.cancel() } @@ -2362,7 +2401,7 @@ final class AppConnectLoginTests: XCTestCase { let (dataSource, _) = makeScopedDataSource(active: active) do { - try await dataSource.disconnect(id: Self.twoQRRow(status: .active).id) + try await dataSource.disconnect(id: Self.twoQRRow(status: .active).id, scope: nil) XCTFail("disconnected with no wallet") } catch { guard case DashConnectPlatformError.noWallet = error else { @@ -2371,6 +2410,29 @@ final class AppConnectLoginTests: XCTestCase { } } + /// The rows the data source publishes right now. + private static func shownRows(_ dataSource: PlatformDashConnectDataSource) -> [DAppConnection] { + var rows: [DAppConnection] = [] + let subscription = dataSource.connections.sink { rows = $0 } + subscription.cancel() + return rows + } + + private static func expectWalletChanged( + _ action: () async throws -> Void, + file: StaticString = #filePath, + line: UInt = #line + ) async { + do { + try await action() + XCTFail("a row of a wallet that is no longer active was acted on", file: file, line: line) + } catch { + guard case DashConnectPlatformError.walletChanged = error else { + return XCTFail("unexpected error: \(error)", file: file, line: line) + } + } + } + private final class ActiveWallet { var idHex: String? init(_ idHex: String?) { self.idHex = idHex } From 8bfc35b49c55f306aebe74eef1452617a0611c01 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 22:34:13 +0300 Subject: [PATCH 018/108] fix(dashpay): one DashConnect approval, key registration or disconnect at a time per wallet An approval keeps running after its screen is closed, and a screen opened again gets a new data source over the same stores. A disconnect started there could pick the keys to disable before that approval registered one more, and then mark the new grant as disabled too. - A process-wide gate lets one approval, key registration or disconnect run at a time for a wallet, in arrival order, whichever data source it came through. A turn that comes after the active wallet changed does not start. - A disconnect marks disabled, and deletes the responses of, only the grants it read before disabling. - Rows are read from the store for every change instead of from the list a data source loaded earlier, so two data sources do not overwrite each other's rows. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 52 ++++++++ .../PlatformDashConnectDataSource.swift | 65 +++++++--- .../PlatformDashConnectDataSourceTests.swift | 121 +++++++++++++++++- 3 files changed, 221 insertions(+), 17 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index dbfac6e2d8..36c1fe4882 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -528,6 +528,58 @@ struct AppConnectGrant: Codable, Equatable { } } +/// Lets one DashConnect operation at a time run for a wallet, across every +/// data source in the process. A screen that is opened again gets a new data +/// source over the same stores while an approval started on the old one is +/// still running; without this a disconnect could pick the keys to disable +/// before that approval registers one more. +/// +/// Callers wait their turn in the order they arrived. +actor DashConnectOperationGate { + static let shared = DashConnectOperationGate() + + private var held: Set = [] + private var waiting: [String: [CheckedContinuation]] = [:] + + /// `onWait` is called when the operation has to wait for its turn. + func run( + for key: String, + onWait: () -> Void = {}, + _ operation: () async throws -> T + ) async rethrows -> T { + if held.contains(key) { onWait() } + await enter(key) + do { + let result = try await operation() + leave(key) + return result + } catch { + leave(key) + throw error + } + } + + private func enter(_ key: String) async { + guard held.contains(key) else { + held.insert(key) + return + } + // The turn is handed over by `leave`, which keeps `key` held. + await withCheckedContinuation { waiting[key, default: []].append($0) } + } + + private func leave(_ key: String) { + guard var queue = waiting[key], !queue.isEmpty else { + waiting[key] = nil + held.remove(key) + return + } + let next = queue.removeFirst() + waiting[key] = queue + next.resume() + } +} + protocol AppConnectResponseStore { /// Whether `save` keeps anything. A login must not register a key the /// store cannot record: its response could not be found again. diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index d17602d43e..7928db9135 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -448,6 +448,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private let responseStore: any AppConnectResponseStore private let subject: CurrentValueSubject<[DAppConnection], Never> private let shownRows: ShownRows + private let operationGate: DashConnectOperationGate private let activeWalletIdHex: () -> String? private var walletChangeObserver: AnyCancellable? private let authorizer: DWIdentityAuthorizer @@ -474,6 +475,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { authorizer: DWIdentityAuthorizer = DWIdentityAuthorizer(), stateTransitionParser: any DashConnectStateTransitionParsing = PlatformWalletDashConnectStateTransitionParser(), notificationCenter: NotificationCenter = .default, + operationGate: DashConnectOperationGate = .shared, now: @escaping () -> Date = Date.init ) { assert( @@ -486,6 +488,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { self.stateTransitionParser = stateTransitionParser self.now = now self.activeWalletIdHex = activeWalletIdHex + self.operationGate = operationGate let active = Self.pinnedStores( walletIdHex: activeWalletIdHex(), store: self.store, responseStore: self.responseStore) self.shownRows = ShownRows(scope: active?.scope) @@ -541,7 +544,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } - let existingConnection = await rows(in: context.stores).first { $0.id == fallback.appContractId } + let existingConnection = rows(in: context.stores).first { $0.id == fallback.appContractId } // Which login this network gets is settled here, so the sheet can // show what the app is given. With the version unknown the request @@ -572,7 +575,31 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } + /// One approval, key registration or disconnect at a time for the active + /// wallet, whichever data source it came through. The turn is for the + /// wallet that was active when it was asked for: if another one is + /// active when it comes, the operation does not start. + private func gated(_ operation: () async throws -> T) async throws -> T { + let walletIdHex = activeWalletIdHex() ?? "" + return try await operationGate.run( + for: walletIdHex, + onWait: { Self.logger.info("🔗 DASHCONNECT :: waiting for another DashConnect operation to finish") } + ) { + guard (activeWalletIdHex() ?? "") == walletIdHex else { + throw DashConnectPlatformError.walletChanged + } + return try await operation() + } + } + func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { + try await gated { try await approveLoginInTurn(request, consent: consent) } + } + + private func approveLoginInTurn( + _ request: DashKeyRequest, + consent: ConnectionRequest + ) async throws -> DAppConnection { Self.logger.info("🔗 DASHCONNECT :: approveLogin started") try validateNetwork(request.network) await showActiveWalletRows() @@ -986,9 +1013,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return (identifier, values) } - /// Reads, changes and writes the grant records in one step with no - /// suspension point in between, so an approval and a disconnect that - /// overlap cannot write a stale copy over each other's change. + /// Reads, changes and writes the grant records in one step, from the + /// store each time. Every caller runs inside `gated`, so no other + /// operation of this wallet writes them in between. @discardableResult private func updateGrants(in stores: Stores, _ change: (inout [AppConnectGrant]) -> T) -> T { var grants = stores.grants.load() @@ -1119,7 +1146,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { switch parsed { case .keyRegistration(let transition): - try await completeKeyRegistration(transition, context: context) + // Only this branch changes the identity and the rows. + try await gated { try await completeKeyRegistration(transition, context: context) } return .keyRegistrationCompleted case .tokenPurchase(let purchase): return .tokenPurchaseApprovalRequired( @@ -1142,7 +1170,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // recently approved connection instead would derive app B's keys for // a QR scanned from app A. let pendingConnection = try Self.pendingApprovedConnectionForKeyRegistration( - in: await rows(in: context.stores), + in: rows(in: context.stores), boundContractId: Self.boundAppContractId(in: transition) ) guard let pendingAppContractId = Self.decodeIdentifier(pendingConnection.id) else { @@ -1286,7 +1314,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return DashConnectTokenPurchaseRequest( // A connection approved earlier for the same contract names the // app; otherwise the sheet falls back to the contract id. - appName: await rows(in: context.stores).first { $0.id == contractIdBase58 }?.name, + appName: rows(in: context.stores).first { $0.id == contractIdBase58 }?.name, ownerId: purchase.ownerId, dataContractId: purchase.dataContractId, tokenId: purchase.tokenId, @@ -1417,6 +1445,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } func disconnect(id: String, scope: String?) async throws { + try await gated { try await disconnectInTurn(id: id, scope: scope) } + } + + private func disconnectInTurn(id: String, scope: String?) async throws { guard let stores = await showActiveWalletRows() else { throw DashConnectPlatformError.noWallet } @@ -1427,7 +1459,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard scope == stores.scope else { throw DashConnectPlatformError.walletChanged } - let isOneQR = await rows(in: stores).first { $0.id == id }?.loginKind == .oneQR + let isOneQR = rows(in: stores).first { $0.id == id }?.loginKind == .oneQR let hasGrants = stores.grants.load().contains { $0.appContractId == id } if isOneQR || hasGrants { let liveElsewhere = try await revokeAppConnectGrants( @@ -1602,12 +1634,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: app key(s) disabled") } - // Every session key this identity gave the app is now off. - updateGrants(in: stores) { AppConnect.markKeysDisabled(in: &$0, where: isGranted) } + // The session keys of the grants read above are now off, and only + // those are marked. + let revoked = Set(granted.map(\.key)) + func isRevoked(_ grant: AppConnectGrant) -> Bool { revoked.contains(grant.key) } + updateGrants(in: stores) { AppConnect.markKeysDisabled(in: &$0, where: isRevoked) } if let responseContractId = Self.decodeIdentifier(AppConnect.contractId) { await deleteAppConnectResponses( - where: isGranted, + where: isRevoked, responseContractId: responseContractId, context: context, signer: signer @@ -2059,11 +2094,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return active } - /// The rows of the wallet `stores` belongs to: the published list while - /// it is that wallet's, the stored rows otherwise. - @MainActor + /// The rows of the wallet `stores` belongs to, as stored. Not the + /// published list: another data source over the same store may have + /// written since this one loaded it. private func rows(in stores: Stores) -> [DAppConnection] { - shownRows.scope == stores.scope ? Stores.stored(subject.value) : stores.connections.load() + stores.connections.load() } @MainActor diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 24c33f281c..7821928da8 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2396,6 +2396,121 @@ final class AppConnectLoginTests: XCTestCase { await fulfillment(of: [moved], timeout: 2) } + func testOperationsForOneWalletRunOneAtATimeInArrivalOrder() async { + let gate = DashConnectOperationGate() + let log = OperationLog() + let firstStarted = expectation(description: "the first operation is running") + let secondWaits = expectation(description: "the second operation waits") + let thirdWaits = expectation(description: "the third operation waits") + let release = AsyncStream.makeStream() + + let first = Task { + await gate.run(for: "wallet-a") { + await log.add("first starts") + firstStarted.fulfill() + for await _ in release.stream { break } + await log.add("first ends") + } + } + await fulfillment(of: [firstStarted], timeout: 2) + let second = Task { + await gate.run(for: "wallet-a", onWait: { secondWaits.fulfill() }) { await log.add("second runs") } + } + await fulfillment(of: [secondWaits], timeout: 2) + let third = Task { + await gate.run(for: "wallet-a", onWait: { thirdWaits.fulfill() }) { await log.add("third runs") } + } + await fulfillment(of: [thirdWaits], timeout: 2) + // Another wallet does not wait for this one. + await gate.run(for: "wallet-b") { await log.add("other wallet runs") } + release.continuation.yield() + await first.value + await second.value + await third.value + + let entries = await log.entries + XCTAssertEqual( + entries, ["first starts", "other wallet runs", "first ends", "second runs", "third runs"]) + } + + func testADisconnectWaitsForAnOperationAnotherDataSourceIsRunning() async throws { + let gate = DashConnectOperationGate() + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row], operationGate: gate) + let shown = Self.shownRows(dataSource) + let otherStarted = expectation(description: "the other operation is running") + let release = AsyncStream.makeStream() + // What another data source of the same wallet would be doing. + let other = Task { + await gate.run(for: "wallet-a") { + otherStarted.fulfill() + for await _ in release.stream { break } + // It wrote a row of its own meanwhile. + connections.save([row, Self.twoQRRow(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .active)]) + } + } + await fulfillment(of: [otherStarted], timeout: 2) + + let disconnect = Task { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + try await Task.sleep(nanoseconds: 100_000_000) + XCTAssertEqual(connections.load().map(\.status), [.active], "the disconnect has not run yet") + + release.continuation.yield() + await other.value + try await disconnect.value + + let rows = connections.load() + XCTAssertEqual(rows.count, 2, "the row the other operation wrote is kept") + XCTAssertEqual(rows.first { $0.id == row.id }?.status, .approved) + } + + func testAnOperationDoesNotStartForAWalletThatIsNoLongerActiveWhenItsTurnComes() async { + let gate = DashConnectOperationGate() + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row], operationGate: gate) + let shown = Self.shownRows(dataSource) + let otherStarted = expectation(description: "the other operation is running") + let release = AsyncStream.makeStream() + let other = Task { + await gate.run(for: "wallet-a") { + otherStarted.fulfill() + for await _ in release.stream { break } + } + } + await fulfillment(of: [otherStarted], timeout: 2) + + let disconnect = Task { + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + } + try? await Task.sleep(nanoseconds: 100_000_000) + active.idHex = "wallet-b" + release.continuation.yield() + await other.value + await disconnect.value + + active.idHex = "wallet-a" + XCTAssertEqual(connections.load(), [row]) + } + + func testAFailedOperationHandsTheTurnOn() async { + let gate = DashConnectOperationGate() + + do { + try await gate.run(for: "wallet-a") { throw DashConnectPlatformError.noWallet } + XCTFail("the failure was swallowed") + } catch {} + let ran = await gate.run(for: "wallet-a") { true } + + XCTAssertTrue(ran) + } + + private actor OperationLog { + private(set) var entries: [String] = [] + func add(_ entry: String) { entries.append(entry) } + } + func testDisconnectWithNoActiveWalletIsRefused() async { let active = ActiveWallet(nil) let (dataSource, _) = makeScopedDataSource(active: active) @@ -2443,7 +2558,8 @@ final class AppConnectLoginTests: XCTestCase { private func makeScopedDataSource( active: ActiveWallet, rows: [DAppConnection] = [], - notificationCenter: NotificationCenter = NotificationCenter() + notificationCenter: NotificationCenter = NotificationCenter(), + operationGate: DashConnectOperationGate = DashConnectOperationGate() ) -> (PlatformDashConnectDataSource, UserDefaultsDashConnectStore) { let connections = UserDefaultsDashConnectStore( defaults: defaults, @@ -2457,7 +2573,8 @@ final class AppConnectLoginTests: XCTestCase { store: connections, responseStore: UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .connections(connections)), activeWalletIdHex: { active.idHex }, - notificationCenter: notificationCenter + notificationCenter: notificationCenter, + operationGate: operationGate ) return (dataSource, connections) } From 57b3346b57337d7c7f7f64f3cf6a4ddab650c9f7 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 23:18:09 +0300 Subject: [PATCH 019/108] fix(dashpay): bind DashConnect operations to the network scope too, and show the app contract on the sheet - A context resolved again after a PIN prompt or a wait at the operation gate must match the whole scope of the stores it carries on with, the wallet and the network scope: the same wallet on another devnet is refused. - A dash-st: key registration takes its turn for the wallet of the context it resolved, and resolves the context again once the turn comes. - The approval sheet shows the app's contract id in full, selectable: the name next to it can be chosen by the code or the contract's owner, and the id is what a one-QR key is bound to. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 35 +++++++++++++------ .../DashConnect/ApproveConnectionSheet.swift | 18 ++++++++++ DashWallet/ar.lproj/Localizable.strings | 1 + DashWallet/bg.lproj/Localizable.strings | 1 + DashWallet/ca.lproj/Localizable.strings | 1 + DashWallet/cs.lproj/Localizable.strings | 1 + DashWallet/da.lproj/Localizable.strings | 1 + DashWallet/de.lproj/Localizable.strings | 1 + DashWallet/el.lproj/Localizable.strings | 1 + DashWallet/en.lproj/Localizable.strings | 1 + DashWallet/eo.lproj/Localizable.strings | 1 + DashWallet/es.lproj/Localizable.strings | 1 + DashWallet/et.lproj/Localizable.strings | 1 + DashWallet/fa.lproj/Localizable.strings | 1 + DashWallet/fi.lproj/Localizable.strings | 1 + DashWallet/fil.lproj/Localizable.strings | 1 + DashWallet/fr.lproj/Localizable.strings | 1 + DashWallet/hr.lproj/Localizable.strings | 1 + DashWallet/hu.lproj/Localizable.strings | 1 + DashWallet/id.lproj/Localizable.strings | 1 + DashWallet/it.lproj/Localizable.strings | 1 + DashWallet/ja.lproj/Localizable.strings | 1 + DashWallet/ko.lproj/Localizable.strings | 1 + DashWallet/mk.lproj/Localizable.strings | 1 + DashWallet/ms.lproj/Localizable.strings | 1 + DashWallet/nb.lproj/Localizable.strings | 1 + DashWallet/nl.lproj/Localizable.strings | 1 + DashWallet/pl.lproj/Localizable.strings | 1 + DashWallet/pt.lproj/Localizable.strings | 1 + DashWallet/ro.lproj/Localizable.strings | 1 + DashWallet/ru.lproj/Localizable.strings | 1 + DashWallet/sk.lproj/Localizable.strings | 1 + DashWallet/sl.lproj/Localizable.strings | 1 + DashWallet/sl_SI.lproj/Localizable.strings | 1 + DashWallet/sq.lproj/Localizable.strings | 1 + DashWallet/sr.lproj/Localizable.strings | 1 + DashWallet/sv.lproj/Localizable.strings | 1 + DashWallet/th.lproj/Localizable.strings | 1 + DashWallet/tr.lproj/Localizable.strings | 1 + DashWallet/uk.lproj/Localizable.strings | 1 + DashWallet/vi.lproj/Localizable.strings | 1 + DashWallet/zh-Hans.lproj/Localizable.strings | 1 + .../zh-Hant-TW.lproj/Localizable.strings | 1 + DashWallet/zh.lproj/Localizable.strings | 1 + DashWallet/zh_TW.lproj/Localizable.strings | 1 + 45 files changed, 86 insertions(+), 10 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 7928db9135..4fc2e43d7f 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -579,8 +579,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// wallet, whichever data source it came through. The turn is for the /// wallet that was active when it was asked for: if another one is /// active when it comes, the operation does not start. - private func gated(_ operation: () async throws -> T) async throws -> T { - let walletIdHex = activeWalletIdHex() ?? "" + /// + /// An operation that already has a context names that context's wallet, + /// so its turn is that wallet's whichever one is active by now. + private func gated( + walletIdHex: String? = nil, + _ operation: () async throws -> T + ) async throws -> T { + let walletIdHex = walletIdHex ?? activeWalletIdHex() ?? "" return try await operationGate.run( for: walletIdHex, onWait: { Self.logger.info("🔗 DASHCONNECT :: waiting for another DashConnect operation to finish") } @@ -1146,8 +1152,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { switch parsed { case .keyRegistration(let transition): - // Only this branch changes the identity and the rows. - try await gated { try await completeKeyRegistration(transition, context: context) } + // Only this branch changes the identity and the rows. Its turn + // is the wallet of the context read above, and the context is + // resolved again once the turn comes: the wait can outlast a + // wallet, network or identity switch. + try await gated(walletIdHex: context.stores.walletIdHex) { + let current = try await contextAfterAuthorization(matching: context) + try await completeKeyRegistration(transition, context: current) + } return .keyRegistrationCompleted case .tokenPurchase(let purchase): return .tokenPurchaseApprovalRequired( @@ -1230,9 +1242,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { await markActive(pendingConnection, in: authorized.stores) } - /// The context to sign with after a PIN prompt, which can outlast a - /// wallet or identity switch: what is active now, and only while it is - /// still the identity and the wallet of `context`. + /// The context to go on with after a wait — a PIN prompt, a turn at + /// the operation gate — which can outlast a wallet, network or identity + /// switch: what is active now, and only while it is still the identity, + /// the wallet and the network scope of `context`. private func contextAfterAuthorization(matching context: Context) async throws -> Context { let authorized = try await requireContext(pinnedTo: context.stores) guard authorized.identityId == context.identityId else { @@ -1241,11 +1254,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return authorized } - /// What is active now, only while it is the wallet `stores` belongs to, - /// and carrying that pair. + /// What is active now, only while it is the wallet and the network + /// scope `stores` belongs to, and carrying that pair. The same wallet on + /// another devnet is refused: its identity and SDK are that devnet's, + /// and the records would go to this one's. private func requireContext(pinnedTo stores: Stores) async throws -> Context { var context = try await requireContext() - guard context.stores.walletIdHex == stores.walletIdHex else { + guard context.stores.scope == stores.scope else { throw DashConnectPlatformError.walletChanged } context.stores = stores diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index 757125a5b2..3419e1d38f 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -67,6 +67,24 @@ struct ApproveConnectionSheet: View { Text(resolvedSubtitle) .font(.subhead) .foregroundColor(.secondaryText) + + // The name above can be one the code or the + // contract's owner chose. This id is what the + // approval is for: a one-QR key is bound to it. Shown + // in full and selectable, so it can be compared with + // the one the app publishes. + VStack(alignment: .leading, spacing: 2) { + Text(NSLocalizedString("App contract", comment: "DashConnect")) + .font(.footnote) + .foregroundColor(.secondaryText) + Text(request.appContractId) + .font(.footnote.monospaced()) + .foregroundColor(.primaryText) + .textSelection(.enabled) + .fixedSize(horizontal: false, vertical: true) + } + .padding(.top, 6) + .accessibilityElement(children: .combine) } if let existingConnection = request.existingConnection { diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 4a7f4d98fb..d5584d5e61 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 3782484b0f..6513b3f3a2 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index db277f89b1..61c8accaf6 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 36cb1aea0f..2e3871c3fc 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 39490b5cbd..2be25a49a3 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 81bbf8222d..c04bbdef51 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index f071296e3c..ca9a4f2c2f 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 2347a5978a..0a841eced2 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6104,6 +6104,7 @@ /* Wallet preparation and support */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not disconnect: %@" = "Could not disconnect: %@"; "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index eb246d451f..7d7a6c59ad 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 58e56d67bd..f003db3bff 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 7cd6630755..33723de595 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 085d0bf9b6..959d79d3c7 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 673ba6f4c2..0cfe4c369c 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 0474475dbc..aae50ada2e 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index fae9a28e62..86b428a091 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 0715d27a3b..dc17aad4bd 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index ae12ecacd2..71a486ab7c 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 4756d0b1fb..46ef9edb0b 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 049b3838b0..c511c7a40a 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 663b24983a..ab7432cd4f 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 7b85aec733..9e3d1784b8 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index d4fa98c9e3..eb93acf92f 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 352bebfa3f..8a253e4806 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 7280233df7..fbebbcd175 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 88d53dc401..425976bdc3 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index e8e36401b3..217733ed48 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 5bd47f0936..b17e728442 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 9d874a3018..cfb663d632 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 371cfac1e4..8014a410b0 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 85309c02be..8a1b4e4fdc 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 445ef45c09..cbb0e002c1 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index d9b2a3bd54..79c4d18d20 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index d2989f9571..7b85f6132b 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 18e28d1e80..47deb31831 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index b7d0d2be55..1d59fbc1ff 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index fa22522913..6c3407daf0 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index bdd8eee0b7..eb3d66858a 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 5b76b0c8fd..9ef5646a8a 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 4734b76d7b..daf0181b9c 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 5a095b99ff..60e387599a 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index c1ada09455..52df208568 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 9b8c0fd216..dcc16565d8 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 24a2338402..88a0bc3ec2 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; From 6bb852f2063bc36d0553617851f27c8de043e384 Mon Sep 17 00:00:00 2001 From: pasta Date: Tue, 13 Oct 2026 15:33:21 -0500 Subject: [PATCH 020/108] feat(dashpay): add the App Connect request v2 grant rules The rules a wallet applies between decoding a v2 request and registering its keys (Yappr docs/APP_CONNECT_PROFILE.md), as pure functions: - the grant plan: every binding granted, budget capped at 5 DASH, lifetime at 365 days, a 90-day expiry when none is asked, no requested limit dropped; stale and future requests refused - owner consistency: groups and contracts owned by the app's owner, DashPay profile the only foreign document type, system contracts never an app or a binding target, the app opting in to bound encryption keys - one auth key per binding at the session-authentication leaf hash256(appEphPub || u8 bindingIndex), with deriveConnectKey as it is - the encryption key (rule 7): resend this wallet's rotation-0 key while it is current, register it when there is none, leave the slot out otherwise - supersession by CONNECTION_ID, and the callback's ac= status The grant record keeps a v2 grant's other auth keys and its connection id, and disconnect counts every key a record names. Co-Authored-By: Claude Opus 5.5 --- DashWallet.xcodeproj/project.pbxproj | 4 + .../Models/DashConnect/AppConnectLogin.swift | 42 +- .../DashConnect/AppConnectV2Login.swift | 410 ++++++++++++++ .../DashConnect/Protocol/DashConnectUri.swift | 8 + .../DashConnect/AppConnectV2LoginTests.swift | 512 ++++++++++++++++++ 5 files changed, 971 insertions(+), 5 deletions(-) create mode 100644 DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift create mode 100644 DashWalletTests/DashConnect/AppConnectV2LoginTests.swift diff --git a/DashWallet.xcodeproj/project.pbxproj b/DashWallet.xcodeproj/project.pbxproj index ffbb21c46d..40c031f68c 100644 --- a/DashWallet.xcodeproj/project.pbxproj +++ b/DashWallet.xcodeproj/project.pbxproj @@ -1171,6 +1171,7 @@ AA03A0022FF3000000000002 /* LoginKeyDerivationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA03A0042FF3000000000004 /* LoginKeyDerivationTests.swift */; }; AA04A0012FF4000000000001 /* DashConnectDataSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA04A0032FF4000000000003 /* DashConnectDataSourceTests.swift */; }; AA05A0012FF5000000000001 /* DashConnectStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA05A0032FF5000000000003 /* DashConnectStoreTests.swift */; }; + AA06A0112FF6000000000011 /* AppConnectV2LoginTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA06A0132FF6000000000013 /* AppConnectV2LoginTests.swift */; }; AA06A0012FF6000000000001 /* PlatformDashConnectDataSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA06A0032FF6000000000003 /* PlatformDashConnectDataSourceTests.swift */; }; AA22BB33CC44DD55EE66FF78 /* BuyReceiveFlowUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA22BB33CC44DD55EE66FF77 /* BuyReceiveFlowUITests.swift */; }; AA29B7041CF55787428E1A04 /* libPods-WatchApp Extension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B9BF7550EF8D4BA009CB1EB5 /* libPods-WatchApp Extension.a */; }; @@ -3330,6 +3331,7 @@ AA03A0042FF3000000000004 /* LoginKeyDerivationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = LoginKeyDerivationTests.swift; path = DashConnect/LoginKeyDerivationTests.swift; sourceTree = ""; }; AA04A0032FF4000000000003 /* DashConnectDataSourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DashConnectDataSourceTests.swift; path = DashConnect/DashConnectDataSourceTests.swift; sourceTree = ""; }; AA05A0032FF5000000000003 /* DashConnectStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DashConnectStoreTests.swift; path = DashConnect/DashConnectStoreTests.swift; sourceTree = ""; }; + AA06A0132FF6000000000013 /* AppConnectV2LoginTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppConnectV2LoginTests.swift; path = DashConnect/AppConnectV2LoginTests.swift; sourceTree = ""; }; AA06A0032FF6000000000003 /* PlatformDashConnectDataSourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PlatformDashConnectDataSourceTests.swift; path = DashConnect/PlatformDashConnectDataSourceTests.swift; sourceTree = ""; }; AA22BB33CC44DD55EE66FF77 /* BuyReceiveFlowUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuyReceiveFlowUITests.swift; sourceTree = ""; }; AA29A8515217AC4232F794C2 /* Pods-TodayExtension.testnet.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TodayExtension.testnet.xcconfig"; path = "Target Support Files/Pods-TodayExtension/Pods-TodayExtension.testnet.xcconfig"; sourceTree = ""; }; @@ -7508,6 +7510,7 @@ AA03A0042FF3000000000004 /* LoginKeyDerivationTests.swift */, AA04A0032FF4000000000003 /* DashConnectDataSourceTests.swift */, AA05A0032FF5000000000003 /* DashConnectStoreTests.swift */, + AA06A0132FF6000000000013 /* AppConnectV2LoginTests.swift */, AA06A0032FF6000000000003 /* PlatformDashConnectDataSourceTests.swift */, 47976E492987772700612988 /* AmountObjectTests.swift */, A17EED0126C7000000000002 /* WalletWipeSerialExecutorTests.swift */, @@ -10820,6 +10823,7 @@ AA03A0022FF3000000000002 /* LoginKeyDerivationTests.swift in Sources */, AA04A0012FF4000000000001 /* DashConnectDataSourceTests.swift in Sources */, AA05A0012FF5000000000001 /* DashConnectStoreTests.swift in Sources */, + AA06A0112FF6000000000011 /* AppConnectV2LoginTests.swift in Sources */, AA06A0012FF6000000000001 /* PlatformDashConnectDataSourceTests.swift in Sources */, 47976E4A2987772700612988 /* AmountObjectTests.swift in Sources */, A17EED0126C7000000000001 /* WalletWipeSerialExecutorTests.swift in Sources */, diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 36c1fe4882..2970d7341a 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -58,11 +58,29 @@ enum AppConnect { case twoQR /// Registers a session key with these terms. case oneQR(SessionKeyTerms) + /// An App Connect request v2: registers the keys of this plan. + case appConnect(GrantPlan) + /// An App Connect request v2 the wallet will not answer; there is + /// nothing to approve. + case refused(Refusal) var sessionKeyTerms: SessionKeyTerms? { if case .oneQR(let terms) = self { return terms } return nil } + + var grantPlan: GrantPlan? { + if case .appConnect(let plan) = self { return plan } + return nil + } + + /// Whether the sheet has something to approve. + var isApprovable: Bool { + switch self { + case .twoQR, .oneQR, .appConnect: return true + case .unresolved, .refused: return false + } + } } /// The login a network at `protocolVersion` gets. @@ -260,12 +278,14 @@ enum AppConnect { currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], twoQRAuthenticationKeyHash160: Data? = nil ) -> [UInt32] { - let granted = Set(grants.map(\.sessionKeyId)) + let granted = Set(grants.flatMap(\.keyIds)) return currentIdentityPublicKeys .filter { key in - guard isLiveSessionKey(key) else { return false } let keyId = UInt32(bitPattern: key.keyId) - if granted.contains(keyId) { return true } + // A v2 grant's keys come in other shapes too (a CRITICAL + // group key, a document-type key); the record names them. + if granted.contains(keyId) { return isLiveGrantedKey(key) } + guard isLiveSessionKey(key) else { return false } guard key.totalBudget != nil, key.expiresAt != nil, key.data != twoQRAuthenticationKeyHash160 else { return false } return bindings.contains { @@ -286,7 +306,7 @@ enum AppConnect { bindings: [KeyBinding], currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] ) -> [UInt32] { - let granted = Set(grants.map(\.sessionKeyId)) + let granted = Set(grants.flatMap(\.keyIds)) return currentIdentityPublicKeys .filter { key in guard isLiveSessionKey(key) else { return false } @@ -323,7 +343,7 @@ enum AppConnect { for grants: [AppConnectGrant] ) -> [UInt32] { let known = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) - return Set(grants.map(\.sessionKeyId)).subtracting(known).sorted() + return Set(grants.flatMap(\.keyIds)).subtracting(known).sorted() } /// What a disconnect leaves of the matching records once their keys are @@ -498,6 +518,18 @@ struct AppConnectGrant: Codable, Equatable { /// be deleted, or could not be shown to be absent; the record then only /// waits for that. var keyDisabled: Bool? + /// App Connect v2: the grant's other auth keys, in request order after + /// `sessionKeyId` (the primary binding's key). The identity's encryption + /// key for the app is shared by every device and is not part of a grant. + var additionalKeyIds: [UInt32]? = nil + /// App Connect v2: the request's `CONNECTION_ID` (hex). A later login + /// with the same one replaces this grant's keys. + var connectionId: String? = nil + + /// Every auth key of the grant. + var keyIds: [UInt32] { + [sessionKeyId] + (additionalKeyIds ?? []) + } /// What makes two records the same grant: one session key given for one /// request. Records are matched on this, never on whole-value equality — diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift new file mode 100644 index 0000000000..ee3955fff5 --- /dev/null +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -0,0 +1,410 @@ +import CryptoKit +import Foundation +import SwiftDashSDK + +/// The App Connect request v2 login (Yappr `docs/APP_CONNECT_PROFILE.md`): +/// the rules a wallet applies between decoding a request +/// (`AppConnectRequest`) and registering the keys it names. Pure, like the +/// rest of `AppConnect`; `PlatformDashConnectDataSource` owns the Platform +/// calls and their order. +extension AppConnect { + // MARK: Limits (profile wallet rule 5) + + /// The most budget the wallet grants any key, whatever the app proposes. + static let v2BudgetCapCredits: UInt64 = 5 * PlatformCreditsFormatter.creditsPerDash + /// The longest a key the wallet grants may live. + static let v2LifetimeCap: TimeInterval = 365 * 24 * 60 * 60 + /// The lifetime a key gets when its binding asks for no expiry, so every + /// auth key carries a limit. + static let v2DefaultLifetime: TimeInterval = 90 * 24 * 60 * 60 + + /// The DashPay contract, the same id on every network. + static let dashPayContractId = "Bwr4WHCPz5rFVAD87RqTs3izo4zpzwsEdKPWUT1NS1C7" + /// Profile wallet rule 3: the only document types on a contract the app + /// does not own that a binding may name. Never DashPay `contactRequest`, + /// never DPNS. + static let allowedForeignDocumentTypes: Set = ["\(dashPayContractId)/profile"] + /// Platform's system contracts (dashpay/platform `data-contracts`), the + /// same ids on every network. None of them is an app: a request naming + /// one as its app, or binding a key to one, is refused, except for the + /// document types allowlisted above. + static let systemContractIds: Set = [ + "4fJLR2GYTPFdomuTVvNy3VRrvWgvkKPzqehEBpNf2nk6", // withdrawals + "rUnsWrFu3PKyRMGk2mxmZVBPbQuZx2qtHeFjURoQevX", // masternode reward shares + "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec", // DPNS + dashPayContractId, + "7CSFGeF4WNzgDmx94zwvHkYaG3Dx4XEe5LFsFgJswLbm", // wallet utils + "43gujrzZgXqcKBiScLa4T8XTDnRhenR9BLx8GWVHjPxF", // token history + "BsjE6tQxG47wffZCRQCovFx5rYrAYYC3rTVRWKro27LA", // keyword search + "6voHRaoiPcfmMhbqCA9dixH98xcgPQ9UEcuaXjpVu3LD", // document history + contractId, // App Connect + "EG7RGfV8fDTayC2FyVr8HwdpJh3fXDbVztcfE94UmN88", // moderation charters + ] + + // MARK: What an approval grants + + /// One auth key the approval registers, with the limits the wallet + /// settled on: the app's proposal, clamped. + struct AuthGrant: Equatable { + /// The binding's position in the request. It is part of the key's + /// derivation, so the key does not depend on what else is granted. + let bindingIndex: Int + let binding: AppConnectRequest.AuthBinding + /// Set exactly when the binding asked for a budget. + let totalBudget: UInt64? + /// Block time in milliseconds. Always set. + let expiresAt: UInt64 + + var securityLevel: SecurityLevel { + binding.securityLevel == .critical ? .critical : .high + } + + var contractBounds: ManagedPlatformWallet.ContractBounds { + switch binding.kind { + case .singleContract: + return .singleContract(id: binding.id) + case .documentType: + return .singleContractDocumentType(id: binding.id, documentTypeName: binding.documentTypeName ?? "") + case .contractGroup: + return .contractGroup(id: binding.id) + } + } + } + + /// One encryption (or decryption) key the response carries: the + /// identity's key for the app, shared by every device. + struct EncryptionGrant: Equatable { + let bindingIndex: Int + let binding: AppConnectRequest.EncryptionBinding + + var keyPurpose: KeyPurpose { + binding.purpose == .encryption ? .encryption : .decryption + } + + var connectPurpose: ManagedPlatformWallet.ConnectKeyPurpose { + binding.purpose == .encryption ? .encryption : .decryption + } + } + + /// What approving a v2 request gives the app, as the approval sheet + /// shows it. The keys are registered with exactly these terms. + struct GrantPlan: Equatable { + let appId: Data + /// `hash160(appEphPub)`: names the request the plan was made for. + let appEphemeralPubKeyHash: Data + let auth: [AuthGrant] + let encryption: [EncryptionGrant] + let connectionId: Data? + let identityHint: Data? + /// Milliseconds since the epoch. + let createdAt: UInt64 + /// Where the wallet returns when it is done; shown on the sheet. + let callbackHost: String? + + /// The largest budget among the keys, for the summary line. + var totalBudget: UInt64? { + auth.compactMap(\.totalBudget).max() + } + + /// The latest expiry among the keys. + var expiresAt: UInt64? { + auth.map(\.expiresAt).max() + } + } + + /// The `ac=` statuses of the profile's callback. + enum CallbackStatus: String { + case ok + case declined + case stale + case unsupported + case invalid + case failed + } + + /// A v2 request the wallet does not answer, with the status its callback + /// reports. + struct Refusal: LocalizedError, Equatable { + let status: CallbackStatus + let reason: String + + var errorDescription: String? { reason } + + init(_ status: CallbackStatus, _ reason: String) { + self.status = status + self.reason = reason + } + + init(_ error: AppConnectRequestError) { + switch error { + case .unsupported(let reason): self.init(.unsupported, reason) + case .invalid(let reason): self.init(.invalid, reason) + } + } + } + + /// The plan for `uri` at `now`: every binding granted, the proposals + /// clamped to the caps. A wallet may lower a proposal but must never drop + /// a limit the app asked for, and every key gets an expiry. + /// + /// A renewal (`MODE = 1`) is answered as a new login carrying the same + /// connection id, which supersedes the old keys (the profile's phase-1 + /// renewal); raising the limits of existing keys is not implemented. + static func grantPlan(for uri: AppConnectUri, now: Date) throws -> GrantPlan { + let request = uri.request + switch request.age(now: now) { + case .fresh: break + case .stale: throw Refusal(.stale, NSLocalizedString( + "The sign-in request is more than 10 minutes old.", + comment: "DashConnect App Connect v2")) + case .future: throw Refusal(.stale, NSLocalizedString( + "The sign-in request is dated in the future. Check this device's clock.", + comment: "DashConnect App Connect v2")) + } + let nowMilliseconds = milliseconds(now) + let auth = try request.authBindings.enumerated().map { index, binding -> AuthGrant in + if let expiresAt = binding.expiresAt, expiresAt <= nowMilliseconds { + throw Refusal(.invalid, NSLocalizedString( + "The app asks for a key that has already expired.", + comment: "DashConnect App Connect v2")) + } + return AuthGrant( + bindingIndex: index, + binding: binding, + totalBudget: binding.totalBudget.map { min($0, v2BudgetCapCredits) }, + expiresAt: binding.expiresAt.map { min($0, milliseconds(now.addingTimeInterval(v2LifetimeCap))) } + ?? milliseconds(now.addingTimeInterval(v2DefaultLifetime)) + ) + } + let encryption = try request.encryptionBindings.enumerated().map { index, binding -> EncryptionGrant in + // Wallet rule 3: the identity's encryption key for the app lives + // on the app's own contract. + guard binding.contractId == request.appId else { + throw Refusal(.invalid, NSLocalizedString( + "The app asks for an encryption key on a contract other than its own.", + comment: "DashConnect App Connect v2")) + } + return EncryptionGrant(bindingIndex: index, binding: binding) + } + return GrantPlan( + appId: request.appId, + appEphemeralPubKeyHash: try KeyExchangeCrypto.hash160(request.appEphemeralPubKey), + auth: auth, + encryption: encryption, + connectionId: request.connectionId, + identityHint: request.identityHint, + createdAt: request.createdAt, + callbackHost: uri.callback?.host + ) + } + + /// Wallet rule 3, owner consistency, from what the network says: + /// - a contract group must be owned by the owner of `appId`; + /// - a contract, or a document type's contract, must be owned by that + /// owner, unless the document type is on the allowlist; + /// - `appId` must opt in to bounded keys of each encryption purpose asked. + /// + /// `groupOwners` and `contractOwners` map ids to owner ids; an id missing + /// from them does not exist. Returns why the request is refused, or nil. + static func ownershipRefusal( + for plan: GrantPlan, + appOwnerId: Data, + groupOwners: [Data: Data], + contractOwners: [Data: Data], + appBoundedKeyPurposes: Set + ) -> Refusal? { + if systemContractIds.contains(plan.appId.toBase58String()) { + return Refusal(.invalid, NSLocalizedString( + "The request names a Dash Platform system contract as the app.", + comment: "DashConnect App Connect v2")) + } + for grant in plan.auth { + let binding = grant.binding + switch binding.kind { + case .contractGroup: + guard groupOwners[binding.id] == appOwnerId else { + return Refusal(.invalid, NSLocalizedString( + "The app asks for a key on a contract group it does not own.", + comment: "DashConnect App Connect v2")) + } + case .singleContract, .documentType: + if binding.kind == .documentType, + allowedForeignDocumentTypes.contains("\(binding.id.toBase58String())/\(binding.documentTypeName ?? "")") { + continue + } + guard !systemContractIds.contains(binding.id.toBase58String()), + contractOwners[binding.id] == appOwnerId else { + return Refusal(.invalid, NSLocalizedString( + "The app asks for a key on a contract it does not own.", + comment: "DashConnect App Connect v2")) + } + } + } + for grant in plan.encryption where !appBoundedKeyPurposes.contains(grant.keyPurpose) { + return Refusal(.invalid, NSLocalizedString( + "The app's contract does not take encryption keys bound to it.", + comment: "DashConnect App Connect v2")) + } + return nil + } + + // MARK: Keys + + /// The DIP-13 leaf of binding `bindingIndex`'s auth key: + /// `hash256(appEphPub ‖ u8(bindingIndex))`, under the session + /// authentication sub-feature (`…/6'/0'/identityId'/leaf'`). + /// + /// The profile only needs each granted key to be distinct and stable for + /// one request: the app finds the keys on chain and never derives them. + /// Folding the index into the leaf gives that with the SDK's + /// `deriveConnectKey` as it is. Folding it in for binding 0 as well keeps + /// a v2 key apart from the v1 session key of the same ephemeral key. + static func authKeyLeaf(appEphemeralPubKey: Data, bindingIndex: Int) -> Data { + var input = appEphemeralPubKey + input.append(UInt8(truncatingIfNeeded: bindingIndex)) + return Data(SHA256.hash(data: Data(SHA256.hash(data: input)))) + } + + /// An auth key as it is registered: ECDSA_HASH160, as the v1 session key. + static func authIdentityPubkey( + _ grant: AuthGrant, + keyId: UInt32, + publicKeyHash160: Data + ) -> ManagedPlatformWallet.IdentityPubkey { + ManagedPlatformWallet.IdentityPubkey( + keyId: keyId, + keyType: .ecdsaHash160, + purpose: .authentication, + securityLevel: grant.securityLevel, + pubkeyBytes: publicKeyHash160, + contractBounds: grant.contractBounds, + totalBudget: grant.totalBudget, + expiresAt: grant.expiresAt + ) + } + + /// An encryption key as it is registered: ECDSA_SECP256K1 (peers need the + /// point), MEDIUM, bound to the app's contract, with no limits. + static func encryptionIdentityPubkey( + _ grant: EncryptionGrant, + keyId: UInt32, + publicKey: Data + ) -> ManagedPlatformWallet.IdentityPubkey { + ManagedPlatformWallet.IdentityPubkey( + keyId: keyId, + keyType: .ecdsaSecp256k1, + purpose: grant.keyPurpose, + securityLevel: .medium, + pubkeyBytes: publicKey, + contractBounds: .singleContract(id: grant.binding.contractId), + totalBudget: nil, + expiresAt: nil + ) + } + + /// What the identity holds for the app's encryption key of one purpose + /// (wallet rule 7). + enum EncryptionKeyState: Equatable { + /// Its current key is the one this wallet derives: send it again. + case current(keyId: UInt32) + /// It has none: register the one this wallet derives. + case absent + /// Its current key is another wallet's, or the one this wallet + /// derives was disabled: leave the slot out. Replacing it would be a + /// rotation, which orphans what peers encrypted to it; that is an + /// explicit user action, never part of a login. + case notThisWallets + } + + /// Rotation 0 only: the key at DIP-13 `7'` for (identity, contract, + /// purpose). The current key is the newest live one, as + /// `identities.contractKeys` resolves it for the app's + /// `MultipleReferenceToLatest` requirement; this wallet's key is sent + /// only while it is that one. A live key of the purpose whose bound the + /// wallet's store cannot place counts as the app's, so a key of unknown + /// origin is never shadowed by a second one. + static func encryptionKeyState( + derivedPublicKey: Data, + purpose: KeyPurpose, + contractId: Data, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + bindings: [KeyBinding] + ) -> EncryptionKeyState { + let live = currentIdentityPublicKeys.filter { key in + guard key.purpose == purpose, key.disabledAt == nil else { return false } + let keyId = UInt32(bitPattern: key.keyId) + guard let stored = bindings.first(where: { $0.keyId == keyId && $0.data == key.data }), + !stored.hasUnreadableBound else { return true } + return stored.singleContractId == contractId + } + if let latest = live.max(by: { UInt32(bitPattern: $0.keyId) < UInt32(bitPattern: $1.keyId) }), + latest.keyType == .ecdsaSecp256k1, latest.data == derivedPublicKey { + return .current(keyId: UInt32(bitPattern: latest.keyId)) + } + if !live.isEmpty || currentIdentityPublicKeys.contains(where: { $0.data == derivedPublicKey }) { + return .notThisWallets + } + return .absent + } + + /// Wallet rule 8: the live auth keys of this wallet's earlier grants to + /// the app on the same connection, which the new grant replaces in the + /// same identity update. None without a connection id. `keeping` holds + /// the keys the new grant sends again (a retry of the same request). + static func supersededKeyIds( + grants: [AppConnectGrant], + identityId: String, + appId: String, + connectionId: String?, + keeping: Set, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> [UInt32] { + guard let connectionId else { return [] } + let previous = Set(grants + .filter { $0.identityId == identityId && $0.appContractId == appId && $0.connectionId == connectionId } + .flatMap(\.keyIds)) + .subtracting(keeping) + return currentIdentityPublicKeys + .filter { + previous.contains(UInt32(bitPattern: $0.keyId)) && isLiveGrantedKey($0) + } + .map { UInt32(bitPattern: $0.keyId) } + .sorted() + } + + /// A live auth key a login could have granted: HASH160 and never MASTER, + /// so a damaged record cannot get the identity's own keys disabled. + static func isLiveGrantedKey(_ key: ManagedIdentity.IdentityPublicKeyInfo) -> Bool { + key.purpose == .authentication && key.keyType == .ecdsaHash160 + && key.securityLevel != .master && key.disabledAt == nil + } + + /// Whether a key already on the identity at this binding's derived + /// payload can be sent again for it: an earlier answer to the same + /// request (a retry, or an update that landed without confirming). Only + /// this wallet derives that payload, for this request and binding. It + /// still has to be live and carry the level the plan grants, and limits + /// no wider than the plan's (`clockTolerance` covers a clock moved back + /// between two tries). + static func canResendAuthKey( + _ key: ManagedIdentity.IdentityPublicKeyInfo, + for grant: AuthGrant, + now: Date + ) -> Bool { + guard isLiveGrantedKey(key), key.securityLevel == grant.securityLevel, + key.totalBudget == grant.totalBudget, + let expiresAt = key.expiresAt, expiresAt > Int64(milliseconds(now)) else { return false } + return UInt64(expiresAt) <= grant.expiresAt + UInt64(clockTolerance * 1000) + } + + /// `callback` with `ac=` appended, keeping its query. + static func callbackURL(_ callback: URL, status: CallbackStatus) -> URL? { + guard var components = URLComponents(url: callback, resolvingAgainstBaseURL: false) else { return nil } + components.queryItems = (components.queryItems ?? []) + [URLQueryItem(name: "ac", value: status.rawValue)] + return components.url + } + + static func milliseconds(_ date: Date) -> UInt64 { + UInt64(max(0, (date.timeIntervalSince1970 * 1000).rounded())) + } +} diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift index 7ce73f2db2..8a4ffe8bbd 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift @@ -190,6 +190,14 @@ enum DashConnectUri { ) } + /// Whether a `dash-key:` URI asks for request version 2 (`v=2`), and so + /// belongs to `parseAppConnectRequest`. The v1 parser cannot tell: it + /// measures the body before it reads the version. + static func isAppConnectUri(_ uri: String) -> Bool { + guard isKeyUri(uri), let queryIndex = uri.firstIndex(of: "?") else { return false } + return uri[uri.index(after: queryIndex)...].split(separator: "&").contains("v=2") + } + /// Parses a `dash-key:` URI of version 2. A version 1 URI is /// `unsupported` here: it belongs to `parseKeyRequest`. static func parseAppConnectRequest(_ uri: String) throws -> AppConnectUri { diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift new file mode 100644 index 0000000000..6d497b8afc --- /dev/null +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -0,0 +1,512 @@ +import Foundation +import XCTest +@testable import dashpay +@testable import SwiftDashSDK + +/// The App Connect request v2 rules between decoding a request and +/// registering its keys (`AppConnectV2Login.swift`). +final class AppConnectV2LoginTests: XCTestCase { + /// Yappr's published request vector (`vendor/platform-auth/src/app-connect/vectors.json`): + /// a CRITICAL group binding (0.5 DASH, 90 days), a DashPay `profile` + /// binding (0.01 DASH, 90 days), an encryption binding on the app id, + /// a connection id and a callback. + private static let requestUri = "dash-key:2fAANHHASdojyjV9Sqa2wf2nwZE8kLLqmeHpZWa8sBfaGsddVqyMG2ZVte7xJkTKsXvmFYbXzXbNnMo7bJQBxNcf79N8YWi7pLKyb39Rqv6b1KUmxw9UeJGYz2CV9hFGNUQtcyMYVq2Fg6vAxtxpYays61H8gLMcWqaG8TfgGA3H7setGAYiBsM5YmdZgeuCdGAHSwfNfav5cfFjXNDkPWv37UNSgFxj6o58jfXc3kCLKqLJtc5ZPjm1thEGYxK8HVYBi8fRQeEVy76n27DXGrVTyHz94CfJRuMnH76xGYbMgeuvurxjJMLrQgWUu53cjocYyzzNWdJrgs2D5?n=d&v=2&cb=https%3A%2F%2Fyap.pr%2Fconnect%3Fr%3Dd77dc0da9df83a47755a15c42c5d9db9d7a7fd62" + private static let appEphemeralPubKey = Data(hex: "03e83cb927e85f96ae50a95ca3be21cc7a3755139a941b15d99b01af4fecf0d270")! + private static let appId = Data(hex: "f8833c7a2d58ab816c24ae915fe2aa94676588b467ba1e9f2b24c1a3df7fdb78")! + private static let groupId = Data(hex: "b0590e59269c6885acf71d27ddfce85187e2cc9736c42e958127cd35be6d38e8")! + private static let dashpayContractId = Data(hex: "a2a1b4ac6fef22ea2a1a68e8123644b357875f6b412c18109281c146e7b271bc")! + private static let createdAt: UInt64 = 1_791_676_800_000 + private static let expiresAt: UInt64 = 1_799_452_800_000 + private static let appOwner = Data(repeating: 0x0A, count: 32) + private static let dayMilliseconds: UInt64 = 24 * 60 * 60 * 1000 + + private static func date(milliseconds: UInt64) -> Date { + Date(timeIntervalSince1970: TimeInterval(milliseconds) / 1000) + } + + /// One minute after the vector's request was made. + private static let now = date(milliseconds: createdAt + 60_000) + + private static func vectorUri() throws -> AppConnectUri { + try DashConnectUri.parseAppConnectRequest(requestUri) + } + + private static func vectorPlan() throws -> AppConnect.GrantPlan { + try AppConnect.grantPlan(for: vectorUri(), now: now) + } + + /// The vector's request with its bindings replaced. + private static func uri( + authBindings: [AppConnectRequest.AuthBinding], + encryptionBindings: [AppConnectRequest.EncryptionBinding] = [], + createdAt: UInt64 = createdAt + ) -> AppConnectUri { + AppConnectUri( + request: AppConnectRequest( + appEphemeralPubKey: appEphemeralPubKey, + appId: appId, + label: "Yappr", + identityHint: nil, + authBindings: authBindings, + connectionId: nil, + encryptionBindings: encryptionBindings, + isRenewal: false, + createdAt: createdAt), + network: .devnet, + callback: nil) + } + + private static func groupBinding( + level: AppConnectRequest.SecurityLevel = .critical, + budget: UInt64? = 50_000_000_000, + expiresAt: UInt64? = expiresAt + ) -> AppConnectRequest.AuthBinding { + .init(kind: .contractGroup, securityLevel: level, id: groupId, + totalBudget: budget, expiresAt: expiresAt, documentTypeName: nil) + } + + private static func key( + _ keyId: UInt32, + purpose: KeyPurpose = .authentication, + level: SecurityLevel = .high, + type: KeyType = .ecdsaHash160, + data: Data? = nil, + disabled: Bool = false + ) -> ManagedIdentity.IdentityPublicKeyInfo { + ManagedIdentity.IdentityPublicKeyInfo( + keyId: Int32(bitPattern: keyId), + purpose: purpose, + securityLevel: level, + keyType: type, + readOnly: false, + disabledAt: disabled ? 1 : nil, + data: data ?? Data(repeating: UInt8(truncatingIfNeeded: keyId), count: type == .ecdsaSecp256k1 ? 33 : 20), + totalBudget: nil, + expiresAt: nil) + } + + private static func grant( + sessionKeyId: UInt32, + additionalKeyIds: [UInt32]? = nil, + appId: String = "app", + requestHash: String = "aa", + connectionId: String? = nil + ) -> AppConnectGrant { + AppConnectGrant( + identityId: "identity", appContractId: appId, documentId: nil, + values: .init(appEphemeralPubKeyHash: requestHash, walletEphemeralPubKey: "bb", encryptedPayload: "cc"), + sessionKeyId: sessionKeyId, totalBudget: nil, expiresAt: nil, + publishedAt: Date(timeIntervalSince1970: 1_000), + additionalKeyIds: additionalKeyIds, + connectionId: connectionId) + } + + // MARK: - Derivation + + func testEachBindingDerivesFromItsOwnLeafAndTheLeafIsStable() { + let leaves = (0 ..< AppConnectRequest.maxAuthBindings).map { + AppConnect.authKeyLeaf(appEphemeralPubKey: Self.appEphemeralPubKey, bindingIndex: $0) + } + XCTAssertEqual(Set(leaves).count, leaves.count, "every binding gets a distinct key") + XCTAssertTrue(leaves.allSatisfy { $0.count == 32 }) + // A retry of the same request derives the same keys. + XCTAssertEqual( + leaves, + (0 ..< AppConnectRequest.maxAuthBindings).map { + AppConnect.authKeyLeaf(appEphemeralPubKey: Self.appEphemeralPubKey, bindingIndex: $0) + }) + // Never the v1 session key of the same ephemeral key. + XCTAssertFalse(leaves.contains(AppConnect.requestId(appEphemeralPubKey: Self.appEphemeralPubKey))) + // hash256(appEphPub ‖ 0x00) + XCTAssertEqual(leaves[0], hash256(Self.appEphemeralPubKey + Data([0]))) + // Another request derives other keys. + var other = Self.appEphemeralPubKey + other[other.count - 1] ^= 0x01 + XCTAssertNotEqual(AppConnect.authKeyLeaf(appEphemeralPubKey: other, bindingIndex: 0), leaves[0]) + } + + private func hash256(_ data: Data) -> Data { + AppConnect.requestId(appEphemeralPubKey: data) + } + + func testAuthKeysAreRegisteredWithTheirBindingLevelAndLimits() throws { + let plan = try Self.vectorPlan() + let hash = Data(repeating: 0x11, count: 20) + + let group = AppConnect.authIdentityPubkey(plan.auth[0], keyId: 7, publicKeyHash160: hash) + XCTAssertEqual(group.keyId, 7) + XCTAssertEqual(group.keyType, .ecdsaHash160) + XCTAssertEqual(group.purpose, .authentication) + XCTAssertEqual(group.securityLevel, .critical) + XCTAssertEqual(group.pubkeyBytes, hash) + XCTAssertEqual(group.contractBounds, .contractGroup(id: Self.groupId)) + XCTAssertEqual(group.totalBudget, 50_000_000_000) + XCTAssertEqual(group.expiresAt, Self.expiresAt) + + let profile = AppConnect.authIdentityPubkey(plan.auth[1], keyId: 8, publicKeyHash160: hash) + XCTAssertEqual(profile.securityLevel, .high) + XCTAssertEqual( + profile.contractBounds, + .singleContractDocumentType(id: Self.dashpayContractId, documentTypeName: "profile")) + XCTAssertEqual(profile.totalBudget, 1_000_000_000) + XCTAssertEqual(profile.expiresAt, Self.expiresAt) + } + + func testTheEncryptionKeyIsAMediumPointBoundToTheApp() throws { + let plan = try Self.vectorPlan() + let point = Data([0x02] + [UInt8](repeating: 0x44, count: 32)) + let key = AppConnect.encryptionIdentityPubkey(plan.encryption[0], keyId: 9, publicKey: point) + XCTAssertEqual(key.keyType, .ecdsaSecp256k1) + XCTAssertEqual(key.purpose, .encryption) + XCTAssertEqual(key.securityLevel, .medium) + XCTAssertEqual(key.pubkeyBytes, point) + XCTAssertEqual(key.contractBounds, .singleContract(id: Self.appId)) + XCTAssertNil(key.totalBudget) + XCTAssertNil(key.expiresAt) + } + + // MARK: - Plan and limits + + func testThePlanGrantsEveryBindingOfTheVector() throws { + let plan = try Self.vectorPlan() + XCTAssertEqual(plan.appId, Self.appId) + XCTAssertEqual(plan.appEphemeralPubKeyHash.toHexString(), "d77dc0da9df83a47755a15c42c5d9db9d7a7fd62") + XCTAssertEqual(plan.auth.map(\.bindingIndex), [0, 1]) + XCTAssertEqual(plan.auth.map(\.binding.kind), [.contractGroup, .documentType]) + XCTAssertEqual(plan.encryption.map(\.binding.contractId), [Self.appId]) + XCTAssertEqual(plan.connectionId?.toHexString(), "a69b1b4f666681453dec3734667a5ab2") + XCTAssertEqual(plan.callbackHost, "yap.pr") + } + + func testProposalsAboveTheCapsAreClampedAndNoLimitIsDropped() throws { + let tooMuch = Self.groupBinding( + budget: 10 * PlatformCreditsFormatter.creditsPerDash, + expiresAt: Self.createdAt + 2 * 365 * Self.dayMilliseconds) + let plan = try AppConnect.grantPlan(for: Self.uri(authBindings: [tooMuch]), now: Self.now) + XCTAssertEqual(plan.auth[0].totalBudget, AppConnect.v2BudgetCapCredits) + XCTAssertEqual(plan.auth[0].expiresAt, AppConnect.milliseconds(Self.now.addingTimeInterval(AppConnect.v2LifetimeCap))) + } + + func testABindingWithoutLimitsGetsTheDefaultLifetimeAndNoBudget() throws { + let unlimited = AppConnectRequest.AuthBinding( + kind: .singleContract, securityLevel: .high, id: Self.appId, + totalBudget: nil, expiresAt: nil, documentTypeName: nil) + let plan = try AppConnect.grantPlan(for: Self.uri(authBindings: [unlimited]), now: Self.now) + XCTAssertNil(plan.auth[0].totalBudget, "a budget the app did not ask for is not added") + XCTAssertEqual( + plan.auth[0].expiresAt, + AppConnect.milliseconds(Self.now.addingTimeInterval(AppConnect.v2DefaultLifetime))) + } + + func testAProposalBelowTheCapsIsKeptAsItIs() throws { + let plan = try AppConnect.grantPlan(for: Self.uri(authBindings: [Self.groupBinding()]), now: Self.now) + XCTAssertEqual(plan.auth[0].totalBudget, 50_000_000_000) + XCTAssertEqual(plan.auth[0].expiresAt, Self.expiresAt) + } + + // MARK: - Refusals + + func testAStaleOrFutureRequestIsRefusedAsStale() throws { + let uri = try Self.vectorUri() + let late = Self.date(milliseconds: Self.createdAt + 11 * 60_000) + XCTAssertThrowsError(try AppConnect.grantPlan(for: uri, now: late)) { + XCTAssertEqual(($0 as? AppConnect.Refusal)?.status, .stale) + } + let early = Self.date(milliseconds: Self.createdAt - 3 * 60_000) + XCTAssertThrowsError(try AppConnect.grantPlan(for: uri, now: early)) { + XCTAssertEqual(($0 as? AppConnect.Refusal)?.status, .stale) + } + } + + func testAKeyThatWouldAlreadyBeExpiredIsRefused() { + let expired = Self.groupBinding(expiresAt: Self.createdAt) + XCTAssertThrowsError(try AppConnect.grantPlan(for: Self.uri(authBindings: [expired]), now: Self.now)) { + XCTAssertEqual(($0 as? AppConnect.Refusal)?.status, .invalid) + } + } + + func testAnEncryptionKeyOnAnotherContractIsRefused() { + let foreign = AppConnectRequest.EncryptionBinding(contractId: Self.groupId, purpose: .encryption) + XCTAssertThrowsError(try AppConnect.grantPlan( + for: Self.uri(authBindings: [Self.groupBinding()], encryptionBindings: [foreign]), now: Self.now)) { + XCTAssertEqual(($0 as? AppConnect.Refusal)?.status, .invalid) + } + } + + func testBindingsMustBelongToTheAppsOwner() throws { + let plan = try Self.vectorPlan() + let stranger = Data(repeating: 0x0B, count: 32) + func refusal( + groupOwner: Data? = Self.appOwner, + purposes: Set = [.encryption] + ) -> AppConnect.Refusal? { + AppConnect.ownershipRefusal( + for: plan, + appOwnerId: Self.appOwner, + groupOwners: groupOwner.map { [Self.groupId: $0] } ?? [:], + contractOwners: [Self.appId: Self.appOwner], + appBoundedKeyPurposes: purposes) + } + // The group is the app owner's and DashPay `profile` is allowlisted. + XCTAssertNil(refusal()) + XCTAssertEqual(refusal(groupOwner: stranger)?.status, .invalid) + XCTAssertEqual(refusal(groupOwner: nil)?.status, .invalid, "a group that does not exist") + XCTAssertEqual(refusal(purposes: [])?.status, .invalid, "the app does not take bound encryption keys") + } + + func testOnlyDashPayProfileIsAllowedOnAContractTheAppDoesNotOwn() throws { + func plan(_ name: String) throws -> AppConnect.GrantPlan { + try AppConnect.grantPlan(for: Self.uri(authBindings: [ + .init(kind: .documentType, securityLevel: .high, id: Self.dashpayContractId, + totalBudget: nil, expiresAt: nil, documentTypeName: name), + ]), now: Self.now) + } + func refusal(_ plan: AppConnect.GrantPlan) -> AppConnect.Refusal? { + AppConnect.ownershipRefusal( + for: plan, appOwnerId: Self.appOwner, groupOwners: [:], + contractOwners: [Self.dashpayContractId: Data(repeating: 0, count: 32)], + appBoundedKeyPurposes: []) + } + XCTAssertNil(refusal(try plan("profile"))) + XCTAssertEqual(refusal(try plan("contactRequest"))?.status, .invalid) + } + + func testAContractBindingMustBeOnTheAppOwnersContract() throws { + let other = Data(repeating: 0x0C, count: 32) + let plan = try AppConnect.grantPlan(for: Self.uri(authBindings: [ + .init(kind: .singleContract, securityLevel: .high, id: other, + totalBudget: nil, expiresAt: nil, documentTypeName: nil), + ]), now: Self.now) + func refusal(owner: Data) -> AppConnect.Refusal? { + AppConnect.ownershipRefusal( + for: plan, appOwnerId: Self.appOwner, groupOwners: [:], + contractOwners: [other: owner], appBoundedKeyPurposes: []) + } + XCTAssertNil(refusal(owner: Self.appOwner)) + XCTAssertEqual(refusal(owner: Data(repeating: 0x0B, count: 32))?.status, .invalid) + } + + func testASystemContractIsNeverTheAppNorABindingTarget() throws { + let dpns = try XCTUnwrap(Data.identifier(fromBase58: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec")) + // A request naming DPNS as its app, where DPNS's owner would pass as + // the app's owner. + let asApp = AppConnectUri( + request: AppConnectRequest( + appEphemeralPubKey: Self.appEphemeralPubKey, appId: dpns, label: "Yappr", identityHint: nil, + authBindings: [.init(kind: .singleContract, securityLevel: .high, id: dpns, + totalBudget: nil, expiresAt: nil, documentTypeName: nil)], + connectionId: nil, encryptionBindings: [], isRenewal: false, createdAt: Self.createdAt), + network: .devnet, callback: nil) + let appPlan = try AppConnect.grantPlan(for: asApp, now: Self.now) + XCTAssertEqual( + AppConnect.ownershipRefusal( + for: appPlan, appOwnerId: Self.appOwner, groupOwners: [:], + contractOwners: [dpns: Self.appOwner], appBoundedKeyPurposes: [])?.status, + .invalid) + // A binding on DPNS from an app whose owner also owns DPNS's record. + let bindingPlan = try AppConnect.grantPlan(for: Self.uri(authBindings: [ + .init(kind: .documentType, securityLevel: .high, id: dpns, + totalBudget: nil, expiresAt: nil, documentTypeName: "domain"), + ]), now: Self.now) + XCTAssertEqual( + AppConnect.ownershipRefusal( + for: bindingPlan, appOwnerId: Self.appOwner, groupOwners: [:], + contractOwners: [dpns: Self.appOwner], appBoundedKeyPurposes: [])?.status, + .invalid) + } + + // MARK: - Re-sending an auth key + + func testAKeyOnTheIdentityIsSentAgainOnlyWithinThePlansTerms() throws { + let plan = try Self.vectorPlan() + let group = plan.auth[0] + func key(level: SecurityLevel = .critical, budget: UInt64? = 50_000_000_000, + expiresAt: UInt64? = Self.expiresAt, disabled: Bool = false) -> ManagedIdentity.IdentityPublicKeyInfo { + ManagedIdentity.IdentityPublicKeyInfo( + keyId: 7, purpose: .authentication, securityLevel: level, keyType: .ecdsaHash160, readOnly: false, + disabledAt: disabled ? 1 : nil, data: Data(repeating: 7, count: 20), + totalBudget: budget, expiresAt: expiresAt.map { Int64($0) }) + } + XCTAssertTrue(AppConnect.canResendAuthKey(key(), for: group, now: Self.now)) + XCTAssertFalse(AppConnect.canResendAuthKey(key(disabled: true), for: group, now: Self.now)) + XCTAssertFalse(AppConnect.canResendAuthKey(key(level: .high), for: group, now: Self.now)) + XCTAssertFalse(AppConnect.canResendAuthKey(key(budget: 60_000_000_000), for: group, now: Self.now)) + XCTAssertFalse(AppConnect.canResendAuthKey(key(budget: nil), for: group, now: Self.now)) + XCTAssertFalse( + AppConnect.canResendAuthKey(key(expiresAt: Self.expiresAt + 2 * Self.dayMilliseconds), for: group, now: Self.now)) + XCTAssertFalse( + AppConnect.canResendAuthKey(key(), for: group, now: Self.date(milliseconds: Self.expiresAt + 1)), + "an expired key cannot sign") + } + + // MARK: - Encryption key (wallet rule 7) + + private static let derivedPoint = Data([0x03] + [UInt8](repeating: 0x55, count: 32)) + + private func encryptionState( + _ keys: [ManagedIdentity.IdentityPublicKeyInfo], + bindings: [AppConnect.KeyBinding] + ) -> AppConnect.EncryptionKeyState { + AppConnect.encryptionKeyState( + derivedPublicKey: Self.derivedPoint, + purpose: .encryption, + contractId: Self.appId, + currentIdentityPublicKeys: keys, + bindings: bindings) + } + + private static func encryptionKey(_ keyId: UInt32, data: Data, disabled: Bool = false) -> ManagedIdentity.IdentityPublicKeyInfo { + key(keyId, purpose: .encryption, level: .medium, type: .ecdsaSecp256k1, data: data, disabled: disabled) + } + + func testTheCurrentKeyIsSentAgainWhenThisWalletMadeIt() { + let mine = Self.encryptionKey(5, data: Self.derivedPoint) + XCTAssertEqual( + encryptionState([mine], bindings: [.init(keyId: 5, data: Self.derivedPoint, singleContractId: Self.appId)]), + .current(keyId: 5)) + } + + func testTheKeyIsRegisteredWhenTheIdentityHasNoneForTheApp() { + let elsewhere = Self.encryptionKey(5, data: Data(repeating: 0x66, count: 33)) + let other = Data(repeating: 0x0C, count: 32) + XCTAssertEqual(encryptionState([], bindings: []), .absent) + // A key bound to another contract is not the app's. + XCTAssertEqual( + encryptionState([elsewhere], bindings: [.init(keyId: 5, data: elsewhere.data, singleContractId: other)]), + .absent) + } + + func testAnotherWalletsKeyIsNeitherSentNorReplaced() { + let theirs = Self.encryptionKey(5, data: Data(repeating: 0x66, count: 33)) + XCTAssertEqual( + encryptionState([theirs], bindings: [.init(keyId: 5, data: theirs.data, singleContractId: Self.appId)]), + .notThisWallets) + // Nor one whose bound the store cannot place. + XCTAssertEqual(encryptionState([theirs], bindings: []), .notThisWallets) + // Rotating is never part of a login: a disabled key of this wallet's + // cannot be added again, and is not replaced either. + let disabledMine = Self.encryptionKey(6, data: Self.derivedPoint, disabled: true) + XCTAssertEqual( + encryptionState([disabledMine], bindings: [.init(keyId: 6, data: Self.derivedPoint, singleContractId: Self.appId)]), + .notThisWallets) + } + + func testThisWalletsKeyIsNotSentOnceANewerKeyIsCurrent() { + let mine = Self.encryptionKey(5, data: Self.derivedPoint) + let newer = Self.encryptionKey(9, data: Data(repeating: 0x66, count: 33)) + XCTAssertEqual( + encryptionState([mine, newer], bindings: [ + .init(keyId: 5, data: Self.derivedPoint, singleContractId: Self.appId), + .init(keyId: 9, data: newer.data, singleContractId: Self.appId), + ]), + .notThisWallets) + } + + // MARK: - Supersession (wallet rule 8) + + func testALoginReplacesTheLiveKeysOfTheSameConnectionOnly() { + let grants = [ + Self.grant(sessionKeyId: 10, additionalKeyIds: [11], connectionId: "c1"), + Self.grant(sessionKeyId: 20, additionalKeyIds: [21], requestHash: "bb", connectionId: "c2"), + Self.grant(sessionKeyId: 30, appId: "other", connectionId: "c1"), + ] + let keys = [ + Self.key(0, level: .master), Self.key(10, level: .critical), Self.key(11), Self.key(20), Self.key(21), + Self.key(30), + ] + func superseded(_ connectionId: String?, keeping: Set = []) -> [UInt32] { + AppConnect.supersededKeyIds( + grants: grants, identityId: "identity", appId: "app", connectionId: connectionId, + keeping: keeping, currentIdentityPublicKeys: keys) + } + XCTAssertEqual(superseded("c1"), [10, 11]) + XCTAssertEqual(superseded("c2"), [20, 21]) + XCTAssertEqual(superseded(nil), [], "without a connection id nothing is replaced") + XCTAssertEqual(superseded("c3"), []) + // A retry of the same request keeps the keys it sends again. + XCTAssertEqual(superseded("c1", keeping: [10, 11]), []) + } + + func testSupersessionSkipsKeysThatAreOffOrNotAppKeys() { + let grants = [Self.grant(sessionKeyId: 0, additionalKeyIds: [1, 2, 3], connectionId: "c1")] + let keys = [ + Self.key(0, level: .master), + Self.key(1, disabled: true), + Self.key(2, purpose: .transfer, level: .critical), + Self.key(3), + ] + XCTAssertEqual( + AppConnect.supersededKeyIds( + grants: grants, identityId: "identity", appId: "app", connectionId: "c1", + keeping: [], currentIdentityPublicKeys: keys), + [3], "a damaged record never gets the identity's own keys disabled") + } + + // MARK: - Disconnect and the grant record + + func testADisconnectDisablesEveryAuthKeyOfAV2Grant() { + let grant = Self.grant(sessionKeyId: 7, additionalKeyIds: [8]) + let encryption = Self.encryptionKey(9, data: Self.derivedPoint) + let keys = [Self.key(0, level: .master), Self.key(7, level: .critical), Self.key(8), encryption] + XCTAssertEqual( + AppConnect.sessionKeyIdsToDisable( + for: [grant], appContractId: Self.appId, + bindings: [.init(keyId: 9, data: Self.derivedPoint, singleContractId: Self.appId)], + currentIdentityPublicKeys: keys), + [7, 8], "the group key and the profile key go; the shared encryption key stays") + XCTAssertEqual( + AppConnect.sessionKeyIdsMissing(from: [Self.key(7, level: .critical)], for: [grant]), + [8]) + } + + func testAGrantRecordWithoutTheV2FieldsStillReads() throws { + let stored = """ + {"identityId":"identity","appContractId":"app","values":{"appEphemeralPubKeyHash":"aa",\ + "walletEphemeralPubKey":"bb","encryptedPayload":"cc"},"sessionKeyId":6,"publishedAt":1000} + """ + let decoder = JSONDecoder() + decoder.dateDecodingStrategy = .millisecondsSince1970 + let grant = try decoder.decode(AppConnectGrant.self, from: Data(stored.utf8)) + XCTAssertNil(grant.additionalKeyIds) + XCTAssertNil(grant.connectionId) + XCTAssertEqual(grant.keyIds, [6]) + + let v2 = Self.grant(sessionKeyId: 7, additionalKeyIds: [8, 9], connectionId: "c1") + let encoder = JSONEncoder() + encoder.dateEncodingStrategy = .millisecondsSince1970 + let roundTripped = try decoder.decode(AppConnectGrant.self, from: encoder.encode(v2)) + XCTAssertEqual(roundTripped.keyIds, [7, 8, 9]) + XCTAssertEqual(roundTripped.connectionId, "c1") + } + + // MARK: - URI and callback + + func testOnlyAVersionTwoKeyUriIsAnAppConnectRequest() { + XCTAssertTrue(DashConnectUri.isAppConnectUri(Self.requestUri)) + XCTAssertFalse(DashConnectUri.isAppConnectUri("dash-key:abc?n=d&v=1")) + XCTAssertFalse(DashConnectUri.isAppConnectUri("dash-st:abc?n=d&v=2")) + XCTAssertFalse(DashConnectUri.isAppConnectUri("dash-key:abc?n=d&v=22")) + } + + func testTheCallbackKeepsItsQueryAndAddsTheStatus() throws { + let callback = try XCTUnwrap(Self.vectorUri().callback) + XCTAssertEqual( + AppConnect.callbackURL(callback, status: .ok)?.absoluteString, + "https://yap.pr/connect?r=d77dc0da9df83a47755a15c42c5d9db9d7a7fd62&ac=ok") + XCTAssertEqual( + AppConnect.callbackURL(try XCTUnwrap(URL(string: "https://yap.pr/connect")), status: .declined)?.absoluteString, + "https://yap.pr/connect?ac=declined") + } + + func testARefusalKeepsTheDecodersStatus() { + XCTAssertEqual(AppConnect.Refusal(.unsupported("binding kind 3")).status, .unsupported) + XCTAssertEqual(AppConnect.Refusal(.invalid("label")).status, .invalid) + } + + func testOnlyAGrantPlanOrAKnownLoginCanBeApproved() throws { + XCTAssertTrue(AppConnect.Login.appConnect(try Self.vectorPlan()).isApprovable) + XCTAssertTrue(AppConnect.Login.twoQR.isApprovable) + XCTAssertFalse(AppConnect.Login.unresolved.isApprovable) + XCTAssertFalse(AppConnect.Login.refused(.init(.stale, "old")).isApprovable) + } +} From f7ca95a19632d3417e25bc5889190c7118ee4a42 Mon Sep 17 00:00:00 2001 From: pasta Date: Tue, 13 Oct 2026 15:33:21 -0500 Subject: [PATCH 021/108] refactor(dashpay): publish an App Connect response through one helper Moves the tail of the one-QR approval (record check, delete of earlier responses, publish, settling an unconfirmed publish) into publishAppConnectResponse so the v2 login can share it. No behaviour change. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 7928db9135..c9e1d423f5 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -906,6 +906,31 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { rows.filter { $0.id != connection.id } + [connection] } + try await publishAppConnectResponse( + grant: grant, + appEphemeralPubKeyHash: sealed.appEphemeralPubKeyHash, + responseContractId: responseContractId, + context: context, + signer: signer + ) + return connection + } + + /// Publishes the response a grant records, once its keys are on the + /// identity and the grant and its connection row are recorded. Shared by + /// the one-QR login and App Connect request v2. + private func publishAppConnectResponse( + grant: AppConnectGrant, + appEphemeralPubKeyHash: Data, + responseContractId: Data, + context: Context, + signer: KeychainSigner + ) async throws { + let stores = context.stores + let identityId = grant.identityId + let appContractId = grant.appContractId + let requestHash = grant.values.appEphemeralPubKeyHash + // The store was writable when the login started. If the record did // not land all the same, a response published now could not be found // again. The key is live, so the row above stays: a disconnect finds @@ -919,7 +944,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // when its own request comes back. guard !grant.hasDeletableResponse else { Self.logger.info("🔗 DASHCONNECT :: response already published for this request") - return connection + return } // Besides this app's earlier responses, this takes whatever an earlier @@ -963,7 +988,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // or that cannot be told, the failure stands. guard let published = try? await findAppConnectResponse( ownerIdentityId: context.identityId, - appEphemeralPubKeyHash: sealed.appEphemeralPubKeyHash, + appEphemeralPubKeyHash: appEphemeralPubKeyHash, responseContractId: responseContractId, sdk: context.sdk ) else { @@ -979,7 +1004,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { grants[index].documentId = documentId.toBase58String() grants[index].values = publishedValues } - return connection } /// This identity's response to one request, with the values it has on From 5b207d328bf218b48cdbf8257e178f83e56e9df9 Mon Sep 17 00:00:00 2001 From: pasta Date: Tue, 13 Oct 2026 15:33:21 -0500 Subject: [PATCH 022/108] feat(dashpay): answer App Connect request v2 in the login flow A v=2 dash-key: request now reaches the approval sheet instead of being refused. Building the sheet settles the grant plan and checks it against Platform (contract and group owners, the identity hint). Approving it derives one key per binding, settles the app's encryption key, and in one MASTER-signed identity update adds the new keys and disables this connection's previous grant. It then records the grant and publishes the sealed response (one slot per key) to the App Connect contract. A key already on the identity at a binding's derived payload is sent again only within the plan's level and limits; an update that lands without confirming is settled by re-reading the identity. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 390 +++++++++++++++++- .../Protocol/DashConnectRequests.swift | 3 + 2 files changed, 390 insertions(+), 3 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index c9e1d423f5..808095a6d4 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -509,6 +509,22 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func parseQR(_ content: String) async throws -> DashConnectQr { let trimmed = content.trimmingCharacters(in: .whitespacesAndNewlines) + if DashConnectUri.isAppConnectUri(trimmed) { + let uri: AppConnectUri + do { + uri = try DashConnectUri.parseAppConnectRequest(trimmed) + } catch let error as AppConnectRequestError { + throw AppConnect.Refusal(error) + } + try validateNetwork(uri.network) + return .login(DashKeyRequest( + appEphemeralPubKey: uri.request.appEphemeralPubKey, + contractId: uri.request.appId, + label: uri.request.label, + network: uri.network, + appConnect: uri)) + } + if DashConnectUri.isKeyUri(trimmed) { let request = try DashConnectUri.parseKeyRequest(trimmed) try validateNetwork(request.network) @@ -562,6 +578,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { protocolVersion = nil unresolvedLoginReason = error.localizedDescription } + var login = protocolVersion.map(AppConnect.login(protocolVersion:)) ?? .unresolved + if let appConnect = loginRequest.appConnect, let protocolVersion { + (login, unresolvedLoginReason) = await appConnectLogin( + appConnect, protocolVersion: protocolVersion, context: context) + } return ConnectionRequest( loginRequest: loginRequest, @@ -570,7 +591,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { walletUsername: walletUsername, walletIdentityId: context.identityId.toBase58String(), existingConnection: existingConnection, - login: protocolVersion.map(AppConnect.login(protocolVersion:)) ?? .unresolved, + login: login, unresolvedLoginReason: unresolvedLoginReason ) } @@ -592,6 +613,87 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } + /// The login a v2 request gets: its grant plan once the request is fresh, + /// meant for this identity, and every contract and group it names belongs + /// to the app's owner; otherwise why it is refused. Unresolved, with the + /// reason, when the network could not be asked. + private func appConnectLogin( + _ uri: AppConnectUri, + protocolVersion: UInt32, + context: Context + ) async -> (AppConnect.Login, String?) { + guard AppConnect.isAvailable(protocolVersion: protocolVersion) else { + return (.refused(AppConnect.Refusal(.unsupported, NSLocalizedString( + "This network does not support this kind of sign-in yet.", + comment: "DashConnect App Connect v2"))), nil) + } + do { + let plan = try AppConnect.grantPlan(for: uri, now: now()) + if let hint = plan.identityHint, hint != context.identityId { + return (.refused(AppConnect.Refusal(.invalid, NSLocalizedString( + "This sign-in is for another identity. Switch to it in this wallet and ask the app again.", + comment: "DashConnect App Connect v2"))), nil) + } + if let refusal = try await appConnectOwnershipRefusal(plan, sdk: context.sdk) { + return (.refused(refusal), nil) + } + return (.appConnect(plan), nil) + } catch let refusal as AppConnect.Refusal { + return (.refused(refusal), nil) + } catch { + Self.logger.error("🔗 DASHCONNECT :: App Connect request not checked — \(error.localizedDescription, privacy: .public)") + return (.unresolved, error.localizedDescription) + } + } + + /// Reads the owners wallet rule 3 compares from Platform. A group the + /// network proves absent counts as not the app's; any other failure to + /// read throws, so the sheet offers to try again. + private func appConnectOwnershipRefusal(_ plan: AppConnect.GrantPlan, sdk: SDK) async throws -> AppConnect.Refusal? { + func ownerId(of contract: [String: Any]) -> Data? { + (contract["ownerId"] as? String ?? contract["$ownerId"] as? String).flatMap(Self.decodeIdentifier) + } + let app = try await sdk.dataContractGet(id: plan.appId.toBase58String()) + guard let appOwnerId = ownerId(of: app) else { + return AppConnect.Refusal(.invalid, NSLocalizedString( + "The app's contract has no readable owner.", comment: "DashConnect App Connect v2")) + } + var groupOwners: [Data: Data] = [:] + var contractOwners: [Data: Data] = [plan.appId: appOwnerId] + for grant in plan.auth { + let id = grant.binding.id + switch grant.binding.kind { + case .contractGroup: + guard groupOwners[id] == nil else { continue } + do { + let info = try await sdk.getContractGroupInfo(contractGroupId: id.toBase58String()) + groupOwners[id] = (info["ownerId"] as? String).flatMap(Self.decodeIdentifier) + } catch SDKError.notFound { + continue + } + case .singleContract, .documentType: + let name = grant.binding.documentTypeName ?? "" + guard contractOwners[id] == nil, + !AppConnect.allowedForeignDocumentTypes.contains("\(id.toBase58String())/\(name)") else { continue } + contractOwners[id] = ownerId(of: try await sdk.dataContractGet(id: id.toBase58String())) + } + } + let config = app["config"] as? [String: Any] ?? [:] + var boundedKeyPurposes: Set = [] + if config["requiresIdentityEncryptionBoundedKey"].map({ !($0 is NSNull) }) == true { + boundedKeyPurposes.insert(.encryption) + } + if config["requiresIdentityDecryptionBoundedKey"].map({ !($0 is NSNull) }) == true { + boundedKeyPurposes.insert(.decryption) + } + return AppConnect.ownershipRefusal( + for: plan, + appOwnerId: appOwnerId, + groupOwners: groupOwners, + contractOwners: contractOwners, + appBoundedKeyPurposes: boundedKeyPurposes) + } + func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { try await gated { try await approveLoginInTurn(request, consent: consent) } } @@ -603,7 +705,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: approveLogin started") try validateNetwork(request.network) await showActiveWalletRows() - guard consent.appContractId == request.contractId.toBase58String(), consent.login != .unresolved else { + guard consent.appContractId == request.contractId.toBase58String(), consent.login.isApprovable else { throw DashConnectPlatformError.approvalOutOfDate } @@ -634,7 +736,21 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // for the identity that was on the sheet: it has to be the active // one here, and again after the PIN prompt. let login = AppConnect.login(protocolVersion: protocolVersion) - guard consent.login == login, + // A v2 request was approved with the plan the sheet showed. It has + // to be the plan for this request, and the network has to still take + // App Connect. + let approvedLogin: Bool + if let appConnect = request.appConnect { + guard let plan = consent.login.grantPlan else { + throw DashConnectPlatformError.approvalOutOfDate + } + let requestHash = try KeyExchangeCrypto.hash160(appConnect.request.appEphemeralPubKey) + approvedLogin = AppConnect.isAvailable(protocolVersion: protocolVersion) + && plan.appEphemeralPubKeyHash == requestHash + } else { + approvedLogin = consent.login == login + } + guard approvedLogin, consent.walletIdentityId == context.identityId.toBase58String() else { Self.logger.error("🔗 DASHCONNECT :: the approved sign-in no longer matches the network or the identity") throw DashConnectPlatformError.approvalOutOfDate @@ -653,6 +769,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } catch DashConnectPlatformError.walletChanged { throw DashConnectPlatformError.approvalOutOfDate } + if let appConnect = request.appConnect, let plan = consent.login.grantPlan { + Self.logger.info("🔗 DASHCONNECT :: authorized; App Connect request v2") + return try await approveAppConnectV2Login(appConnect, plan: plan, consent: consent, context: context) + } if let terms = login.sessionKeyTerms { Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") return try await approveAppConnectLogin(request, terms: terms, context: context) @@ -1006,6 +1126,270 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } + /// App Connect request v2 (Yappr `docs/APP_CONNECT_PROFILE.md`): one key + /// per auth binding, the identity's encryption key for the app, and the + /// previous grant on the same connection disabled, all in one + /// MASTER-signed identity update; then the grant and the connection row + /// are recorded and the sealed response is published, as for the one-QR + /// login. + /// + /// Approving the same request again finds its keys registered and + /// recorded, registers nothing and publishes the recorded response if it + /// is not on Platform yet. + private func approveAppConnectV2Login( + _ uri: AppConnectUri, + plan: AppConnect.GrantPlan, + consent: ConnectionRequest, + context: Context + ) async throws -> DAppConnection { + guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { + throw DashConnectPlatformError.loginContractUnavailable + } + let stores = context.stores + guard stores.grants.canPersist else { + throw DashConnectPlatformError.grantStoreUnavailable + } + // The app stops looking for an answer ten minutes after it asked. + guard uri.request.age(now: now()) == .fresh else { + throw AppConnect.Refusal(.stale, NSLocalizedString( + "This sign-in request has expired. Ask the app for a new one.", + comment: "DashConnect App Connect v2")) + } + let request = uri.request + let identityId = context.identityId.toBase58String() + let appId = plan.appId.toBase58String() + let requestHash = plan.appEphemeralPubKeyHash.toHexString() + let connectionId = plan.connectionId?.toHexString() + func isGrantForRequest(_ grant: AppConnectGrant) -> Bool { + grant.identityId == identityId && grant.appContractId == appId + && grant.values.appEphemeralPubKeyHash == requestHash + } + + // `deriveConnectKey` is main-actor isolated in the SDK. Only the two + // buffers leave the closure, so the arrays below own the private keys + // and the deferred wipe reaches the real bytes. + var authKeys: [(publicKeyHash160: Data, privateKey: Data)] = [] + var encryptionKeys: [(publicKey: Data, privateKey: Data)] = [] + defer { + for index in authKeys.indices { Self.zero(&authKeys[index].privateKey) } + for index in encryptionKeys.indices { Self.zero(&encryptionKeys[index].privateKey) } + } + for grant in plan.auth { + let leaf = AppConnect.authKeyLeaf( + appEphemeralPubKey: request.appEphemeralPubKey, bindingIndex: grant.bindingIndex) + let (publicKey, privateKey) = try await MainActor.run { + let key = try context.wallet.deriveConnectKey( + subFeature: .sessionAuthentication, + identityId: context.identityId, + leaf: leaf, + network: context.network + ) + return (key.publicKeyData, key.privateKeyData) + } + authKeys.append((try KeyExchangeCrypto.hash160(publicKey), privateKey)) + } + for grant in plan.encryption { + encryptionKeys.append(try await MainActor.run { + let key = try context.wallet.deriveConnectKey( + subFeature: .appEncryption, + identityId: context.identityId, + leaf: grant.binding.contractId, + purpose: grant.connectPurpose, + network: context.network + ) + return (key.publicKeyData, key.privateKeyData) + }) + } + + let signer = KeychainSigner(modelContainer: context.modelContainer) + let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) + let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + + // An auth key already on the identity is this request answered + // before: only this wallet derives it, for this request and binding. + // It is sent again while it can still sign within the plan's terms; + // Platform never re-adds a key, so otherwise the app has to ask again. + var authKeyIds: [UInt32?] = try zip(plan.auth, authKeys).map { grant, key in + guard let existing = currentPublicKeys.first(where: { + $0.keyType == .ecdsaHash160 && $0.data == key.publicKeyHash160 + }) else { return nil } + guard AppConnect.canResendAuthKey(existing, for: grant, now: now()) else { + throw DashConnectPlatformError.sessionKeyUnusable + } + return UInt32(bitPattern: existing.keyId) + } + // A grant already recorded for this request must name exactly these + // keys: its response carries them. + let reused = Set(authKeyIds.compactMap { $0 }) + if !reused.isEmpty, let recorded = stores.grants.load().first(where: isGrantForRequest), + Set(recorded.keyIds) != reused || authKeyIds.contains(nil) { + throw DashConnectPlatformError.sessionKeyUnusable + } + + // Wallet rule 7: re-send the identity's key for the app when this + // wallet made it, register it when there is none, leave it out when + // another wallet made it. + var encryptionSlots: [(keyIndex: Int, keyId: UInt32?)] = [] + for (index, grant) in plan.encryption.enumerated() { + switch AppConnect.encryptionKeyState( + derivedPublicKey: encryptionKeys[index].publicKey, + purpose: grant.keyPurpose, + contractId: grant.binding.contractId, + currentIdentityPublicKeys: currentPublicKeys, + bindings: bindings + ) { + case .current(let keyId): + encryptionSlots.append((index, keyId)) + case .absent: + encryptionSlots.append((index, nil)) + case .notThisWallets: + Self.logger.info("🔗 DASHCONNECT :: the app's encryption key on this identity is not this wallet's; slot left out") + } + } + + // Wallet rule 8: this connection's previous grant goes in the same + // update. A key of it the fetched list lacks means the list is + // behind, and it could not be shown to be off. + func isSuperseded(_ grant: AppConnectGrant) -> Bool { + connectionId != nil && grant.identityId == identityId && grant.appContractId == appId + && grant.connectionId == connectionId && !isGrantForRequest(grant) + } + let superseded = stores.grants.load().filter(isSuperseded) + guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: superseded).isEmpty else { + throw DashConnectPlatformError.identityKeysOutOfDate + } + let disable = Array(AppConnect.supersededKeyIds( + grants: superseded, + identityId: identityId, + appId: appId, + connectionId: connectionId, + keeping: reused, + currentIdentityPublicKeys: currentPublicKeys + ).prefix(AppConnect.maxKeysDisabledPerUpdate)) + // The grants whose every key is off once the update lands. + let liveAfterUpdate = Set(currentPublicKeys.filter(AppConnect.isLiveGrantedKey) + .map { UInt32(bitPattern: $0.keyId) }).subtracting(disable) + let retiredGrantKeys = Set(superseded.filter { !$0.keyIds.contains(where: liveAfterUpdate.contains) }.map(\.key)) + + guard var nextKeyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) else { + throw DashConnectPlatformError.noFreeKeyId + } + var add: [ManagedPlatformWallet.IdentityPubkey] = [] + var signingKeys: [(publicKey: Data, privateKey: Data)] = [] + for (index, grant) in plan.auth.enumerated() where authKeyIds[index] == nil { + add.append(AppConnect.authIdentityPubkey( + grant, keyId: nextKeyId, publicKeyHash160: authKeys[index].publicKeyHash160)) + signingKeys.append((authKeys[index].publicKeyHash160, authKeys[index].privateKey)) + authKeyIds[index] = nextKeyId + nextKeyId += 1 + } + for slot in encryptionSlots.indices where encryptionSlots[slot].keyId == nil { + let keyIndex = encryptionSlots[slot].keyIndex + add.append(AppConnect.encryptionIdentityPubkey( + plan.encryption[keyIndex], keyId: nextKeyId, publicKey: encryptionKeys[keyIndex].publicKey)) + signingKeys.append((encryptionKeys[keyIndex].publicKey, encryptionKeys[keyIndex].privateKey)) + encryptionSlots[slot].keyId = nextKeyId + nextKeyId += 1 + } + defer { for index in signingKeys.indices { Self.zero(&signingKeys[index].privateKey) } } + + if !add.isEmpty || !disable.isEmpty { + Self.logger.info( + "🔗 DASHCONNECT :: registering \(add.count, privacy: .public) key(s), disabling \(disable.count, privacy: .public)") + do { + try await signer.withAdditionalSigningKeys(signingKeys) { + try await context.wallet.updateIdentity( + identityId: context.identityId, + addPublicKeys: add, + disablePublicKeyIds: disable, + signer: signer + ) + } + } catch { + // An update can land without confirming, and the node asked + // next may not have it yet. If every new key shows up and + // every replaced key is off, it went through. + func landed(_ keys: [ManagedIdentity.IdentityPublicKeyInfo]) -> Bool { + add.allSatisfy { new in keys.contains { + UInt32(bitPattern: $0.keyId) == new.keyId && $0.data == new.pubkeyBytes && $0.disabledAt == nil + } } && disable.allSatisfy { id in keys.contains { + UInt32(bitPattern: $0.keyId) == id && $0.disabledAt != nil + } } + } + var confirmed = false + for attempt in 0 ..< 3 where !confirmed { + if attempt > 0 { try? await Task.sleep(nanoseconds: 3_000_000_000) } + if let refreshed = try? await refreshedIdentityPublicKeys(context: context) { + confirmed = landed(refreshed) + } + } + guard confirmed else { throw error } + Self.logger.info("🔗 DASHCONNECT :: the identity update landed without confirming") + } + Self.logger.info("🔗 DASHCONNECT :: identity updated") + } + + // Slots: the auth keys in request order, then the encryption keys + // that are sent. + var slots = authKeys.map(\.privateKey) + encryptionSlots.map { encryptionKeys[$0.keyIndex].privateKey } + defer { for index in slots.indices { Self.zero(&slots[index]) } } + var walletEphemeralPrivateKey = try Self.generateEphemeralPrivateKey() + defer { Self.zero(&walletEphemeralPrivateKey) } + let values = AppConnect.ResponseValues( + appEphemeralPubKeyHash: requestHash, + walletEphemeralPubKey: try Secp256k1.compressedPublicKey(privateKey: walletEphemeralPrivateKey).toHexString(), + encryptedPayload: try KeyExchangeCrypto.encryptAppConnectSlots( + slots, + walletEphemeralPriv: walletEphemeralPrivateKey, + appEphemeralPub: request.appEphemeralPubKey, + ownerId: context.identityId + ).toHexString() + ) + + // From here the keys are on the identity. Record them, and show the + // connection, before anything else can fail. The grants this one + // replaces are done: their keys are off. A grant already recorded + // for this request keeps its values: if an earlier publish landed + // without confirming, those are the ones on Platform. + let grantedKeyIds = authKeyIds.compactMap { $0 } + let primary = plan.auth[0] + let grant = updateGrants(in: stores) { grants -> AppConnectGrant in + AppConnect.markKeysDisabled(in: &grants) { retiredGrantKeys.contains($0.key) } + if let existing = grants.first(where: { isGrantForRequest($0) && $0.sessionKeyId == grantedKeyIds[0] }) { + return existing + } + let new = AppConnectGrant( + identityId: identityId, + appContractId: appId, + documentId: nil, + values: values, + sessionKeyId: grantedKeyIds[0], + totalBudget: primary.totalBudget, + expiresAt: primary.expiresAt, + publishedAt: now(), + additionalKeyIds: Array(grantedKeyIds.dropFirst()), + connectionId: connectionId + ) + grants.append(new) + return new + } + + let connection = Self.makeConnection( + preview: consent, status: .active, updatedAt: now(), loginKind: .oneQR) + await updateRows(in: stores) { rows in + rows.filter { $0.id != connection.id } + [connection] + } + + try await publishAppConnectResponse( + grant: grant, + appEphemeralPubKeyHash: plan.appEphemeralPubKeyHash, + responseContractId: responseContractId, + context: context, + signer: signer + ) + return connection + } + /// This identity's response to one request, with the values it has on /// Platform, or `nil` when there is none; a failed lookup or a response /// that cannot be read throws. diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift index 50682e4532..71f62bad84 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift @@ -13,6 +13,9 @@ struct DashKeyRequest: Equatable { /// not be treated as a verified app identity. let label: String let network: DashConnectNetwork + /// Set for an App Connect request v2; the fields above are taken from it + /// (`contractId` is its `appId`). + var appConnect: AppConnectUri? = nil } /// A `dash-key:` URI carrying an App Connect request v2. From 8290134e04b28132e4a01c4a76002f106e5eff69 Mon Sep 17 00:00:00 2001 From: pasta Date: Tue, 13 Oct 2026 15:33:21 -0500 Subject: [PATCH 023/108] feat(dashpay): show a v2 sign-in's keys and return to the app The approval sheet lists each key the app is given with what it can do, its budget and its expiry, plus how old the request is and where the wallet returns. A refused request shows why, with nothing to approve. After the user answers, the wallet opens the request's callback with ac=ok, declined or failed. A refused request's callback is never opened. The new strings are in every catalog in English. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/ApproveConnectionSheet.swift | 159 ++++++++++++++++-- .../UI/DashConnect/ConnectionsScreen.swift | 2 +- .../UI/DashConnect/ConnectionsViewModel.swift | 37 +++- DashWallet/ar.lproj/Localizable.strings | 27 +++ DashWallet/bg.lproj/Localizable.strings | 27 +++ DashWallet/ca.lproj/Localizable.strings | 27 +++ DashWallet/cs.lproj/Localizable.strings | 27 +++ DashWallet/da.lproj/Localizable.strings | 27 +++ DashWallet/de.lproj/Localizable.strings | 27 +++ DashWallet/el.lproj/Localizable.strings | 27 +++ DashWallet/en.lproj/Localizable.strings | 27 +++ DashWallet/eo.lproj/Localizable.strings | 27 +++ DashWallet/es.lproj/Localizable.strings | 27 +++ DashWallet/et.lproj/Localizable.strings | 27 +++ DashWallet/fa.lproj/Localizable.strings | 27 +++ DashWallet/fi.lproj/Localizable.strings | 27 +++ DashWallet/fil.lproj/Localizable.strings | 27 +++ DashWallet/fr.lproj/Localizable.strings | 27 +++ DashWallet/hr.lproj/Localizable.strings | 27 +++ DashWallet/hu.lproj/Localizable.strings | 27 +++ DashWallet/id.lproj/Localizable.strings | 27 +++ DashWallet/it.lproj/Localizable.strings | 27 +++ DashWallet/ja.lproj/Localizable.strings | 27 +++ DashWallet/ko.lproj/Localizable.strings | 27 +++ DashWallet/mk.lproj/Localizable.strings | 27 +++ DashWallet/ms.lproj/Localizable.strings | 27 +++ DashWallet/nb.lproj/Localizable.strings | 27 +++ DashWallet/nl.lproj/Localizable.strings | 27 +++ DashWallet/pl.lproj/Localizable.strings | 27 +++ DashWallet/pt.lproj/Localizable.strings | 27 +++ DashWallet/ro.lproj/Localizable.strings | 27 +++ DashWallet/ru.lproj/Localizable.strings | 27 +++ DashWallet/sk.lproj/Localizable.strings | 27 +++ DashWallet/sl.lproj/Localizable.strings | 27 +++ DashWallet/sl_SI.lproj/Localizable.strings | 27 +++ DashWallet/sq.lproj/Localizable.strings | 27 +++ DashWallet/sr.lproj/Localizable.strings | 27 +++ DashWallet/sv.lproj/Localizable.strings | 27 +++ DashWallet/th.lproj/Localizable.strings | 27 +++ DashWallet/tr.lproj/Localizable.strings | 27 +++ DashWallet/uk.lproj/Localizable.strings | 27 +++ DashWallet/vi.lproj/Localizable.strings | 27 +++ DashWallet/zh-Hans.lproj/Localizable.strings | 27 +++ .../zh-Hant-TW.lproj/Localizable.strings | 27 +++ DashWallet/zh.lproj/Localizable.strings | 27 +++ DashWallet/zh_TW.lproj/Localizable.strings | 27 +++ 46 files changed, 1344 insertions(+), 15 deletions(-) diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index 757125a5b2..aefe509f42 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -87,6 +87,17 @@ struct ApproveConnectionSheet: View { .font(.footnote) .foregroundColor(.secondaryText) } + } else if case .refused(let refusal) = request.login { + Text(NSLocalizedString( + "This wallet will not answer this sign-in request.", + comment: "DashConnect App Connect v2")) + .font(.subhead) + .foregroundColor(.primaryText) + Text(refusal.reason) + .font(.footnote) + .foregroundColor(.secondaryText) + } else if let plan = request.login.grantPlan { + appConnectPermissions(plan) } else if let terms = request.login.sessionKeyTerms { sessionKeyPermissions(terms) } else if isRelogin { @@ -134,18 +145,21 @@ struct ApproveConnectionSheet: View { .padding(.bottom, 4) } - DashButton( - // With the login unresolved there is nothing to approve. - text: request.login == .unresolved - ? NSLocalizedString("Try again", comment: "") - : NSLocalizedString("Approve", comment: "DashConnect"), - style: .filledBlue, - size: .large, - stretch: true, - isEnabled: !isLoading, - isLoading: isLoading, - action: request.login == .unresolved ? onRetry : onApprove - ) + // A refused request has nothing to approve or try again. + if !isRefused { + DashButton( + // With the login unresolved there is nothing to approve. + text: request.login == .unresolved + ? NSLocalizedString("Try again", comment: "") + : NSLocalizedString("Approve", comment: "DashConnect"), + style: .filledBlue, + size: .large, + stretch: true, + isEnabled: !isLoading, + isLoading: isLoading, + action: request.login == .unresolved ? onRetry : onApprove + ) + } DashButton( text: NSLocalizedString("Deny", comment: "DashConnect"), @@ -172,6 +186,11 @@ struct ApproveConnectionSheet: View { request.existingConnection != nil } + private var isRefused: Bool { + if case .refused = request.login { return true } + return false + } + private var titleFormat: String { if isRelogin { return NSLocalizedString("Sign in to %@ again?", comment: "DashConnect re-login") @@ -239,6 +258,122 @@ struct ApproveConnectionSheet: View { } } + /// An App Connect request v2: one line per key the app is given, with + /// what it can spend and until when, then how old the request is and + /// where the wallet returns. A draft: per-binding toggles and budget and + /// lifetime presets are left to the wallet's design. + private func appConnectPermissions(_ plan: AppConnect.GrantPlan) -> some View { + VStack(alignment: .leading, spacing: 20) { + permissions( + granted: [NSLocalizedString("See your username", comment: "DashConnect")] + + plan.auth.map(authGrantText) + + plan.encryption.map { _ in + String( + format: NSLocalizedString( + "Receive messages encrypted to you in %@", + comment: "DashConnect App Connect v2: the placeholder is the app's name"), + resolvedAppLabel) + }, + withheld: [ + NSLocalizedString("Your recovery phrase or wallet keys", comment: "DashConnect one-QR login"), + NSLocalizedString("Your Dash balance", comment: "DashConnect one-QR login"), + NSLocalizedString("Registering names or changing your keys", comment: "DashConnect App Connect v2"), + ] + ) + + VStack(alignment: .leading, spacing: 4) { + Text(requestOrigin(plan)) + .font(.footnote) + .foregroundColor(.secondaryText) + Text( + String( + format: NSLocalizedString( + "Only approve if you just started signing in on %@.", + comment: "DashConnect App Connect v2: the placeholder is the app's website or name"), + plan.callbackHost ?? resolvedAppLabel) + ) + .font(.footnote) + .foregroundColor(.secondaryText) + } + } + } + + private func authGrantText(_ grant: AppConnect.AuthGrant) -> String { + let binding = grant.binding + let action: String + switch binding.kind { + case .contractGroup: + action = String( + format: grant.securityLevel == .critical + ? NSLocalizedString( + "Act as you in all of %@'s contracts, including claiming and spending its tokens", + comment: "DashConnect App Connect v2: the placeholder is the app's name") + : NSLocalizedString( + "Act as you in all of %@'s contracts", + comment: "DashConnect App Connect v2: the placeholder is the app's name"), + resolvedAppLabel) + case .singleContract: + action = String( + format: NSLocalizedString( + "Act as you in one of %@'s contracts", + comment: "DashConnect App Connect v2: the placeholder is the app's name"), + resolvedAppLabel) + case .documentType: + if binding.id.toBase58String() == AppConnect.dashPayContractId, binding.documentTypeName == "profile" { + action = NSLocalizedString("Edit your DashPay profile", comment: "DashConnect App Connect v2") + } else { + action = String( + format: NSLocalizedString( + "Write \"%@\" documents as you", + comment: "DashConnect App Connect v2: the placeholder is a document type name"), + binding.documentTypeName ?? "") + } + } + let expiry = Self.expiryFormatter.string(from: Date(timeIntervalSince1970: TimeInterval(grant.expiresAt) / 1000)) + if let budget = grant.totalBudget { + return String( + format: NSLocalizedString( + "%1$@, spending up to %2$@ until %3$@", + comment: "DashConnect App Connect v2: what a key can do, an amount with its unit (0.5 DASH), a date"), + action, PlatformCreditsFormatter.dashString(budget), expiry) + } + return String( + format: NSLocalizedString( + "%1$@, until %2$@", + comment: "DashConnect App Connect v2: what a key can do, a date"), + action, expiry) + } + + private func requestOrigin(_ plan: AppConnect.GrantPlan) -> String { + let requested = Self.ageFormatter.localizedString( + for: Date(timeIntervalSince1970: TimeInterval(plan.createdAt) / 1000), relativeTo: Date()) + guard let host = plan.callbackHost else { + return String( + format: NSLocalizedString( + "Requested %@", + comment: "DashConnect App Connect v2: the placeholder is a relative time, e.g. 12 seconds ago"), + requested) + } + return String( + format: NSLocalizedString( + "Requested %1$@ · returns to %2$@", + comment: "DashConnect App Connect v2: a relative time (12 seconds ago), then a website (yap.pr)"), + requested, host) + } + + private static let expiryFormatter: DateFormatter = { + let formatter = DateFormatter() + formatter.dateStyle = .long + formatter.timeStyle = .none + return formatter + }() + + private static let ageFormatter: RelativeDateTimeFormatter = { + let formatter = RelativeDateTimeFormatter() + formatter.unitsStyle = .full + return formatter + }() + private func permissions(granted: [String], withheld: [String]) -> some View { VStack(alignment: .leading, spacing: 20) { VStack(alignment: .leading, spacing: 12) { diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index cba07666f1..6463a9f8f2 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -116,7 +116,7 @@ struct ConnectionsScreen: View { ) // The one-QR terms make the sheet longer than the fixed height // shows; who pays and when access ends must not sit below the fold. - .approveSheetPresentation(isLoading: viewModel.isApproving, isTall: request.login.sessionKeyTerms != nil) + .approveSheetPresentation(isLoading: viewModel.isApproving, isTall: request.login.sessionKeyTerms != nil || request.login.grantPlan != nil) } private func tokenPurchaseSheet(for purchase: DashConnectTokenPurchaseRequest) -> some View { diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index b526237bc1..02d0a6ce0b 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -19,6 +19,7 @@ import Combine import Foundation +import UIKit struct ConnectionsScreenMessage: Identifiable, Equatable { enum Kind: String { @@ -67,6 +68,11 @@ final class ConnectionsViewModel: ObservableObject { private let dataSource: any DashConnectDataSource private var pendingLoginRequest: DashKeyRequest? + /// Opens an App Connect request's return URL. + private let openURL: @MainActor (URL) -> Void + /// The status the pending App Connect request's callback reports if the + /// user closes the sheet now: set when an approval failed. + private var pendingFailureStatus: AppConnect.CallbackStatus? private var cancellables = Set() /// Serializes inbound requests. @@ -89,11 +95,13 @@ final class ConnectionsViewModel: ObservableObject { init( dataSource: (any DashConnectDataSource)? = nil, - featureUnavailable: Bool? = nil + featureUnavailable: Bool? = nil, + openURL: (@MainActor (URL) -> Void)? = nil ) { let computedFeatureUnavailable = featureUnavailable ?? !WalletEnvironment.isTestNetwork self.featureUnavailable = computedFeatureUnavailable self.dataSource = dataSource ?? Self.defaultDataSource(featureUnavailable: computedFeatureUnavailable) + self.openURL = openURL ?? { UIApplication.shared.open($0) } self.dataSource.connections .receive(on: DispatchQueue.main) @@ -161,6 +169,7 @@ final class ConnectionsViewModel: ObservableObject { let connectionRequest = await dataSource.makeConnectionRequest(from: request) guard generation == requestGeneration else { return } pendingLoginRequest = request + pendingFailureStatus = nil pendingRequest = connectionRequest case let .stateTransition(request): guard generation == requestGeneration else { return } @@ -202,7 +211,7 @@ final class ConnectionsViewModel: ObservableObject { // authorize the request on screen moments before it is replaced. // An unresolved login has nothing to approve; the sheet offers // `retryPendingRequest` for it instead. - guard let consent = pendingRequest, consent.login != .unresolved, + guard let consent = pendingRequest, consent.login.isApprovable, let pendingLoginRequest, !isApproving, !isResolvingRequest else { return } isApproving = true @@ -213,6 +222,7 @@ final class ConnectionsViewModel: ObservableObject { do { _ = try await dataSource.approveLogin(pendingLoginRequest, consent: consent) + openCallback(of: pendingLoginRequest, status: .ok) self.pendingRequest = nil self.pendingLoginRequest = nil self.approveError = nil @@ -225,6 +235,10 @@ final class ConnectionsViewModel: ObservableObject { self.approveError = DashConnectPlatformError.approvalOutOfDate.localizedDescription } catch { // Keep the sheet up so the user can retry without rescanning the QR. + // A cancelled PIN prompt is the user declining, not a failure. + if error as? DashConnectPlatformError != .authorizationCancelled { + self.pendingFailureStatus = (error as? AppConnect.Refusal)?.status ?? .failed + } self.approveError = String( format: NSLocalizedString("Could not complete the DashConnect request: %@", comment: "DashConnect"), error.localizedDescription @@ -249,11 +263,30 @@ final class ConnectionsViewModel: ObservableObject { func denyPendingRequest() { guard !isApproving else { return } + // A refused request never showed where it would return, so its + // callback is not opened. + if let pendingLoginRequest, pendingRequest?.login.isApprovable == true { + openCallback(of: pendingLoginRequest, status: pendingFailureStatus ?? .declined) + } pendingRequest = nil pendingLoginRequest = nil + pendingFailureStatus = nil approveError = nil } + /// Returns to the app that sent an App Connect request, with how it + /// ended (`ac=`). Only the callback the sheet showed ("returns + /// to ") is opened, and only once the user has answered it: the + /// wallet keeps no list of the hosts each app may use, so the user's + /// answer to a sheet naming the host stands in for the profile's "ask". + /// The app treats it as a nudge to look for the response, never as + /// proof of anything. + private func openCallback(of request: DashKeyRequest, status: AppConnect.CallbackStatus) { + guard let callback = request.appConnect?.callback, + let url = AppConnect.callbackURL(callback, status: status) else { return } + openURL(url) + } + func approvePendingTokenPurchase() { guard let purchase = pendingTokenPurchase, !isApprovingPurchase else { return } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 4a7f4d98fb..5b194412ed 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 3782484b0f..5a2ecef9a8 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index db277f89b1..df3450f254 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 36cb1aea0f..566b21a035 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 39490b5cbd..b7ec30d8b8 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 81bbf8222d..40fa0ff4ae 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index f071296e3c..78384aa410 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 2347a5978a..857a0a9bff 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6376,3 +6376,30 @@ /* Log export progress */ "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index eb246d451f..357aa46af8 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 58e56d67bd..7e3bbcac9d 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 7cd6630755..4a854e5933 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 085d0bf9b6..f344af2b59 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 673ba6f4c2..684bf952bb 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 0474475dbc..3aa7a4869d 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index fae9a28e62..c7d4ad24f1 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 0715d27a3b..f5f07fce4d 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index ae12ecacd2..763ba9dbbe 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 4756d0b1fb..f2d667380d 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 049b3838b0..49cbbaaa72 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 663b24983a..5458d26dd4 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 7b85aec733..939724c8c2 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index d4fa98c9e3..247f8e87b1 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 352bebfa3f..0e321ee880 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 7280233df7..756fde4232 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 88d53dc401..4f11714ee5 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index e8e36401b3..4693e23456 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 5bd47f0936..52aaa836d8 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 9d874a3018..fdbc04825d 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 371cfac1e4..e1ae4cbd08 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 85309c02be..b344a83e34 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 445ef45c09..2603b0d14d 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index d9b2a3bd54..b8bd25c9ba 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index d2989f9571..38c41d9f78 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 18e28d1e80..361a7a0e2a 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index b7d0d2be55..3ee1ac33af 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index fa22522913..fc0891e2ac 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index bdd8eee0b7..20ecaef250 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 5b76b0c8fd..466c12dfd8 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 4734b76d7b..ebaef57ecb 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 5a095b99ff..16de9c6252 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index c1ada09455..bd8dfaf3b2 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6623,3 +6623,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 9b8c0fd216..73dbdaa12c 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 24a2338402..7e46693196 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6621,3 +6621,30 @@ "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends." = "“%@” has been submitted for voting. It is not registered to you yet. We will notify you when voting ends."; "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username." = "“%@” was locked by a masternode vote, so it cannot be registered by anyone. Please choose a different username."; "Preparing logs…" = "Preparing logs…"; + +/* DashConnect App Connect v2 */ +"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, until %2$@" = "%1$@, until %2$@"; +"Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; +"Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; +"Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; +"Edit your DashPay profile" = "Edit your DashPay profile"; +"Only approve if you just started signing in on %@." = "Only approve if you just started signing in on %@."; +"Receive messages encrypted to you in %@" = "Receive messages encrypted to you in %@"; +"Registering names or changing your keys" = "Registering names or changing your keys"; +"Requested %1$@ · returns to %2$@" = "Requested %1$@ · returns to %2$@"; +"Requested %@" = "Requested %@"; +"The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; +"The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key that has already expired." = "The app asks for a key that has already expired."; +"The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; +"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract has no readable owner." = "The app's contract has no readable owner."; +"The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; +"The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; +"This network does not support this kind of sign-in yet." = "This network does not support this kind of sign-in yet."; +"This sign-in is for another identity. Switch to it in this wallet and ask the app again." = "This sign-in is for another identity. Switch to it in this wallet and ask the app again."; +"This sign-in request has expired. Ask the app for a new one." = "This sign-in request has expired. Ask the app for a new one."; +"This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; +"Write \"%@\" documents as you" = "Write \"%@\" documents as you"; +"The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; From e044442fa07cfca2bb6daa03de574aafbc749611 Mon Sep 17 00:00:00 2001 From: pasta Date: Tue, 13 Oct 2026 15:43:16 -0500 Subject: [PATCH 024/108] fix(dashpay): never send again a key recorded for another app connect grant A request that repeats another request's ephemeral key derives the same key payloads. A key already on the identity is now sent again only when no grant for another app or request names it, so the second request cannot take over the first one's key or record it under its app. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 808095a6d4..87c135056a 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1219,11 +1219,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return UInt32(bitPattern: existing.keyId) } // A grant already recorded for this request must name exactly these - // keys: its response carries them. + // keys: its response carries them. A key recorded for another app or + // request is that one's: a request repeating its ephemeral key derives + // the same payload, and must not take it over. let reused = Set(authKeyIds.compactMap { $0 }) - if !reused.isEmpty, let recorded = stores.grants.load().first(where: isGrantForRequest), - Set(recorded.keyIds) != reused || authKeyIds.contains(nil) { - throw DashConnectPlatformError.sessionKeyUnusable + if !reused.isEmpty { + let grants = stores.grants.load().filter { $0.identityId == identityId } + if let recorded = grants.first(where: isGrantForRequest), + Set(recorded.keyIds) != reused || authKeyIds.contains(nil) { + throw DashConnectPlatformError.sessionKeyUnusable + } + if grants.contains(where: { !isGrantForRequest($0) && !reused.isDisjoint(with: $0.keyIds) }) { + throw DashConnectPlatformError.sessionKeyUnusable + } } // Wallet rule 7: re-send the identity's key for the app when this From c1d6001828c24addfb8425b66fd821d2dca7151b Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Wed, 14 Oct 2026 00:22:04 +0300 Subject: [PATCH 025/108] fix(dashpay): approve a DashConnect sign-in only for the wallet and network its sheet was resolved for The request the approval sheet shows now records the wallet and network scope it was resolved for. An approval is refused, and the sheet rebuilt, when the active wallet or network scope is another one, also when the same wallet and identity exist under another devnet name. The check runs before the protocol version is asked for. The grant store also leaves alone a stored value that is not data at all (a string, a dictionary, a number), like data that is not a list of rows: nothing is written over it and no sign-in starts. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 7 ++-- .../DashConnect/DashConnectDataSource.swift | 2 +- .../DashConnect/DashConnectModels.swift | 16 +++++++-- .../PlatformDashConnectDataSource.swift | 22 ++++++++---- .../UI/DashConnect/ConnectionsViewModel.swift | 6 ++-- .../PlatformDashConnectDataSourceTests.swift | 35 +++++++++++++++++++ 6 files changed, 73 insertions(+), 15 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 36c1fe4882..5174d9fe10 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -701,8 +701,11 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { /// Decodes row by row, like `UserDefaultsDashConnectStore`, so one /// unreadable row costs one record instead of all of them. private func readRows() -> (grants: [AppConnectGrant], unreadable: [Any], isNotRowList: Bool) { - guard let storageKey, let data = defaults.data(forKey: storageKey) else { return ([], [], false) } - guard let rows = (try? JSONSerialization.jsonObject(with: data)) as? [Any] else { + guard let storageKey, let stored = defaults.object(forKey: storageKey) else { return ([], [], false) } + // A value of another kind is as much not this build's to replace as + // data that is not a list. + guard let data = stored as? Data, + let rows = (try? JSONSerialization.jsonObject(with: data)) as? [Any] else { Self.logger.error("AppConnectResponseStore: stored value is not a JSON array; left in place") return ([], [], true) } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index 70ee6a34ee..06083fed35 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -27,7 +27,7 @@ protocol DashConnectDataSource { func makeConnectionRequest(from loginRequest: DashKeyRequest) async -> ConnectionRequest /// `consent` is the request as the approval sheet showed it. A login /// that would give the app something else, or act for another identity, - /// is refused. + /// wallet or network than it was resolved for, is refused. func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection /// Parses a scanned `dash-st:` payload and either completes key /// registration immediately or returns a token purchase that awaits diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index dfb5304aa2..308ceb4df7 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -208,6 +208,10 @@ struct ConnectionRequest: Equatable { var login: AppConnect.Login = .unresolved /// Why the login is unresolved, when the wallet knows. var unresolvedLoginReason: String? = nil + /// Names the wallet and network this request was resolved for; `nil` + /// when it was not resolved against one. An approval runs only while it + /// is still the active one. + var scope: String? = nil } extension ConnectionRequest { @@ -237,7 +241,8 @@ extension ConnectionRequest { walletIdentityId: String?, existingConnection: DAppConnection?, login: AppConnect.Login = .unresolved, - unresolvedLoginReason: String? = nil + unresolvedLoginReason: String? = nil, + scope: String? = nil ) { self.init( appLabel: appLabel.trimmingCharacters(in: .whitespacesAndNewlines), @@ -247,9 +252,16 @@ extension ConnectionRequest { walletIdentityId: walletIdentityId, existingConnection: existingConnection, login: login, - unresolvedLoginReason: unresolvedLoginReason + unresolvedLoginReason: unresolvedLoginReason, + scope: scope ) } + + /// Whether this request, as a sheet showed it, was resolved for the + /// identity, wallet and network an approval is about to run for. + func wasResolved(forIdentityId identityId: String, scope: String) -> Bool { + walletIdentityId == identityId && self.scope == scope + } } extension AppConnect.SessionKeyTerms { diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 4fc2e43d7f..17de2ba1cf 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -571,7 +571,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { walletIdentityId: context.identityId.toBase58String(), existingConnection: existingConnection, login: protocolVersion.map(AppConnect.login(protocolVersion:)) ?? .unresolved, - unresolvedLoginReason: unresolvedLoginReason + unresolvedLoginReason: unresolvedLoginReason, + scope: context.stores.scope ) } @@ -620,6 +621,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.error("🔗 DASHCONNECT :: no context — \(error.localizedDescription, privacy: .public)") throw error } + // The sheet was resolved for one identity of one wallet on one + // network, and either login acts for that identity: it has to be + // the active one here, and again after the PIN prompt. The same + // wallet and identity under another devnet name is not what was + // shown. + guard consent.wasResolved( + forIdentityId: context.identityId.toBase58String(), scope: context.stores.scope) else { + Self.logger.error("🔗 DASHCONNECT :: the approved sign-in was resolved for another identity, wallet or network") + throw DashConnectPlatformError.approvalOutOfDate + } // Which login this network can answer is decided before the PIN // prompt: from protocol version 14 the response goes to the App // Connect system contract and the wallet registers the key itself; @@ -636,13 +647,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } // The sheet showed the login `makeConnectionRequest` resolved, with // its terms for the one-QR login. If the network now gets the other - // one, what was approved is not what would run. Either login acts - // for the identity that was on the sheet: it has to be the active - // one here, and again after the PIN prompt. + // one, what was approved is not what would run. let login = AppConnect.login(protocolVersion: protocolVersion) - guard consent.login == login, - consent.walletIdentityId == context.identityId.toBase58String() else { - Self.logger.error("🔗 DASHCONNECT :: the approved sign-in no longer matches the network or the identity") + guard consent.login == login else { + Self.logger.error("🔗 DASHCONNECT :: the network now answers with the other login than the one approved") throw DashConnectPlatformError.approvalOutOfDate } do { diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index b526237bc1..900825eb91 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -217,9 +217,9 @@ final class ConnectionsViewModel: ObservableObject { self.pendingLoginRequest = nil self.approveError = nil } catch DashConnectPlatformError.approvalOutOfDate { - // Another identity became active, or the network now answers - // with the other login: what the sheet showed is not what - // would run. Nothing was signed. The sheet is rebuilt from + // Another identity, wallet or network became active, or the + // network now answers with the other login: what the sheet + // showed is not what would run. Nothing was signed. The sheet is rebuilt from // the same request as it stands now, for a new decision. self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) self.approveError = DashConnectPlatformError.approvalOutOfDate.localizedDescription diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 7821928da8..cc4de723e3 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2212,6 +2212,19 @@ final class AppConnectLoginTests: XCTestCase { store.save([]) XCTAssertEqual(defaults.data(forKey: key), stored) } + // A value that is not data at all is left alone the same way. + let others: [NSObject] = ["rows" as NSString, ["rows": NSArray()] as NSDictionary, 7 as NSNumber] + for stored in others { + defaults.set(stored, forKey: key) + XCTAssertFalse(store.canPersist) + XCTAssertEqual(store.load().count, 0) + store.save([Self.grant(sessionKeyId: 7)]) + XCTAssertEqual(defaults.object(forKey: key) as? NSObject, stored) + store.save([]) + XCTAssertEqual(defaults.object(forKey: key) as? NSObject, stored) + } + defaults.removeObject(forKey: key) + XCTAssertTrue(store.canPersist) } func testAGrantedKeyMissingFromTheIdentityViewIsReportedNotAssumedGone() { @@ -2511,6 +2524,28 @@ final class AppConnectLoginTests: XCTestCase { func add(_ entry: String) { entries.append(entry) } } + func testAnApprovalIsForTheIdentityWalletAndNetworkItsRequestWasResolvedFor() { + let request = ConnectionRequest( + loginRequest: MockDashConnectDataSource.sampleLoginRequest, + appLabel: "App", + appUrl: "", + walletUsername: nil, + walletIdentityId: "identity-a", + existingConnection: nil, + login: .twoQR, + scope: "wallet-a devnet-one") + + XCTAssertTrue(request.wasResolved(forIdentityId: "identity-a", scope: "wallet-a devnet-one")) + XCTAssertFalse(request.wasResolved(forIdentityId: "identity-b", scope: "wallet-a devnet-one")) + XCTAssertFalse( + request.wasResolved(forIdentityId: "identity-a", scope: "wallet-a devnet-two"), + "the same wallet and identity on another devnet") + // A request that was not resolved against a wallet approves nothing. + var unscoped = request + unscoped.scope = nil + XCTAssertFalse(unscoped.wasResolved(forIdentityId: "identity-a", scope: "wallet-a devnet-one")) + } + func testDisconnectWithNoActiveWalletIsRefused() async { let active = ActiveWallet(nil) let (dataSource, _) = makeScopedDataSource(active: active) From c89def3bf79ddf113036349847349354e2128c5f Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Wed, 14 Oct 2026 01:08:43 +0300 Subject: [PATCH 026/108] fix(dashpay): a devnet pointed at other nodes is another scope for a DashConnect approval - The scope an operation runs for now also names where the network is reached (the devnet's quorum URL), so consent given for a devnet is not used after it is pointed at other nodes under the same name. Rows and grant records stay keyed by wallet and devnet name. - When the protocol version cannot be read at approve time the approval fails as an unresolved login and the sheet is rebuilt: it offers "Try again" while it still cannot tell, and otherwise says why nothing was approved. - States what `active` means for a one-QR connection. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/DashConnectModels.swift | 6 +- .../PlatformDashConnectDataSource.swift | 48 +++++++++++---- .../UI/DashConnect/ConnectionsViewModel.swift | 10 ++++ .../PlatformDashConnectDataSourceTests.swift | 59 ++++++++++++++++++- 4 files changed, 111 insertions(+), 12 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 308ceb4df7..9853e0d85d 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -150,7 +150,11 @@ extension DashConnectTokenPurchaseRequest { /// the user locally turned the connection off from the wallet UI. /// /// `active` means the app's login keys are registered on the identity and the -/// wallet has already published the matching `loginKeyResponse`. +/// wallet has already published the matching `loginKeyResponse`. For a one-QR +/// connection it means the app holds a session key, registered on an +/// identity of this wallet, that this wallet has not disabled: the row is +/// made as soon as the key is registered, whether or not its response was +/// published. enum ConnectionStatus: String, Codable, CaseIterable { case approved case active diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 17de2ba1cf..799637733d 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -76,6 +76,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case grantOnAnotherIdentity case grantStoreUnavailable case approvalOutOfDate + case loginUnresolved case grantNotRecorded case noFreeKeyId case otherIdentitiesNotChecked @@ -155,6 +156,10 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "The details of this sign-in changed while it was on screen. Check them and approve again.", comment: "DashConnect") + case .loginUnresolved: + return NSLocalizedString( + "This wallet could not check what this sign-in would give the app.", + comment: "DashConnect") case .sessionKeyUnusable: return NSLocalizedString( "This sign-in request can no longer be approved. Ask the app for a new code.", @@ -391,11 +396,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let walletIdHex: String let connections: any DashConnectStore let grants: any AppConnectResponseStore + /// Where the network is reached, as configured when the pair was + /// made; `nil` on a network with one fixed set of nodes. + let endpoint: String? - /// Names what the rows belong to: the wallet, and the network scope - /// the connection store was fixed to, which tells two devnets of one - /// wallet apart. - var scope: String { "\(walletIdHex) \(connections.scopeKey ?? "")" } + /// Names what an operation runs for: the wallet, the network scope + /// the connection store was fixed to (which tells two devnets of one + /// wallet apart by name), and the endpoint, so a devnet pointed at + /// other nodes under the same name is another scope. The stores + /// themselves are keyed by wallet and name only. + var scope: String { "\(walletIdHex) \(connections.scopeKey ?? "") \(endpoint ?? "")" } /// The rows as they are published: each names this scope. func published(_ rows: [DAppConnection]) -> [DAppConnection] { @@ -450,6 +460,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private let shownRows: ShownRows private let operationGate: DashConnectOperationGate private let activeWalletIdHex: () -> String? + private let networkEndpoint: () -> String? private var walletChangeObserver: AnyCancellable? private let authorizer: DWIdentityAuthorizer private let stateTransitionParser: any DashConnectStateTransitionParsing @@ -474,6 +485,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { activeWalletIdHex: @escaping () -> String? = { WalletEnvironment.activeWalletIdHex as String? }, authorizer: DWIdentityAuthorizer = DWIdentityAuthorizer(), stateTransitionParser: any DashConnectStateTransitionParsing = PlatformWalletDashConnectStateTransitionParser(), + networkEndpoint: (() -> String?)? = nil, notificationCenter: NotificationCenter = .default, operationGate: DashConnectOperationGate = .shared, now: @escaping () -> Date = Date.init @@ -489,8 +501,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { self.now = now self.activeWalletIdHex = activeWalletIdHex self.operationGate = operationGate + // Only a devnet's nodes are configurable. + let networkEndpoint = networkEndpoint + ?? (supportedNetwork == .devnet ? { DevnetConfiguration.quorumURL } : { nil }) + self.networkEndpoint = networkEndpoint let active = Self.pinnedStores( - walletIdHex: activeWalletIdHex(), store: self.store, responseStore: self.responseStore) + walletIdHex: activeWalletIdHex(), store: self.store, responseStore: self.responseStore, + endpoint: networkEndpoint()) self.shownRows = ShownRows(scope: active?.scope) self.subject = CurrentValueSubject(active.map { $0.published($0.connections.load()) } ?? []) // The list is loaded once, and the active wallet can change while @@ -642,8 +659,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { do { protocolVersion = try await Self.networkProtocolVersion(sdk: context.sdk) } catch { + // The wallet cannot tell any more whether the login the sheet + // offered is the one this network gets. Nothing was signed. Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") - throw error + throw DashConnectPlatformError.loginUnresolved } // The sheet showed the login `makeConnectionRequest` resolved, with // its terms for the one-QR login. If the network now gets the other @@ -2090,19 +2109,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private static func pinnedStores( walletIdHex: String?, store: any DashConnectStore, - responseStore: any AppConnectResponseStore + responseStore: any AppConnectResponseStore, + endpoint: String? ) -> Stores? { guard let walletIdHex, !walletIdHex.isEmpty else { return nil } return Stores( walletIdHex: walletIdHex, connections: store.pinned(toWalletIdHex: walletIdHex), - grants: responseStore.pinned(toWalletIdHex: walletIdHex)) + grants: responseStore.pinned(toWalletIdHex: walletIdHex), + endpoint: endpoint) } /// The stores fixed to the wallet that is active at this call, read /// once; `nil` with no wallet. private func pinnedActiveStores() -> Stores? { - Self.pinnedStores(walletIdHex: activeWalletIdHex(), store: store, responseStore: responseStore) + Self.pinnedStores( + walletIdHex: activeWalletIdHex(), store: store, responseStore: responseStore, + endpoint: networkEndpoint()) } /// Publishes the active wallet's rows when the published list holds @@ -2348,7 +2371,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { stores: Stores( walletIdHex: walletIdHex, connections: store.pinned(toWalletIdHex: walletIdHex), - grants: responseStore.pinned(toWalletIdHex: walletIdHex)) + grants: responseStore.pinned(toWalletIdHex: walletIdHex), + // TODO(dashconnect-endpoint-source): this is the endpoint + // configured now, not the one `sdk` above was built with. + // They agree while the only writer of the setting restarts + // the runtime before it writes. + endpoint: networkEndpoint()) ) } diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 900825eb91..bb55d28b3f 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -223,6 +223,16 @@ final class ConnectionsViewModel: ObservableObject { // the same request as it stands now, for a new decision. self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) self.approveError = DashConnectPlatformError.approvalOutOfDate.localizedDescription + } catch DashConnectPlatformError.loginUnresolved { + // The wallet could not check which login this network gets. + // Nothing was signed. The sheet is rebuilt: when it still + // cannot tell, it says so itself and offers "Try again" + // instead of Approve; when it can again, the note says why + // the approval did not go through. + let rebuilt = await dataSource.makeConnectionRequest(from: pendingLoginRequest) + self.pendingRequest = rebuilt + self.approveError = rebuilt.login == .unresolved + ? nil : DashConnectPlatformError.loginUnresolved.localizedDescription } catch { // Keep the sheet up so the user can retry without rescanning the QR. self.approveError = String( diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index cc4de723e3..df1244e896 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1432,6 +1432,36 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertNil(viewModel.approveError) } + /// The wallet could not check which login the network gets at approve + /// time: the sheet is rebuilt. When it still cannot tell, the sheet says + /// so itself and no error is added; when it can again, a note says why + /// nothing was approved. + func testAnApprovalThatCouldNotCheckTheLoginRebuildsTheSheet() async { + let shown = Self.consent(identityId: "identity-a", terms: .current) + var unresolved = shown + unresolved.login = .unresolved + unresolved.unresolvedLoginReason = "no nodes" + let spy = LoginApprovalSpy(shown: [shown, unresolved, shown]) + spy.approveFailures = [DashConnectPlatformError.loginUnresolved, DashConnectPlatformError.loginUnresolved] + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.onQRScanned("login") + await waitUntil { viewModel.pendingRequest != nil } + viewModel.approvePendingRequest() + await waitUntil { !viewModel.isApproving } + + XCTAssertEqual(viewModel.pendingRequest, unresolved) + XCTAssertNil(viewModel.approveError, "the sheet states the unresolved login itself") + + viewModel.retryPendingRequest() + await waitUntil { viewModel.pendingRequest == shown } + viewModel.approvePendingRequest() + await waitUntil { !viewModel.isApproving } + + XCTAssertEqual(viewModel.pendingRequest, shown) + XCTAssertEqual(viewModel.approveError, DashConnectPlatformError.loginUnresolved.localizedDescription) + } + private static func consent(identityId: String, terms: AppConnect.SessionKeyTerms?) -> ConnectionRequest { ConnectionRequest( loginRequest: MockDashConnectDataSource.sampleLoginRequest, @@ -2377,6 +2407,26 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(Self.shownRows(dataSource).map(\.status), [.approved]) } + func testARowShownForADevnetAtOtherNodesIsNotActedOnUnderTheSameName() async throws { + let active = ActiveWallet("wallet-a") + let endpoint = Endpoint("https://quorums.one.example") + let center = NotificationCenter() + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource( + active: active, rows: [row], notificationCenter: center, endpoint: endpoint) + let shown = Self.shownRows(dataSource) + + // The same wallet and devnet name, pointed at other nodes. + endpoint.url = "https://quorums.two.example" + + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + XCTAssertEqual(connections.load().map(\.status), [.active]) + let current = Self.shownRows(dataSource) + XCTAssertNotEqual(current[0].scope, shown[0].scope) + try await dataSource.disconnect(id: current[0].id, scope: current[0].scope) + XCTAssertEqual(connections.load().map(\.status), [.approved]) + } + func testARowWithNoScopeIsNotActedOn() async { let active = ActiveWallet("wallet-a") let row = Self.twoQRRow(status: .active) @@ -2588,13 +2638,19 @@ final class AppConnectLoginTests: XCTestCase { init(_ idHex: String?) { self.idHex = idHex } } + private final class Endpoint { + var url: String? + init(_ url: String?) { self.url = url } + } + /// `rows` are the active wallet's, stored before the data source loads /// its list. private func makeScopedDataSource( active: ActiveWallet, rows: [DAppConnection] = [], notificationCenter: NotificationCenter = NotificationCenter(), - operationGate: DashConnectOperationGate = DashConnectOperationGate() + operationGate: DashConnectOperationGate = DashConnectOperationGate(), + endpoint: Endpoint = Endpoint(nil) ) -> (PlatformDashConnectDataSource, UserDefaultsDashConnectStore) { let connections = UserDefaultsDashConnectStore( defaults: defaults, @@ -2608,6 +2664,7 @@ final class AppConnectLoginTests: XCTestCase { store: connections, responseStore: UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .connections(connections)), activeWalletIdHex: { active.idHex }, + networkEndpoint: { endpoint.url }, notificationCenter: notificationCenter, operationGate: operationGate ) From 41187c99e382e97bc041ea7ab4da8ea953215ab6 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Wed, 14 Oct 2026 11:23:01 +0300 Subject: [PATCH 027/108] fix(dashpay): record a one-QR session key before its registration is submitted MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An identity update can land on Platform and still report a failure. The grant was recorded only after the update returned, so such a key stayed live with no record and no row to turn it off from. - The grant is recorded unconfirmed (the key's hash) just before the update is submitted. After a reported failure the identity is read again and the login goes on if the key is there; otherwise the failure stands and the record stays unconfirmed. - An unconfirmed record is confirmed, and its app given a row, once its own key (id and hash, live) is seen on the identity — at every one-QR approval and every disconnect. Until then it takes no part in a disconnect, and it is never dropped on the strength of a view that may be behind. - A confirmed record is never replaced by a new unconfirmed one: a retry that does not see its key stops as "identity keys out of date". - The context read for an operation checks that the SDK runtime is still the one it started from after the devnet settings are read. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 40 +++++ .../DashConnect/DashConnectModels.swift | 8 +- .../PlatformDashConnectDataSource.swift | 157 ++++++++++++++---- .../PlatformDashConnectDataSourceTests.swift | 32 ++++ 4 files changed, 204 insertions(+), 33 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 5174d9fe10..c7d8705faa 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -314,6 +314,38 @@ enum AppConnect { .sorted() } + /// Whether the identity holds the key a record names, live: its id, with + /// the key data the record expects while the registration is unconfirmed. + static func holdsRecordedKey( + _ grant: AppConnectGrant, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> Bool { + currentIdentityPublicKeys.contains { key in + guard UInt32(bitPattern: key.keyId) == grant.sessionKeyId, key.disabledAt == nil else { return false } + guard let hash = grant.unconfirmedKeyHash160 else { return true } + return key.keyType == .ecdsaHash160 && key.data.toHexString() == hash + } + } + + /// Confirms the unconfirmed records of `identityId` whose key the + /// identity now holds, and returns them. A record whose key is not there + /// stays as it is: the update may still land, and nothing is taken from + /// a view that may be behind. + static func confirmRegistrations( + in grants: inout [AppConnectGrant], + identityId: String, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> [AppConnectGrant] { + var confirmed: [AppConnectGrant] = [] + for index in grants.indices + where grants[index].identityId == identityId && grants[index].isUnconfirmed + && holdsRecordedKey(grants[index], currentIdentityPublicKeys: currentIdentityPublicKeys) { + grants[index].unconfirmedKeyHash160 = nil + confirmed.append(grants[index]) + } + return confirmed + } + /// Granted session keys the given view of the identity does not contain. /// Platform never removes a key, it only disables it, so a missing id /// means the view is out of date — not that the key is gone. A disconnect @@ -498,6 +530,14 @@ struct AppConnectGrant: Codable, Equatable { /// be deleted, or could not be shown to be absent; the record then only /// waits for that. var keyDisabled: Bool? + /// The hex hash160 of the session key, set from just before its + /// registration is submitted until the key is seen on the identity. + /// While set, the key may be there or not: an update can land without + /// confirming. Such a record has no row and no response; it is kept so + /// the key, if it lands, is found and confirmed. + var unconfirmedKeyHash160: String? = nil + + var isUnconfirmed: Bool { unconfirmedKeyHash160 != nil } /// What makes two records the same grant: one session key given for one /// request. Records are matched on this, never on whole-value equality — diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 9853e0d85d..5a1f083208 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -151,10 +151,10 @@ extension DashConnectTokenPurchaseRequest { /// /// `active` means the app's login keys are registered on the identity and the /// wallet has already published the matching `loginKeyResponse`. For a one-QR -/// connection it means the app holds a session key, registered on an -/// identity of this wallet, that this wallet has not disabled: the row is -/// made as soon as the key is registered, whether or not its response was -/// published. +/// connection it means the app holds a session key on an identity of this +/// wallet that this wallet has not disabled: the row is made once the key is +/// seen on the identity, before its response is published, and stays +/// whether or not the publish is confirmed. enum ConnectionStatus: String, Codable, CaseIterable { case approved case active diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 799637733d..368b0c963c 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -798,9 +798,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// identity with its bounds and limits, and only then publish the /// encrypted key, so the app finds a live key on its first check. /// - /// The grant and the connection row are recorded as soon as the key is - /// known to be on the identity, before the publish: whatever happens to - /// the publish, the key stays visible in Connections and can be disabled. + /// A new key's grant is recorded, unconfirmed, before its registration + /// is submitted, so a key that lands without the update confirming is + /// still found later. Once the key is known to be on the identity the + /// grant is confirmed and the connection row recorded, before the + /// publish: whatever happens to the publish, the key stays visible in + /// Connections and can be disabled. /// /// Approving the same QR again finds the key registered and does not /// register it twice; if the response is already recorded as published it @@ -846,6 +849,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let requestHash = sealed.appEphemeralPubKeyHash.toHexString() let signer = KeychainSigner(modelContainer: context.modelContainer) let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) + await confirmRegistrations( + identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, in: stores) func isGrantForRequest(_ grant: AppConnectGrant) -> Bool { grant.identityId == identityId && grant.appContractId == appContractId && grant.values.appEphemeralPubKeyHash == requestHash @@ -894,15 +899,59 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { totalBudget: budget, expiresAt: expiry ) + // Recorded before the update is submitted: an update can land + // and still report a failure, and a key with no record could not + // be found again. The record stays unconfirmed, with no row, + // until the key is seen on the identity. + var pending = AppConnectGrant( + identityId: identityId, + appContractId: appContractId, + documentId: nil, + values: AppConnect.ResponseValues(sealed), + sessionKeyId: keyId, + totalBudget: budget, + expiresAt: expiry, + publishedAt: now() + ) + pending.unconfirmedKeyHash160 = sessionKeyHash160.toHexString() + // A confirmed record for this request means its key is on the + // identity, and a view without it is behind: registering again + // would be refused, and the record must keep its values. + guard !stores.grants.load().contains(where: { + isGrantForRequest($0) && !$0.isUnconfirmed && $0.keyDisabled != true + }) else { + throw DashConnectPlatformError.identityKeysOutOfDate + } + updateGrants(in: stores) { grants in + grants.removeAll { $0.key == pending.key } + grants.append(pending) + } + guard stores.grants.load().contains(where: { $0.key == pending.key }) else { + Self.logger.error("🔗 DASHCONNECT :: the session key could not be recorded; not registering it") + throw DashConnectPlatformError.grantStoreUnavailable + } Self.logger.info("🔗 DASHCONNECT :: registering session key") - try await signer.withAdditionalSigningKeys([ - (publicKey: sessionKeyHash160, privateKey: sessionPrivateKey), - ]) { - try await context.wallet.updateIdentity( - identityId: context.identityId, - addPublicKeys: [key], - signer: signer - ) + do { + try await signer.withAdditionalSigningKeys([ + (publicKey: sessionKeyHash160, privateKey: sessionPrivateKey), + ]) { + try await context.wallet.updateIdentity( + identityId: context.identityId, + addPublicKeys: [key], + signer: signer + ) + } + } catch { + // The update may have landed all the same. If the key is on + // the identity, the login goes on; otherwise the failure + // stands and the record stays unconfirmed, to be confirmed if + // the key turns up later. + guard let keys = try? await refreshedIdentityPublicKeys(context: context), + AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: keys) else { + Self.logger.error("🔗 DASHCONNECT :: session key registration failed or is unconfirmed — \(error.localizedDescription, privacy: .public)") + throw error + } + Self.logger.info("🔗 DASHCONNECT :: session key is on the identity although the update reported a failure") } Self.logger.info("🔗 DASHCONNECT :: session key registered") sessionKeyId = keyId @@ -910,13 +959,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { expiresAt = expiry } - // From here the app-side key exists on the identity. Record it, and - // show the connection, before anything else can fail. A grant already - // recorded for this request keeps its values: if an earlier publish - // landed without confirming, those are the ones on Platform. + // From here the app-side key exists on the identity. Confirm its + // record, and show the connection, before anything else can fail. A + // grant already recorded for this request keeps its values: if an + // earlier publish landed without confirming, those are the ones on + // Platform. let grant = updateGrants(in: stores) { grants -> AppConnectGrant in - if let existing = grants.first(where: { isGrantForRequest($0) && $0.sessionKeyId == sessionKeyId }) { - return existing + if let index = grants.firstIndex(where: { isGrantForRequest($0) && $0.sessionKeyId == sessionKeyId }) { + // The key is on the identity now. + grants[index].unconfirmedKeyHash160 = nil + return grants[index] } let new = AppConnectGrant( identityId: identityId, @@ -1294,6 +1346,35 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return context } + /// Confirms this identity's unconfirmed registrations whose key it now + /// holds, and gives each such app a one-QR row if it has none: the key + /// is live and has to be reachable from Connections. + private func confirmRegistrations( + identityId: String, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + in stores: Stores + ) async { + let confirmed = updateGrants(in: stores) { grants in + AppConnect.confirmRegistrations( + in: &grants, identityId: identityId, currentIdentityPublicKeys: currentIdentityPublicKeys) + } + guard !confirmed.isEmpty else { return } + Self.logger.info("🔗 DASHCONNECT :: \(confirmed.count, privacy: .public) unconfirmed session key(s) found on the identity") + let appIds = Set(confirmed.map(\.appContractId)) + let confirmedAt = now() + await updateRows(in: stores) { rows in + let missing = appIds.subtracting(rows.map(\.id)) + return rows + missing.sorted().map { appId in + let branding = DashConnectFallbackAppMetadata.resolve(contractId: appId, unauthenticatedLabel: "") + return DAppConnection( + id: appId, + name: branding.name.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : branding.name, + url: branding.url, + status: .active, updatedAt: confirmedAt, loginKind: .oneQR) + } + } + } + private func markActive(_ pendingConnection: DAppConnection, in stores: Stores) async { let activatedAt = now() await updateRows(in: stores) { rows in @@ -1502,7 +1583,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.walletChanged } let isOneQR = rows(in: stores).first { $0.id == id }?.loginKind == .oneQR - let hasGrants = stores.grants.load().contains { $0.appContractId == id } + // A record whose registration is unconfirmed has nothing for a + // disconnect to turn off until its key is seen. + let hasGrants = stores.grants.load().contains { $0.appContractId == id && !$0.isUnconfirmed } if isOneQR || hasGrants { let liveElsewhere = try await revokeAppConnectGrants( appContractId: id, checksUnrecordedKeys: isOneQR, stores: stores) @@ -1586,12 +1669,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func hasLiveGrantElsewhere() -> Bool { stores.grants.load().contains { $0.appContractId == appContractId && $0.identityId != identityId && $0.keyDisabled != true + && !$0.isUnconfirmed } } guard let appContract = Self.decodeIdentifier(appContractId) else { throw DashConnectPlatformError.loginContractUnavailable } - if !stores.grants.load().contains(where: isGranted) { + if !stores.grants.load().contains(where: { isGranted($0) && !$0.isUnconfirmed }) { // Before the PIN prompt, from the store alone: whether this // identity holds a key of the app's that has no record. let holdsUnrecordedKey = try checksUnrecordedKeys && Self @@ -1610,7 +1694,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let signer = KeychainSigner(modelContainer: context.modelContainer) let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) - let granted = stores.grants.load().filter(isGranted) + // A registration whose key has turned up is confirmed. One that has + // not stays unconfirmed and takes no part in what follows: its key + // id may belong to another key, and its absence says nothing. + // TODO(dashconnect-unconfirmed-row): if the view stays behind + // through this disconnect too, the app's row goes while that key may + // have landed; the next one-QR approval with this identity confirms + // the key and shows the app again. + await confirmRegistrations( + identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, in: stores) + let granted = stores.grants.load().filter { isGranted($0) && !$0.isUnconfirmed } guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { // Platform never removes a key, so the node that answered is // behind. A key it does not know cannot be shown to be disabled, @@ -2360,6 +2453,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let identityIndex = try wallet.managedIdentity(identityId: identityId).getIdentityIndex() ?? 0 + // The devnet name and endpoint the stores name are read from the + // settings, after the runtime above. A change to them first stops + // that runtime and builds another, so if it is still the one + // running once they are read, they are the settings it runs on. + let stores = Stores( + walletIdHex: walletIdHex, + connections: store.pinned(toWalletIdHex: walletIdHex), + grants: responseStore.pinned(toWalletIdHex: walletIdHex), + endpoint: networkEndpoint()) + guard await MainActor.run(body: { SwiftDashSDKHost.shared.sdk === sdk }) else { + Self.logger.error("🔗 DASHCONNECT :: the SDK runtime changed while its context was read") + throw DashConnectPlatformError.walletChanged + } + return Context( wallet: wallet, sdk: sdk, @@ -2368,15 +2475,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { identityId: identityId, identityIndex: identityIndex, storedUsername: runtime.storedUsername, - stores: Stores( - walletIdHex: walletIdHex, - connections: store.pinned(toWalletIdHex: walletIdHex), - grants: responseStore.pinned(toWalletIdHex: walletIdHex), - // TODO(dashconnect-endpoint-source): this is the endpoint - // configured now, not the one `sdk` above was built with. - // They agree while the only writer of the setting restarts - // the runtime before it writes. - endpoint: networkEndpoint()) + stores: stores ) } diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index df1244e896..a0133adbf4 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2596,6 +2596,38 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertFalse(unscoped.wasResolved(forIdentityId: "identity-a", scope: "wallet-a devnet-one")) } + func testAnUnconfirmedRegistrationIsConfirmedOnlyByItsOwnKey() { + var pending = Self.grant(sessionKeyId: 9) + let hash = Data(repeating: 0x5A, count: 20) + pending.unconfirmedKeyHash160 = hash.toHexString() + let landed = [Self.key(keyId: 9, data: hash)] + let other = [Self.key(keyId: 9, data: Data(repeating: 0x01, count: 20))] + + XCTAssertTrue(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: landed)) + XCTAssertFalse(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: other), + "another key under the same id is not the one submitted") + XCTAssertFalse( + AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: [Self.key(keyId: 9, data: hash, disabledAt: 1)]), + "a disabled key is not a live registration") + + var grants = [pending] + XCTAssertEqual( + AppConnect.confirmRegistrations( + in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: other), []) + XCTAssertEqual( + AppConnect.confirmRegistrations(in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: []), + [], "a key not in the view is not taken as never registered") + XCTAssertTrue(grants[0].isUnconfirmed) + XCTAssertEqual( + AppConnect.confirmRegistrations( + in: &grants, identityId: "another identity", currentIdentityPublicKeys: landed), []) + + let confirmed = AppConnect.confirmRegistrations( + in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: landed) + XCTAssertEqual(confirmed.map(\.key), [pending.key]) + XCTAssertFalse(grants[0].isUnconfirmed) + } + func testDisconnectWithNoActiveWalletIsRefused() async { let active = ActiveWallet(nil) let (dataSource, _) = makeScopedDataSource(active: active) From 5868ac123a79af52e729d51f55854f43c9fa68fd Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Wed, 14 Oct 2026 12:28:36 +0300 Subject: [PATCH 028/108] fix(dashpay): confirm a recovered one-QR key only with its bound and limits; read Platform off the main actor - A key found after a reported failure, or later, confirms its record only if it is the key that was submitted with everything it was given: the data, AUTH/HIGH/HASH160, live, the recorded budget and expiry, and a stored bound to the record's app. A bound the store does not show is not taken on trust, and an unconfirmed record no longer counts as proof of a key's bound when the same request is approved again. - The App Connect response lookup and the protocol-version read run on their own queues instead of through the SDK's main-actor queries, so a network round trip no longer holds the UI. - The protocol version a login is chosen by comes from a proved read of the current epoch, which fails instead of falling back; an SDK pinned to a version (testnet) keeps deciding by its pin, with no network read. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 24 ++- .../PlatformDashConnectDataSource.swift | 142 ++++++++++++++++-- .../PlatformDashConnectDataSourceTests.swift | 52 +++++-- 3 files changed, 184 insertions(+), 34 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index c7d8705faa..3c59e777fe 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -314,16 +314,28 @@ enum AppConnect { .sorted() } - /// Whether the identity holds the key a record names, live: its id, with - /// the key data the record expects while the registration is unconfirmed. + /// Whether the identity holds, live, the key a record names. For an + /// unconfirmed record that is the key it was going to register, with + /// everything that key was given: the data, the kind, the limits, and the + /// bound to the record's app as the wallet's store reads it. A bound the + /// store does not show is not taken on trust. static func holdsRecordedKey( _ grant: AppConnectGrant, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + bindings: [KeyBinding] ) -> Bool { currentIdentityPublicKeys.contains { key in guard UInt32(bitPattern: key.keyId) == grant.sessionKeyId, key.disabledAt == nil else { return false } guard let hash = grant.unconfirmedKeyHash160 else { return true } + guard let appContractId = Data.identifier(fromBase58: grant.appContractId) else { return false } return key.keyType == .ecdsaHash160 && key.data.toHexString() == hash + && key.purpose == .authentication && key.securityLevel == .high + && key.totalBudget == grant.totalBudget + && key.expiresAt.map({ UInt64(max(0, $0)) }) == grant.expiresAt + && bindings.contains { + $0.keyId == grant.sessionKeyId && $0.data == key.data && !$0.hasUnreadableBound + && $0.singleContractId == appContractId + } } } @@ -334,12 +346,14 @@ enum AppConnect { static func confirmRegistrations( in grants: inout [AppConnectGrant], identityId: String, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + bindings: [KeyBinding] ) -> [AppConnectGrant] { var confirmed: [AppConnectGrant] = [] for index in grants.indices where grants[index].identityId == identityId && grants[index].isUnconfirmed - && holdsRecordedKey(grants[index], currentIdentityPublicKeys: currentIdentityPublicKeys) { + && holdsRecordedKey( + grants[index], currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings) { grants[index].unconfirmedKeyHash160 = nil confirmed.append(grants[index]) } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 368b0c963c..afb64a98eb 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -567,7 +567,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // show what the app is given. With the version unknown the request // says so, and the sheet offers nothing to approve. The lookup runs // alongside the two below. - async let resolvedProtocolVersion = Self.networkProtocolVersion(sdk: context.sdk) + async let resolvedProtocolVersion = Self.networkProtocolVersion(sdk: context.sdk, network: context.network) let metadata = await resolveAppMetadata(for: loginRequest, sdk: context.sdk) let walletUsername = await resolveWalletUsername(context: context) let protocolVersion: UInt32? @@ -657,7 +657,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // two-QR flow until that pin moves. let protocolVersion: UInt32 do { - protocolVersion = try await Self.networkProtocolVersion(sdk: context.sdk) + protocolVersion = try await Self.networkProtocolVersion(sdk: context.sdk, network: context.network) } catch { // The wallet cannot tell any more whether the login the sheet // offered is the one this network gets. Nothing was signed. @@ -786,12 +786,17 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// `SDK.refreshProtocolVersion()` is a synchronous FFI call that makes a /// proven network query. It runs on a plain dispatch queue so it does not /// hold a cooperative-pool thread for a DAPI round trip. - private static func networkProtocolVersion(sdk: SDK) async throws -> UInt32 { - try await withCheckedThrowingContinuation { continuation in - DispatchQueue.global(qos: .userInitiated).async { - continuation.resume(with: Result { try sdk.refreshProtocolVersion() }) - } - } + /// The protocol version a login is chosen by. An SDK pinned to a + /// version (`SwiftDashSDKHost.platformVersion(for:)`) builds only that + /// version's transitions, so its pin decides, with no network read. An + /// unpinned one gets the network's version from a proved read of the + /// current epoch, which throws when the read fails: the SDK's own + /// refreshed number is not used, since a failed refresh leaves its + /// starting value in place without an error. + private static func networkProtocolVersion(sdk: SDK, network: Network) async throws -> UInt32 { + let pin = await MainActor.run { SwiftDashSDKHost.platformVersion(for: network) } + guard pin == 0 else { return pin } + return try await DashConnectPlatformQueries.currentEpochProtocolVersion(sdk: sdk) } /// The one-QR login: derive the request's session key, register it on the @@ -850,7 +855,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let signer = KeychainSigner(modelContainer: context.modelContainer) let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) await confirmRegistrations( - identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, in: stores) + identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, + modelContainer: context.modelContainer, in: stores) func isGrantForRequest(_ grant: AppConnectGrant) -> Bool { grant.identityId == identityId && grant.appContractId == appContractId && grant.values.appEphemeralPubKeyHash == requestHash @@ -863,7 +869,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if currentPublicKeys.contains(where: { $0.keyType == .ecdsaHash160 && $0.data == sessionKeyHash160 }) { bindings = (try? Self.storedKeyBindings( identityId: identityId, modelContainer: context.modelContainer)) ?? [] - grantedKeyIds = Set(stores.grants.load().filter(isGrantForRequest).map(\.sessionKeyId)) + // An unconfirmed record is not evidence of the key's bound: it + // only says what was submitted. + grantedKeyIds = Set(stores.grants.load() + .filter { isGrantForRequest($0) && !$0.isUnconfirmed }.map(\.sessionKeyId)) } let sessionKeyId: UInt32 @@ -947,7 +956,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // stands and the record stays unconfirmed, to be confirmed if // the key turns up later. guard let keys = try? await refreshedIdentityPublicKeys(context: context), - AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: keys) else { + let bindings = try? Self.storedKeyBindings( + identityId: identityId, modelContainer: context.modelContainer), + AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: keys, bindings: bindings) else { Self.logger.error("🔗 DASHCONNECT :: session key registration failed or is unconfirmed — \(error.localizedDescription, privacy: .public)") throw error } @@ -1076,7 +1087,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { responseContractId: Data, sdk: SDK ) async throws -> (documentId: Data, values: AppConnect.ResponseValues)? { - let response = try await sdk.documentList( + let response = try await DashConnectPlatformQueries.documentList( + sdk: sdk, dataContractId: responseContractId.toBase58String(), documentType: AppConnect.documentType, whereClause: AppConnect.responseLookupWhereClause( @@ -1352,11 +1364,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private func confirmRegistrations( identityId: String, currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + modelContainer: ModelContainer, in stores: Stores ) async { + guard stores.grants.load().contains(where: { $0.identityId == identityId && $0.isUnconfirmed }), + let bindings = try? Self.storedKeyBindings(identityId: identityId, modelContainer: modelContainer) + else { return } let confirmed = updateGrants(in: stores) { grants in AppConnect.confirmRegistrations( - in: &grants, identityId: identityId, currentIdentityPublicKeys: currentIdentityPublicKeys) + in: &grants, identityId: identityId, + currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings) } guard !confirmed.isEmpty else { return } Self.logger.info("🔗 DASHCONNECT :: \(confirmed.count, privacy: .public) unconfirmed session key(s) found on the identity") @@ -1702,7 +1719,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // have landed; the next one-QR approval with this identity confirms // the key and shows the app again. await confirmRegistrations( - identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, in: stores) + identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, + modelContainer: context.modelContainer, in: stores) let granted = stores.grants.load().filter { isGranted($0) && !$0.isUnconfirmed } guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { // Platform never removes a key, so the node that answered is @@ -2751,3 +2769,99 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } } + +/// Platform reads the Swift SDK offers only on the main actor, where their +/// blocking FFI calls would hold the UI for a network round trip. They run +/// here on one serial queue instead, with the SDK kept alive for the call; +/// each copies the native result and releases it before returning. +/// TODO(dashconnect-off-main-queries): use the SDK's own off-main reads once +/// it has them for these two, as it has `dataContractGetOffMain`. +enum DashConnectPlatformQueries { + /// One queue per kind of read, so a slow document search does not hold + /// back the protocol-version read a sheet waits for. + private static let epochQueue = DispatchQueue(label: "org.dashfoundation.dash.dashconnect.epoch-query") + private static let documentQueue = DispatchQueue(label: "org.dashfoundation.dash.dashconnect.document-query") + + /// The protocol version the network runs, from a proved read of the + /// current epoch. It throws when that read fails: there is no fallback + /// value. + static func currentEpochProtocolVersion(sdk: SDK) async throws -> UInt32 { + let epoch = try await run(sdk, on: epochQueue) { handle in + try json(from: dash_sdk_system_get_current_epoch(handle)) + } + guard let version = (epoch["protocol_version"] as? NSNumber)?.uint32Value else { + throw SDKError.serializationError("The current epoch carries no protocol version") + } + return version + } + + /// `SDK.documentList(dataContractId:documentType:whereClause:limit:)` + /// off the main actor: the contract is fetched, searched and released + /// on the query queue. + static func documentList( + sdk: SDK, + dataContractId: String, + documentType: String, + whereClause: String, + limit: UInt32 + ) async throws -> [String: Any] { + try await run(sdk, on: documentQueue) { handle in + let contract = dash_sdk_data_contract_fetch(handle, dataContractId) + if let error = contract.error { + defer { dash_sdk_error_free(error) } + throw SDKError.fromDashSDKError(error.pointee) + } + guard let contractHandle = contract.data else { + throw SDKError.notFound("Data contract not found") + } + defer { dash_sdk_data_contract_destroy(OpaquePointer(contractHandle)) } + return try documentType.withCString { typePointer in + try whereClause.withCString { wherePointer in + var parameters = DashSDKDocumentSearchParams() + parameters.data_contract_handle = OpaquePointer(contractHandle) + parameters.document_type = typePointer + parameters.where_json = wherePointer + parameters.order_by_json = nil + parameters.limit = limit + parameters.start_at = 0 + return try json(from: dash_sdk_document_search(handle, ¶meters)) + } + } + } + } + + private static func run( + _ sdk: SDK, + on queue: DispatchQueue, + _ body: @escaping (OpaquePointer) throws -> [String: Any] + ) async throws -> [String: Any] { + try await withCheckedThrowingContinuation { continuation in + queue.async { + // The SDK owns the handle and releases it when it goes, so + // it is held until the call is done. + withExtendedLifetime(sdk) { + guard let handle = sdk.handle else { + continuation.resume(throwing: SDKError.invalidState("SDK not initialized")) + return + } + continuation.resume(with: Result { try body(handle) }) + } + } + } + } + + /// The JSON object a result carries, with the result released. + private static func json(from result: DashSDKResult) throws -> [String: Any] { + if let error = result.error { + defer { dash_sdk_error_free(error) } + throw SDKError.fromDashSDKError(error.pointee) + } + guard let data = result.data else { throw SDKError.notFound("No data returned") } + let text = String(cString: data.assumingMemoryBound(to: CChar.self)) + dash_sdk_string_free(data) + guard let object = try? JSONSerialization.jsonObject(with: Data(text.utf8)) as? [String: Any] else { + throw SDKError.serializationError("The result is not a JSON object") + } + return object + } +} diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index a0133adbf4..048e00877d 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2596,34 +2596,56 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertFalse(unscoped.wasResolved(forIdentityId: "identity-a", scope: "wallet-a devnet-one")) } - func testAnUnconfirmedRegistrationIsConfirmedOnlyByItsOwnKey() { - var pending = Self.grant(sessionKeyId: 9) + func testAnUnconfirmedRegistrationIsConfirmedOnlyByItsOwnKeyWithWhatItWasGiven() throws { + let appContractId = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" + let appContract = try XCTUnwrap(Data.identifier(fromBase58: appContractId)) + let template = Self.grant(sessionKeyId: 9) + var pending = AppConnectGrant( + identityId: template.identityId, appContractId: appContractId, documentId: nil, + values: template.values, sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, + publishedAt: template.publishedAt) let hash = Data(repeating: 0x5A, count: 20) pending.unconfirmedKeyHash160 = hash.toHexString() - let landed = [Self.key(keyId: 9, data: hash)] - let other = [Self.key(keyId: 9, data: Data(repeating: 0x01, count: 20))] + let bound = [AppConnect.KeyBinding(keyId: 9, data: hash, singleContractId: appContract)] + func key( + data: Data = hash, level: SecurityLevel = .high, budget: UInt64? = 5_000, + expiry: Int64? = 6_000, disabledAt: Int64? = nil + ) -> [ManagedIdentity.IdentityPublicKeyInfo] { + [Self.key(keyId: 9, securityLevel: level, data: data, disabledAt: disabledAt, + totalBudget: budget, expiresAt: expiry)] + } - XCTAssertTrue(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: landed)) - XCTAssertFalse(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: other), - "another key under the same id is not the one submitted") + XCTAssertTrue(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: key(), bindings: bound)) + for (keys, why) in [ + (key(data: Data(repeating: 0x01, count: 20)), "another key under the same id"), + (key(disabledAt: 1), "a disabled key"), + (key(level: .critical), "another security level"), + (key(budget: nil), "no budget"), + (key(budget: 9_000), "another budget"), + (key(expiry: nil), "no expiry"), + ([], "no key at all"), + ] { + XCTAssertFalse(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: keys, bindings: bound), why) + } + XCTAssertFalse( + AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: key(), bindings: []), + "a bound the store does not show is not taken on trust") + let otherApp = [AppConnect.KeyBinding(keyId: 9, data: hash, singleContractId: Data(repeating: 0x77, count: 32))] XCTAssertFalse( - AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: [Self.key(keyId: 9, data: hash, disabledAt: 1)]), - "a disabled key is not a live registration") + AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: key(), bindings: otherApp), + "bound to another app") var grants = [pending] XCTAssertEqual( AppConnect.confirmRegistrations( - in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: other), []) - XCTAssertEqual( - AppConnect.confirmRegistrations(in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: []), + in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: [], bindings: bound), [], "a key not in the view is not taken as never registered") XCTAssertTrue(grants[0].isUnconfirmed) XCTAssertEqual( AppConnect.confirmRegistrations( - in: &grants, identityId: "another identity", currentIdentityPublicKeys: landed), []) - + in: &grants, identityId: "another identity", currentIdentityPublicKeys: key(), bindings: bound), []) let confirmed = AppConnect.confirmRegistrations( - in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: landed) + in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: key(), bindings: bound) XCTAssertEqual(confirmed.map(\.key), [pending.key]) XCTAssertFalse(grants[0].isUnconfirmed) } From b41bc1cd13d7c2194df7f71469c97c4cf0c16865 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Wed, 14 Oct 2026 13:31:58 +0300 Subject: [PATCH 029/108] fix(dashpay): free a native result string through a typed C pointer `dash_sdk_string_free` takes a `char *`; the adapter passed the raw result pointer, which only compiled against a header that declares it `void *`. Also drops a doc comment left over from the previous protocol-version lookup. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/PlatformDashConnectDataSource.swift | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index afb64a98eb..653c3280b5 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -783,9 +783,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return connection } - /// `SDK.refreshProtocolVersion()` is a synchronous FFI call that makes a - /// proven network query. It runs on a plain dispatch queue so it does not - /// hold a cooperative-pool thread for a DAPI round trip. /// The protocol version a login is chosen by. An SDK pinned to a /// version (`SwiftDashSDKHost.platformVersion(for:)`) builds only that /// version's transitions, so its pin decides, with no network read. An @@ -2857,8 +2854,9 @@ enum DashConnectPlatformQueries { throw SDKError.fromDashSDKError(error.pointee) } guard let data = result.data else { throw SDKError.notFound("No data returned") } - let text = String(cString: data.assumingMemoryBound(to: CChar.self)) - dash_sdk_string_free(data) + let string = data.assumingMemoryBound(to: CChar.self) + let text = String(cString: string) + dash_sdk_string_free(string) guard let object = try? JSONSerialization.jsonObject(with: Data(text.utf8)) as? [String: Any] else { throw SDKError.serializationError("The result is not a JSON object") } From 06e0d2c06aa9e55b393527a0b7f37459c2f2ab7e Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Thu, 15 Oct 2026 13:51:39 +0300 Subject: [PATCH 030/108] fix(dashpay): activate an app's existing row when its one-QR key is confirmed Recovering an unconfirmed one-QR registration only added rows for apps that had none, so a two-QR row still waiting for its second scan kept that banner over a live session key, and a later pass could not repair it once the grant was confirmed. The row now becomes active and one-QR, keeping its branding and scope. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 41 +++++++++++----- .../PlatformDashConnectDataSourceTests.swift | 47 +++++++++++++++++++ 2 files changed, 77 insertions(+), 11 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 653c3280b5..bab7486589 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1356,8 +1356,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } /// Confirms this identity's unconfirmed registrations whose key it now - /// holds, and gives each such app a one-QR row if it has none: the key - /// is live and has to be reachable from Connections. + /// holds, and makes each such app's row active and one-QR, adding one if + /// it has none: the key is live and has to be reachable from Connections. private func confirmRegistrations( identityId: String, currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], @@ -1377,15 +1377,34 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let appIds = Set(confirmed.map(\.appContractId)) let confirmedAt = now() await updateRows(in: stores) { rows in - let missing = appIds.subtracting(rows.map(\.id)) - return rows + missing.sorted().map { appId in - let branding = DashConnectFallbackAppMetadata.resolve(contractId: appId, unauthenticatedLabel: "") - return DAppConnection( - id: appId, - name: branding.name.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : branding.name, - url: branding.url, - status: .active, updatedAt: confirmedAt, loginKind: .oneQR) - } + Self.rowsAfterConfirming(appIds: appIds, in: rows, at: confirmedAt) + } + } + + /// `rows` once the apps in `appIds` hold a live one-QR key: each app's + /// row becomes active and one-QR, keeping its branding and scope (a + /// two-QR row waiting for its second scan would otherwise keep showing + /// that banner instead of the disconnect switch), and an app with no row + /// gets one. + static func rowsAfterConfirming(appIds: Set, in rows: [DAppConnection], at confirmedAt: Date) -> [DAppConnection] { + let reconciled = rows.map { connection in + guard appIds.contains(connection.id) else { return connection } + var updated = DAppConnection( + id: connection.id, + name: connection.name, + url: connection.url, + status: .active, updatedAt: confirmedAt, loginKind: .oneQR) + updated.scope = connection.scope + return updated + } + let missing = appIds.subtracting(rows.map(\.id)) + return reconciled + missing.sorted().map { appId in + let branding = DashConnectFallbackAppMetadata.resolve(contractId: appId, unauthenticatedLabel: "") + return DAppConnection( + id: appId, + name: branding.name.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : branding.name, + url: branding.url, + status: .active, updatedAt: confirmedAt, loginKind: .oneQR) } } diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 048e00877d..b36eb43e4d 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2650,6 +2650,53 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertFalse(grants[0].isUnconfirmed) } + /// A recovered one-QR registration turns the app's existing row into an + /// active one-QR row: a two-QR row still waiting for its second scan + /// would otherwise keep that banner over a live session key. + func testConfirmingARegistrationActivatesTheAppsExistingRow() { + let appA = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" + let appB = "BbWcUA8Msi7HSgC2hCJsCtDADs2FzQVabRuHvk1tnj4d" + let earlier = Date(timeIntervalSince1970: 1_000) + let confirmedAt = Date(timeIntervalSince1970: 2_000) + var waiting = DAppConnection( + id: appA, name: "App A", url: "https://a.example", + status: .approved, updatedAt: earlier, loginKind: .twoQR) + waiting.scope = "wallet-a devnet-one" + let other = DAppConnection( + id: appB, name: "App B", url: "https://b.example", + status: .approved, updatedAt: earlier, loginKind: .twoQR) + + let rows = PlatformDashConnectDataSource.rowsAfterConfirming( + appIds: [appA], in: [waiting, other], at: confirmedAt) + + XCTAssertEqual(rows.count, 2) + let a = rows[0] + XCTAssertEqual(a.id, appA) + XCTAssertEqual(a.status, .active) + XCTAssertEqual(a.loginKind, .oneQR) + XCTAssertEqual(a.updatedAt, confirmedAt) + XCTAssertEqual(a.name, "App A") + XCTAssertEqual(a.url, "https://a.example") + XCTAssertEqual(a.scope, "wallet-a devnet-one") + let b = rows[1] + XCTAssertEqual(b.status, .approved, "an app whose key was not confirmed keeps its row") + XCTAssertEqual(b.loginKind, .twoQR) + XCTAssertEqual(b.updatedAt, earlier) + } + + /// An app with a confirmed key but no row gets an active one-QR row. + func testConfirmingARegistrationAddsARowForAnAppWithout() { + let appA = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" + let confirmedAt = Date(timeIntervalSince1970: 2_000) + + let rows = PlatformDashConnectDataSource.rowsAfterConfirming(appIds: [appA], in: [], at: confirmedAt) + + XCTAssertEqual(rows.map(\.id), [appA]) + XCTAssertEqual(rows.first?.status, .active) + XCTAssertEqual(rows.first?.loginKind, .oneQR) + XCTAssertEqual(rows.first?.updatedAt, confirmedAt) + } + func testDisconnectWithNoActiveWalletIsRefused() async { let active = ActiveWallet(nil) let (dataSource, _) = makeScopedDataSource(active: active) From 5c2f19dab49d57afa1fad335ce8604dda7c388c6 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Thu, 15 Oct 2026 23:06:58 +0300 Subject: [PATCH 031/108] fix(dashpay): give a confirmed one-QR key its row back if the row was never saved The one-QR login confirmed the grant and then resolved the connection preview again (protocol version, contract metadata, username) before saving the row. An app terminated during those reads left a live key with a confirmed grant and no row, or an approved two-QR row without a disconnect switch, and nothing repaired it: recovery looked only at unconfirmed grants. The row is now built from the approved sheet's request, so no network read sits between the two writes. Recovery also reconciles every app this identity holds a live key of by a confirmed grant: a missing or two-QR row becomes an active one-QR row on the next one-QR approval or disconnect. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 73 ++++++++++++++----- .../PlatformDashConnectDataSourceTests.swift | 61 ++++++++++++++++ 2 files changed, 116 insertions(+), 18 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index bab7486589..e293e81ccf 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -688,7 +688,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } if let terms = login.sessionKeyTerms { Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") - return try await approveAppConnectLogin(request, terms: terms, context: context) + return try await approveAppConnectLogin(request, consent: consent, terms: terms, context: context) } Self.logger.info("🔗 DASHCONNECT :: authorized; deriving login key") @@ -803,15 +803,21 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// A new key's grant is recorded, unconfirmed, before its registration /// is submitted, so a key that lands without the update confirming is /// still found later. Once the key is known to be on the identity the - /// grant is confirmed and the connection row recorded, before the - /// publish: whatever happens to the publish, the key stays visible in - /// Connections and can be disabled. + /// grant is confirmed and the connection row recorded, from what the + /// approved sheet showed and with no network read between the two, before + /// the publish: whatever happens to the publish, the key stays visible in + /// Connections and can be disabled. A row lost between the two writes is + /// put back by the next one-QR approval with this identity, or by a + /// disconnect of one of its apps once the PIN is entered. + /// TODO(dashconnect-lost-row): nothing puts it back at launch or when + /// Connections opens, so until then the key is live with no row. /// /// Approving the same QR again finds the key registered and does not /// register it twice; if the response is already recorded as published it /// does nothing more. private func approveAppConnectLogin( _ request: DashKeyRequest, + consent: ConnectionRequest, terms: AppConnect.SessionKeyTerms, context: Context ) async throws -> DAppConnection { @@ -992,9 +998,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return new } - let preview = await makeConnectionRequest(from: request) let connection = Self.makeConnection( - preview: preview, status: .active, updatedAt: now(), loginKind: .oneQR) + preview: consent, status: .active, updatedAt: now(), loginKind: .oneQR) await updateRows(in: stores) { rows in rows.filter { $0.id != connection.id } + [connection] } @@ -1356,31 +1361,63 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } /// Confirms this identity's unconfirmed registrations whose key it now - /// holds, and makes each such app's row active and one-QR, adding one if - /// it has none: the key is live and has to be reachable from Connections. + /// holds, and makes the row of each app this identity holds a recorded + /// live key of active and one-QR, adding one if it has none: the key is + /// live and has to be reachable from Connections. That also covers a + /// grant confirmed earlier whose row was never saved, or was saved by a + /// two-QR login. private func confirmRegistrations( identityId: String, currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], modelContainer: ModelContainer, in stores: Stores ) async { - guard stores.grants.load().contains(where: { $0.identityId == identityId && $0.isUnconfirmed }), - let bindings = try? Self.storedKeyBindings(identityId: identityId, modelContainer: modelContainer) + guard stores.grants.load().contains(where: { $0.identityId == identityId && $0.keyDisabled != true }) else { return } - let confirmed = updateGrants(in: stores) { grants in - AppConnect.confirmRegistrations( - in: &grants, identityId: identityId, - currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings) - } - guard !confirmed.isEmpty else { return } - Self.logger.info("🔗 DASHCONNECT :: \(confirmed.count, privacy: .public) unconfirmed session key(s) found on the identity") - let appIds = Set(confirmed.map(\.appContractId)) + // Without the store's bindings no unconfirmed record is confirmed, + // and a confirmed one does not need them. + let bindings = (try? Self.storedKeyBindings(identityId: identityId, modelContainer: modelContainer)) ?? [] + if stores.grants.load().contains(where: { $0.identityId == identityId && $0.isUnconfirmed }) { + let confirmed = updateGrants(in: stores) { grants in + AppConnect.confirmRegistrations( + in: &grants, identityId: identityId, + currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings) + } + if !confirmed.isEmpty { + Self.logger.info("🔗 DASHCONNECT :: \(confirmed.count, privacy: .public) unconfirmed session key(s) found on the identity") + } + } + let appIds = Self.appIdsWithoutTheirOneQRRow( + grants: stores.grants.load(), identityId: identityId, + currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings, + rows: rows(in: stores)) + guard !appIds.isEmpty else { return } + Self.logger.info("🔗 DASHCONNECT :: \(appIds.count, privacy: .public) app(s) with a live session key get their row back") let confirmedAt = now() await updateRows(in: stores) { rows in Self.rowsAfterConfirming(appIds: appIds, in: rows, at: confirmedAt) } } + /// The apps `identityId` holds a live key of by a confirmed grant record + /// whose row is missing from `rows` or is not an active one-QR row. + static func appIdsWithoutTheirOneQRRow( + grants: [AppConnectGrant], + identityId: String, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + bindings: [AppConnect.KeyBinding], + rows: [DAppConnection] + ) -> Set { + let live = grants.filter { + $0.identityId == identityId && !$0.isUnconfirmed && $0.keyDisabled != true + && AppConnect.holdsRecordedKey( + $0, currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings) + } + return Set(live.map(\.appContractId)).filter { appId in + !rows.contains { $0.id == appId && $0.status == .active && $0.loginKind == .oneQR } + } + } + /// `rows` once the apps in `appIds` hold a live one-QR key: each app's /// row becomes active and one-QR, keeping its branding and scope (a /// two-QR row waiting for its second scan would otherwise keep showing diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index b36eb43e4d..a505bb4c10 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2697,6 +2697,67 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(rows.first?.updatedAt, confirmedAt) } + /// A grant confirmed with no row saved after it, as an app terminated + /// between the two writes leaves it, gets its app's row back: when the + /// app has none, and when the row it has is a two-QR one. + func testAConfirmedGrantWithoutItsOneQRRowGetsItsRowBack() throws { + let appA = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" + let appB = "BbWcUA8Msi7HSgC2hCJsCtDADs2FzQVabRuHvk1tnj4d" + func grant(app: String, keyId: UInt32, identity: String = "identity") -> AppConnectGrant { + let template = Self.grant(sessionKeyId: keyId) + return AppConnectGrant( + identityId: identity, appContractId: app, documentId: nil, values: template.values, + sessionKeyId: keyId, totalBudget: nil, expiresAt: nil, publishedAt: template.publishedAt) + } + let keys = [ + Self.key(keyId: 7, data: Data(repeating: 0x07, count: 20)), + Self.key(keyId: 8, data: Data(repeating: 0x08, count: 20)), + ] + // Key 7 bound to app A as the store shows it, so an unconfirmed + // record of it would hold its key. + let bindings = [AppConnect.KeyBinding( + keyId: 7, data: Data(repeating: 0x07, count: 20), + singleContractId: try XCTUnwrap(Data.identifier(fromBase58: appA)))] + func appIds(_ grants: [AppConnectGrant], rows: [DAppConnection], keys: [ManagedIdentity.IdentityPublicKeyInfo] = keys) + -> Set { + PlatformDashConnectDataSource.appIdsWithoutTheirOneQRRow( + grants: grants, identityId: "identity", currentIdentityPublicKeys: keys, bindings: bindings, rows: rows) + } + let earlier = Date(timeIntervalSince1970: 1_000) + let twoQRRow = DAppConnection( + id: appA, name: "App A", url: "", status: .approved, updatedAt: earlier, loginKind: .twoQR) + let oneQRRow = DAppConnection( + id: appA, name: "App A", url: "", status: .active, updatedAt: earlier, loginKind: .oneQR) + + XCTAssertEqual(appIds([grant(app: appA, keyId: 7)], rows: []), [appA], "no row") + XCTAssertEqual(appIds([grant(app: appA, keyId: 7)], rows: [twoQRRow]), [appA], "a two-QR row") + XCTAssertEqual(appIds([grant(app: appA, keyId: 7)], rows: [oneQRRow]), [], "the row is there") + XCTAssertEqual( + appIds([grant(app: appA, keyId: 7), grant(app: appB, keyId: 8)], rows: [oneQRRow]), [appB], + "a later approval for another app finds the row this one lost") + + var disabled = grant(app: appA, keyId: 7) + disabled.keyDisabled = true + XCTAssertEqual(appIds([disabled], rows: []), [], "a disconnected grant") + XCTAssertEqual( + appIds([grant(app: appA, keyId: 7)], rows: [], + keys: [Self.key(keyId: 7, data: Data(repeating: 0x07, count: 20), disabledAt: 1)]), + [], "a key disabled on the identity") + XCTAssertEqual(appIds([grant(app: appA, keyId: 9)], rows: []), [], "a key the identity does not hold") + XCTAssertEqual(appIds([grant(app: appA, keyId: 7, identity: "other")], rows: []), [], "another identity") + var unconfirmed = grant(app: appA, keyId: 7) + unconfirmed.unconfirmedKeyHash160 = Data(repeating: 0x07, count: 20).toHexString() + XCTAssertTrue(AppConnect.holdsRecordedKey(unconfirmed, currentIdentityPublicKeys: keys, bindings: bindings)) + XCTAssertEqual(appIds([unconfirmed], rows: []), [], "an unconfirmed grant is left to its confirmation") + + // What the row becomes. + let rows = PlatformDashConnectDataSource.rowsAfterConfirming( + appIds: appIds([grant(app: appA, keyId: 7)], rows: [twoQRRow]), in: [twoQRRow], + at: Date(timeIntervalSince1970: 2_000)) + XCTAssertEqual(rows.map(\.status), [.active]) + XCTAssertEqual(rows.map(\.loginKind), [.oneQR]) + } + func testDisconnectWithNoActiveWalletIsRefused() async { let active = ActiveWallet(nil) let (dataSource, _) = makeScopedDataSource(active: active) From 3b753747e4c7f126dee4ad588602e86e3b36d13a Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Fri, 16 Oct 2026 21:18:16 +0300 Subject: [PATCH 032/108] build: pin the platform SDK to v5.1-dev with platform#4844 DashConnect v2 needs `deriveConnectKey` and the reshaped `ParsedStateTransition` (platform#4844), the delete-by-values entry point (platform#5419) and the contract-group read (platform#5421), all merged into v5.1-dev at a9336f9486. develop's pin (5.0.0-rc.1) has none of them. Co-Authored-By: Claude Opus 5.5 --- .platform-ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.platform-ref b/.platform-ref index 56eacde9f4..843357bc60 100644 --- a/.platform-ref +++ b/.platform-ref @@ -1 +1 @@ -2f4d161c89bd1750a5cc2ceef391e1cee192a9a7 +a9336f9486e5f0c79ce0940638037783b883c725 From b9e508914b0ae855094c42bff7d75c6c309a6bc2 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Fri, 16 Oct 2026 22:17:40 +0300 Subject: [PATCH 033/108] fix(dashpay): settle a pending one-QR registration before a disconnect, and find a key id past the last one A one-QR upgrade over a two-QR row whose identity update landed but reported a failure left an unconfirmed record and the two-QR row. A disconnect then took the local two-QR path, downgraded the row and left the session key on with no switch to turn it off. The disconnect now reads the active identity again first when it has such a record of the app: a key confirmed there makes the row one-QR and the full disconnect runs; a failed read, or a key that is live under the record's id but cannot be confirmed, stops it with the row in place. A key on the identity under the last id (an app can register one there through the two-QR flow) made every new one-QR login fail with no free key id. The lowest id no key has is taken instead. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 13 +++- .../PlatformDashConnectDataSource.swift | 67 ++++++++++++++++++- .../PlatformDashConnectDataSourceTests.swift | 48 ++++++++++++- 3 files changed, 120 insertions(+), 8 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 3c59e777fe..3cc9d13be1 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -140,12 +140,19 @@ enum AppConnect { } /// The id for a new key: one above the highest on the identity, disabled - /// keys included. `nil` when that id is the last one a key can have. + /// keys included. Platform only refuses an id the identity already has, + /// so when the highest is the last id a key can have (a key an app + /// registered can be given it) the lowest id no key has is taken + /// instead. `nil` only when every id is taken. static func nextKeyId( currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] ) -> UInt32? { - let highest = currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }.max() ?? 0 - return highest == .max ? nil : highest + 1 + let taken = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) + let highest = taken.max() ?? 0 + guard highest == .max else { return highest + 1 } + // The identity holds far fewer keys than there are ids, so this + // stops within a few steps of the lowest gap. + return (0 ... UInt32.max).first { !taken.contains($0) } } /// The key an app is given: it can only sign for the contract the request diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index e293e81ccf..f63ccbc1ef 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1652,9 +1652,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard scope == stores.scope else { throw DashConnectPlatformError.walletChanged } + // A one-QR registration whose outcome was never seen may have landed + // over this app's two-QR row. Which disconnect runs is decided by the + // row, so such a record of the active identity is settled against a + // fresh view of it first: a key confirmed there makes the row + // one-QR. If that cannot be done, nothing is turned off and the row + // stays. + try await settleUnconfirmedRegistrations(appContractId: id, stores: stores) let isOneQR = rows(in: stores).first { $0.id == id }?.loginKind == .oneQR - // A record whose registration is unconfirmed has nothing for a - // disconnect to turn off until its key is seen. + // A record still unconfirmed takes no part: the fresh view did not + // show its key live, or the record is another identity's. + // TODO(dashconnect-unconfirmed-row): an update still on its way when + // that view was read lands after this disconnect, and its key is + // shown again only by the next one-QR approval with this identity. let hasGrants = stores.grants.load().contains { $0.appContractId == id && !$0.isUnconfirmed } if isOneQR || hasGrants { let liveElsewhere = try await revokeAppConnectGrants( @@ -1693,6 +1703,59 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } + /// When the active identity has an unconfirmed registration of the app, + /// reads the identity again and runs `confirmRegistrations` with it, + /// which confirms every registration of the identity whose key is there + /// and makes those apps' rows one-QR. Returns without anything else when + /// there is no such record. Throws when the wallet's context cannot be + /// resolved or the identity read, and when the read shows the key of a + /// registration of the app that still could not be confirmed. + private func settleUnconfirmedRegistrations(appContractId: String, stores: Stores) async throws { + let activeIdentityId = await MainActor.run { DWCurrentUserIdentityInfo.shared.identityId } + guard let identityId = activeIdentityId?.toBase58String(), stores.grants.load().contains(where: { + $0.appContractId == appContractId && $0.identityId == identityId && $0.isUnconfirmed + }) else { return } + let context = try await requireContext(pinnedTo: stores) + guard context.identityId.toBase58String() == identityId else { + throw DashConnectPlatformError.walletChanged + } + let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) + await confirmRegistrations( + identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, + modelContainer: context.modelContainer, in: stores) + // The key landed live under the record's id but the record could not + // be confirmed: the key store has no readable bound for it, or the + // key differs from what the record says was submitted. The local + // disconnect would leave that key on with no row to turn it off from. + guard !Self.holdsUnconfirmedKey( + in: stores.grants.load(), appContractId: appContractId, identityId: identityId, + currentIdentityPublicKeys: currentPublicKeys) + else { + Self.logger.error("🔗 DASHCONNECT :: an unconfirmed session key of the app is live, but its record could not be confirmed") + throw DashConnectPlatformError.identityKeysOutOfDate + } + } + + /// Whether the identity holds, live, the key an unconfirmed registration + /// of the app was going to register, under the id it was submitted with. + /// The same key under another id came from another submission of the + /// request, which has its own record. + static func holdsUnconfirmedKey( + in grants: [AppConnectGrant], + appContractId: String, + identityId: String, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> Bool { + grants.contains { grant in + guard grant.appContractId == appContractId, grant.identityId == identityId, + let hash = grant.unconfirmedKeyHash160 else { return false } + return currentIdentityPublicKeys.contains { + UInt32(bitPattern: $0.keyId) == grant.sessionKeyId && $0.disabledAt == nil + && $0.keyType == .ecdsaHash160 && $0.data.toHexString() == hash + } + } + } + /// Ends the access one-QR logins gave an app: disables its session keys /// on the identity, then deletes the responses that carried them. /// diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index a505bb4c10..c357d264e2 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1844,12 +1844,20 @@ final class AppConnectLoginTests: XCTestCase { 8) } - func testThereIsNoNextKeyIdAfterTheLastOne() { + /// An app can register a key under the last id there is. The next key + /// then takes the lowest free id, and disabling that key changes nothing: + /// its id stays taken. + func testAKeyOnTheLastIdLeavesTheLowestFreeIdForTheNextKey() { // A key id is a UInt32 the SDK carries as an Int32 bit pattern. let last = Self.key(keyId: -1, data: Data([1])) - XCTAssertNil(AppConnect.nextKeyId(currentIdentityPublicKeys: [last])) + XCTAssertEqual(AppConnect.nextKeyId(currentIdentityPublicKeys: [last]), 0) let disabledLast = Self.key(keyId: -1, data: Data([1]), disabledAt: 1) - XCTAssertNil(AppConnect.nextKeyId(currentIdentityPublicKeys: [Self.key(keyId: 3, data: Data([3])), disabledLast])) + XCTAssertEqual( + AppConnect.nextKeyId(currentIdentityPublicKeys: [ + Self.key(keyId: 0, data: Data([0])), Self.key(keyId: 1, data: Data([2])), + Self.key(keyId: 2, data: Data([3]), disabledAt: 1), disabledLast, + ]), + 3, "a disabled key keeps its id") XCTAssertEqual( AppConnect.nextKeyId(currentIdentityPublicKeys: [Self.key(keyId: -2, data: Data([2]))]), .max) @@ -2758,6 +2766,40 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(rows.map(\.loginKind), [.oneQR]) } + /// A disconnect stops on an unconfirmed registration of the app whose + /// key is live: the local two-QR disconnect would leave it on. + func testALiveKeyOfAnUnconfirmedRegistrationIsFound() { + let appA = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" + let hash = Data(repeating: 0x5A, count: 20) + let template = Self.grant(sessionKeyId: 9) + var pending = AppConnectGrant( + identityId: "identity", appContractId: appA, documentId: nil, values: template.values, + sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) + pending.unconfirmedKeyHash160 = hash.toHexString() + func holds( + _ grants: [AppConnectGrant], keys: [ManagedIdentity.IdentityPublicKeyInfo], + app: String = appA, identity: String = "identity" + ) -> Bool { + PlatformDashConnectDataSource.holdsUnconfirmedKey( + in: grants, appContractId: app, identityId: identity, currentIdentityPublicKeys: keys) + } + + XCTAssertTrue(holds([pending], keys: [Self.key(keyId: 9, data: hash)])) + // A refused submission under id 9 and a later one of the same request + // that landed under id 12: the record of the first is not that key. + XCTAssertFalse( + holds([pending], keys: [Self.key(keyId: 9, data: Data([9])), Self.key(keyId: 12, data: hash)]), + "the same key under another id") + XCTAssertFalse(holds([pending], keys: []), "the key is not there") + XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: hash, disabledAt: 1)]), "a disabled key") + XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: Data(repeating: 0x01, count: 20))])) + XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: hash)], app: "another app")) + XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: hash)], identity: "another identity")) + var confirmed = pending + confirmed.unconfirmedKeyHash160 = nil + XCTAssertFalse(holds([confirmed], keys: [Self.key(keyId: 9, data: hash)]), "a confirmed record") + } + func testDisconnectWithNoActiveWalletIsRefused() async { let active = ActiveWallet(nil) let (dataSource, _) = makeScopedDataSource(active: active) From 96bee7c7fcfe83ac37a91280b9c930da28536ddd Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Fri, 16 Oct 2026 22:57:49 +0300 Subject: [PATCH 034/108] fix(dashpay): choose the disconnect from a fresh view, and settle a one-QR registration by its revision A disconnect picked one-QR or two-QR from the row alone. A two-QR row with a one-QR registration whose outcome was not known was turned off locally, and the key could land afterwards with no row; a confirmed grant whose row write was lost had its repaired row overwritten as two-QR again. The registration now notes the identity revision its update was built for. Platform takes an identity update only at one above the identity's revision, so once the identity is there without the key the update can never land. The revocation reads the identity's keys and revision after the PIN and then settles each pending registration of the app: a live key that cannot be confirmed stops the disconnect, one that can never land is dropped, and one that may still land makes the disconnect one-QR, whose disable update leaves it unable to land; with nothing to disable the disconnect stops with a new message. A live key of a confirmed grant also makes it one-QR. The caller removes or downgrades the row by what the revocation returns. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 10 +- .../PlatformDashConnectDataSource.swift | 289 +++++++++++------- DashWallet/ar.lproj/Localizable.strings | 1 + DashWallet/bg.lproj/Localizable.strings | 1 + DashWallet/ca.lproj/Localizable.strings | 1 + DashWallet/cs.lproj/Localizable.strings | 1 + DashWallet/da.lproj/Localizable.strings | 1 + DashWallet/de.lproj/Localizable.strings | 1 + DashWallet/el.lproj/Localizable.strings | 1 + DashWallet/en.lproj/Localizable.strings | 1 + DashWallet/eo.lproj/Localizable.strings | 1 + DashWallet/es.lproj/Localizable.strings | 1 + DashWallet/et.lproj/Localizable.strings | 1 + DashWallet/fa.lproj/Localizable.strings | 1 + DashWallet/fi.lproj/Localizable.strings | 1 + DashWallet/fil.lproj/Localizable.strings | 1 + DashWallet/fr.lproj/Localizable.strings | 1 + DashWallet/hr.lproj/Localizable.strings | 1 + DashWallet/hu.lproj/Localizable.strings | 1 + DashWallet/id.lproj/Localizable.strings | 1 + DashWallet/it.lproj/Localizable.strings | 1 + DashWallet/ja.lproj/Localizable.strings | 1 + DashWallet/ko.lproj/Localizable.strings | 1 + DashWallet/mk.lproj/Localizable.strings | 1 + DashWallet/ms.lproj/Localizable.strings | 1 + DashWallet/nb.lproj/Localizable.strings | 1 + DashWallet/nl.lproj/Localizable.strings | 1 + DashWallet/pl.lproj/Localizable.strings | 1 + DashWallet/pt.lproj/Localizable.strings | 1 + DashWallet/ro.lproj/Localizable.strings | 1 + DashWallet/ru.lproj/Localizable.strings | 1 + DashWallet/sk.lproj/Localizable.strings | 1 + DashWallet/sl.lproj/Localizable.strings | 1 + DashWallet/sl_SI.lproj/Localizable.strings | 1 + DashWallet/sq.lproj/Localizable.strings | 1 + DashWallet/sr.lproj/Localizable.strings | 1 + DashWallet/sv.lproj/Localizable.strings | 1 + DashWallet/th.lproj/Localizable.strings | 1 + DashWallet/tr.lproj/Localizable.strings | 1 + DashWallet/uk.lproj/Localizable.strings | 1 + DashWallet/vi.lproj/Localizable.strings | 1 + DashWallet/zh-Hans.lproj/Localizable.strings | 1 + .../zh-Hant-TW.lproj/Localizable.strings | 1 + DashWallet/zh.lproj/Localizable.strings | 1 + DashWallet/zh_TW.lproj/Localizable.strings | 1 + .../PlatformDashConnectDataSourceTests.swift | 90 ++++-- 46 files changed, 302 insertions(+), 130 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 3cc9d13be1..c0ed74f36a 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -555,8 +555,16 @@ struct AppConnectGrant: Codable, Equatable { /// registration is submitted until the key is seen on the identity. /// While set, the key may be there or not: an update can land without /// confirming. Such a record has no row and no response; it is kept so - /// the key, if it lands, is found and confirmed. + /// the key, if it lands, is found and confirmed, until a disconnect + /// finds that the update can no longer land. var unconfirmedKeyHash160: String? = nil + /// The identity revision the registration's update was submitted with, + /// set with `unconfirmedKeyHash160`. Platform takes an identity update + /// only at one above the identity's revision, so once the identity is at + /// this revision or past it without the key live, the update can never + /// land. + /// `nil` on a record from a build that did not note it. + var submittedRevision: UInt64? = nil var isUnconfirmed: Bool { unconfirmedKeyHash160 != nil } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index f63ccbc1ef..8174a88406 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -80,6 +80,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case grantNotRecorded case noFreeKeyId case otherIdentitiesNotChecked + case registrationPending case walletChanged case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection @@ -148,6 +149,10 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "The app's keys on this identity are off, but this wallet could not check its other identities. Try again.", comment: "DashConnect") + case .registrationPending: + return NSLocalizedString( + "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again.", + comment: "DashConnect") case .walletChanged: return NSLocalizedString("The active wallet or identity changed. Try again.", comment: "DashConnect") case .noFreeKeyId: @@ -926,6 +931,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { publishedAt: now() ) pending.unconfirmedKeyHash160 = sessionKeyHash160.toHexString() + // The update is built at one above the revision the wallet holds + // for the identity, read again from Platform above. + let revisionBefore = try context.wallet.managedIdentity(identityId: context.identityId).getRevision() + pending.submittedRevision = revisionBefore == .max ? nil : revisionBefore + 1 // A confirmed record for this request means its key is on the // identity, and a view without it is behind: registering again // would be refused, and the record must keep its values. @@ -954,10 +963,24 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } } catch { + // Another update of the identity that landed meanwhile moved + // the wallet's revision, and this one may have been built on + // it: the record names the higher of the two, which only + // makes a disconnect wait longer for the outcome. + if let revisionAfter = try? context.wallet + .managedIdentity(identityId: context.identityId).getRevision(), + revisionAfter > revisionBefore, revisionAfter < .max { + updateGrants(in: stores) { grants in + guard let index = grants.firstIndex(where: { $0.key == pending.key }) else { return } + grants[index].submittedRevision = revisionAfter + 1 + } + pending.submittedRevision = revisionAfter + 1 + } // The update may have landed all the same. If the key is on // the identity, the login goes on; otherwise the failure // stands and the record stays unconfirmed, to be confirmed if - // the key turns up later. + // the key turns up later, or dropped by a disconnect once the + // update can no longer land. guard let keys = try? await refreshedIdentityPublicKeys(context: context), let bindings = try? Self.storedKeyBindings( identityId: identityId, modelContainer: context.modelContainer), @@ -1652,37 +1675,31 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard scope == stores.scope else { throw DashConnectPlatformError.walletChanged } - // A one-QR registration whose outcome was never seen may have landed - // over this app's two-QR row. Which disconnect runs is decided by the - // row, so such a record of the active identity is settled against a - // fresh view of it first: a key confirmed there makes the row - // one-QR. If that cannot be done, nothing is turned off and the row - // stays. - try await settleUnconfirmedRegistrations(appContractId: id, stores: stores) - let isOneQR = rows(in: stores).first { $0.id == id }?.loginKind == .oneQR - // A record still unconfirmed takes no part: the fresh view did not - // show its key live, or the record is another identity's. - // TODO(dashconnect-unconfirmed-row): an update still on its way when - // that view was read lands after this disconnect, and its key is - // shown again only by the next one-QR approval with this identity. - let hasGrants = stores.grants.load().contains { $0.appContractId == id && !$0.isUnconfirmed } - if isOneQR || hasGrants { - let liveElsewhere = try await revokeAppConnectGrants( - appContractId: id, checksUnrecordedKeys: isOneQR, stores: stores) + let rowIsOneQR = rows(in: stores).first { $0.id == id }?.loginKind == .oneQR + // What can reach Platform: a confirmed grant of the app, and a + // registration of it whose outcome is not known yet. Which of the + // two disconnects runs is settled by the revocation, from a fresh + // view of the identity, not by the row alone. + let hasGrants = stores.grants.load().contains { + $0.appContractId == id && (!$0.isUnconfirmed || $0.submittedRevision != nil) + } + if rowIsOneQR || hasGrants { + let revocation = try await revokeAppConnectGrants( + appContractId: id, rowIsOneQR: rowIsOneQR, stores: stores) // The row stands for the app, and the app still holds a key on // another identity of this wallet. That key can only be disabled // while its identity is the active one, so the row stays to get // there, and the user is told; this identity's keys are off. - if liveElsewhere { throw DashConnectPlatformError.grantOnAnotherIdentity } - } - if isOneQR { - // The session keys are disabled, and so are the keys of an - // earlier two-QR login that were found: the same QR can no - // longer be approved and there is no second step to wait for, - // so the row goes instead of sitting in the two-QR "approved" - // state. - await updateRows(in: stores) { rows in rows.filter { $0.id != id } } - return + if revocation.liveElsewhere { throw DashConnectPlatformError.grantOnAnotherIdentity } + if revocation.asOneQR { + // The session keys are disabled, and so are the keys of an + // earlier two-QR login that were found: the same QR can no + // longer be approved and there is no second step to wait + // for, so the row goes instead of sitting in the two-QR + // "approved" state. + await updateRows(in: stores) { rows in rows.filter { $0.id != id } } + return + } } let disconnectedAt = now() @@ -1703,57 +1720,50 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - /// When the active identity has an unconfirmed registration of the app, - /// reads the identity again and runs `confirmRegistrations` with it, - /// which confirms every registration of the identity whose key is there - /// and makes those apps' rows one-QR. Returns without anything else when - /// there is no such record. Throws when the wallet's context cannot be - /// resolved or the identity read, and when the read shows the key of a - /// registration of the app that still could not be confirmed. - private func settleUnconfirmedRegistrations(appContractId: String, stores: Stores) async throws { - let activeIdentityId = await MainActor.run { DWCurrentUserIdentityInfo.shared.identityId } - guard let identityId = activeIdentityId?.toBase58String(), stores.grants.load().contains(where: { - $0.appContractId == appContractId && $0.identityId == identityId && $0.isUnconfirmed - }) else { return } - let context = try await requireContext(pinnedTo: stores) - guard context.identityId.toBase58String() == identityId else { - throw DashConnectPlatformError.walletChanged - } - let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) - await confirmRegistrations( - identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, - modelContainer: context.modelContainer, in: stores) - // The key landed live under the record's id but the record could not - // be confirmed: the key store has no readable bound for it, or the - // key differs from what the record says was submitted. The local - // disconnect would leave that key on with no row to turn it off from. - guard !Self.holdsUnconfirmedKey( - in: stores.grants.load(), appContractId: appContractId, identityId: identityId, - currentIdentityPublicKeys: currentPublicKeys) - else { - Self.logger.error("🔗 DASHCONNECT :: an unconfirmed session key of the app is live, but its record could not be confirmed") - throw DashConnectPlatformError.identityKeysOutOfDate - } - } - - /// Whether the identity holds, live, the key an unconfirmed registration - /// of the app was going to register, under the id it was submitted with. - /// The same key under another id came from another submission of the - /// request, which has its own record. - static func holdsUnconfirmedKey( - in grants: [AppConnectGrant], - appContractId: String, - identityId: String, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + /// Whether a disconnect of the app takes the one-QR path. A live session + /// key of a confirmed grant makes it one-QR however the row reads: a row + /// write lost after the grant was confirmed leaves the app's two-QR row + /// in place. So does a registration that may still land: any disable + /// update the one-QR path then sends lands above the revision that + /// registration was built on, after which it can never land. + static func disconnectsAsOneQR( + rowIsOneQR: Bool, + holdsLiveGrantedKey: Bool, + hasRegistrationThatMayStillLand: Bool ) -> Bool { - grants.contains { grant in - guard grant.appContractId == appContractId, grant.identityId == identityId, - let hash = grant.unconfirmedKeyHash160 else { return false } - return currentIdentityPublicKeys.contains { - UInt32(bitPattern: $0.keyId) == grant.sessionKeyId && $0.disabledAt == nil - && $0.keyType == .ecdsaHash160 && $0.data.toHexString() == hash - } + rowIsOneQR || holdsLiveGrantedKey || hasRegistrationThatMayStillLand + } + + /// What a view of the identity at `identityRevision` tells of an + /// unconfirmed registration. + enum RegistrationOutcome: Equatable { + /// The key is on the identity, live, under the id the registration + /// was submitted with. The same key under another id came from + /// another submission of the request, which has its own record. + case keyLive + /// The identity is at the update's revision or past it without that + /// key live, so the update can never land. + case cannotLand + /// The identity is below the update's revision: the update may still + /// land. + case mayStillLand + /// The record does not note the revision it was submitted with. + case unknownRevision + } + + static func registrationOutcome( + of grant: AppConnectGrant, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + identityRevision: UInt64 + ) -> RegistrationOutcome { + let isLive = currentIdentityPublicKeys.contains { + UInt32(bitPattern: $0.keyId) == grant.sessionKeyId && $0.disabledAt == nil + && $0.keyType == .ecdsaHash160 && $0.data.toHexString() == grant.unconfirmedKeyHash160 } + if isLive { return .keyLive } + guard let submitted = grant.submittedRevision else { return .unknownRevision } + guard identityRevision >= submitted else { return .mayStillLand } + return .cannotLand } /// Ends the access one-QR logins gave an app: disables its session keys @@ -1776,22 +1786,30 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// every time and Platform never re-adds a key, so the app cannot sign /// in with two QRs again. A two-QR row keeps them. /// - /// Returns whether a grant record shows the app with a live key on - /// another identity of this wallet. When this identity gave it none, that - /// is thrown instead: nothing was turned off. - /// For a row made by the one-QR login that also covers keys on another - /// identity that no grant record names, as far as the wallet's store - /// shows them. + /// Returns, as `liveElsewhere`, whether a grant record shows the app with + /// a live key on another identity of this wallet. When this identity gave + /// it none, that is thrown instead: nothing was turned off. For a one-QR + /// disconnect that also covers keys on another identity that no grant + /// record names, as far as the wallet's store shows them. `asOneQR` says + /// which disconnect this was. + /// + /// For a row made by the one-QR login, with no record for this identity, + /// the keys are still looked for on it. When it holds none bound to the + /// app, there was nothing to turn off here and the call returns without + /// an error. /// - /// `checksUnrecordedKeys` is set for a row made by the one-QR login: with - /// no record for this identity the keys are still looked for on it. When - /// it holds none bound to the app, there was nothing to turn off here and - /// the call returns without an error. + /// Which disconnect this is, one-QR or two-QR, is settled after the + /// identity is read again (`disconnectsAsOneQR`) and returned. This + /// identity's registrations of the app whose outcome was not known are + /// settled by that read (`registrationOutcome`): a live key that cannot + /// be confirmed stops the disconnect, one that can never land is + /// dropped, and one that may still land is dropped once a disable update + /// has landed; with no key to disable it stops the disconnect. private func revokeAppConnectGrants( appContractId: String, - checksUnrecordedKeys: Bool, + rowIsOneQR: Bool, stores: Stores - ) async throws -> Bool { + ) async throws -> (liveElsewhere: Bool, asOneQR: Bool) { // The row was picked in the wallet `stores` belongs to; another // wallet's identity is not the one the row belongs to. var context = try await requireContext(pinnedTo: stores) @@ -1799,6 +1817,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func isGranted(_ grant: AppConnectGrant) -> Bool { grant.identityId == identityId && grant.appContractId == appContractId } + // TODO(dashconnect-unconfirmed-row): a registration of the app on + // another identity whose outcome is not known is not counted here. + // If it lands after this disconnect, its key is shown again only by + // the next one-QR approval with that identity. func hasLiveGrantElsewhere() -> Bool { stores.grants.load().contains { $0.appContractId == appContractId && $0.identityId != identityId && $0.keyDisabled != true @@ -1808,17 +1830,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard let appContract = Self.decodeIdentifier(appContractId) else { throw DashConnectPlatformError.loginContractUnavailable } - if !stores.grants.load().contains(where: { isGranted($0) && !$0.isUnconfirmed }) { + if !stores.grants.load().contains(where: { + isGranted($0) && (!$0.isUnconfirmed || $0.submittedRevision != nil) + }) { // Before the PIN prompt, from the store alone: whether this // identity holds a key of the app's that has no record. - let holdsUnrecordedKey = try checksUnrecordedKeys && Self + let holdsUnrecordedKey = try rowIsOneQR && Self .storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) .contains { $0.singleContractId == appContract && !$0.isDisabled && $0.isSessionKeyShaped } // A one-QR row goes on to the PIN prompt either way: the keys of // an earlier two-QR login can only be looked for after it. - if !holdsUnrecordedKey, !checksUnrecordedKeys { + if !holdsUnrecordedKey, !rowIsOneQR { if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } - return false + return (liveElsewhere: false, asOneQR: false) } } @@ -1826,18 +1850,47 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { context = try await contextAfterAuthorization(matching: context) let signer = KeychainSigner(modelContainer: context.modelContainer) - let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) - // A registration whose key has turned up is confirmed. One that has - // not stays unconfirmed and takes no part in what follows: its key - // id may belong to another key, and its absence says nothing. - // TODO(dashconnect-unconfirmed-row): if the view stays behind - // through this disconnect too, the app's row goes while that key may - // have landed; the next one-QR approval with this identity confirms - // the key and shows the app again. + let (currentPublicKeys, revision) = try await refreshedIdentityKeysAndRevision(context: context) + // A registration whose key has turned up is confirmed. await confirmRegistrations( identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, modelContainer: context.modelContainer, in: stores) + // One that has not is settled by its revision. One that does not + // note it takes no part: its key id may belong to another key, and + // its absence says nothing. + // TODO(dashconnect-unconfirmed-row): such a record (from a build + // before `submittedRevision`) whose update lands after this + // disconnect is shown again only by the next one-QR approval with + // this identity. + var mayStillLand: Set = [] + var cannotLand: Set = [] + for grant in stores.grants.load() where isGranted(grant) && grant.isUnconfirmed { + switch Self.registrationOutcome( + of: grant, currentIdentityPublicKeys: currentPublicKeys, identityRevision: revision) { + case .keyLive: + // The key landed live under the record's id but the record + // could not be confirmed: the key store has no readable + // bound for it, or the key differs from what the record says + // was submitted. + Self.logger.error("🔗 DASHCONNECT :: an unconfirmed session key of the app is live, but its record could not be confirmed") + throw DashConnectPlatformError.identityKeysOutOfDate + case .cannotLand: cannotLand.insert(grant.key) + case .mayStillLand: mayStillLand.insert(grant.key) + case .unknownRevision: break + } + } + if !cannotLand.isEmpty { + Self.logger.info("🔗 DASHCONNECT :: dropping \(cannotLand.count, privacy: .public) session key registration(s) that can no longer land") + updateGrants(in: stores) { grants in grants.removeAll { cannotLand.contains($0.key) } } + } let granted = stores.grants.load().filter { isGranted($0) && !$0.isUnconfirmed } + let asOneQR = Self.disconnectsAsOneQR( + rowIsOneQR: rowIsOneQR, + holdsLiveGrantedKey: granted.contains { grant in + currentPublicKeys.contains { UInt32(bitPattern: $0.keyId) == grant.sessionKeyId && $0.disabledAt == nil } + }, + hasRegistrationThatMayStillLand: !mayStillLand.isEmpty) + let checksUnrecordedKeys = asOneQR guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { // Platform never removes a key, so the node that answered is // behind. A key it does not know cannot be shown to be disabled, @@ -1888,6 +1941,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { throw DashConnectPlatformError.grantOnAnotherIdentity } + if !mayStillLand.isEmpty, keyIds.isEmpty { + // No update would be sent, so nothing settles the registration. + // TODO(dashconnect-pending-registration): an update that was + // refused, or never sent, cannot be told from one still on its + // way, so this stays until the identity's revision moves or the + // app's code is approved again. + Self.logger.error("🔗 DASHCONNECT :: a session key registration of the app may still land, and there is no key to disable") + throw DashConnectPlatformError.registrationPending + } if !keyIds.isEmpty { Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) app key(s)") // Platform takes a limited number of keys per update. A failure @@ -1901,6 +1963,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } Self.logger.info("🔗 DASHCONNECT :: app key(s) disabled") + // Each registration that might still land names a revision above + // `revision`, the one below it the identity was already at. The + // update that just landed took one above the identity's revision + // when it was built, at least the revision such a registration + // names, and a revision only grows: none of them can land now. + if !mayStillLand.isEmpty { + updateGrants(in: stores) { grants in grants.removeAll { mayStillLand.contains($0.key) } } + } } // The session keys of the grants read above are now off, and only @@ -1917,12 +1987,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - if hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { return true } + if hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { return (liveElsewhere: true, asOneQR: asOneQR) } // This identity's keys are off. Whether another one holds a key of // the app could not be read from the store, so the row stays, with // an error rather than without one. guard heldOnAnotherIdentity != nil else { throw DashConnectPlatformError.otherIdentitiesNotChecked } - return false + return (liveElsewhere: false, asOneQR: asOneQR) } /// Whether the wallet's store shows another identity of this wallet with @@ -2492,12 +2562,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private func refreshedIdentityPublicKeys( context: Context ) async throws -> [ManagedIdentity.IdentityPublicKeyInfo] { + try await refreshedIdentityKeysAndRevision(context: context).keys + } + + /// The identity's keys and revision as Platform has them, both read from + /// one copy of the identity. + private func refreshedIdentityKeysAndRevision( + context: Context + ) async throws -> (keys: [ManagedIdentity.IdentityPublicKeyInfo], revision: UInt64) { guard try await context.wallet.loadIdentity(atIndex: context.identityIndex) == context.identityId else { throw DashConnectPlatformError.noIdentity } - return try context.wallet - .managedIdentity(identityId: context.identityId) - .getPublicKeys() + let identity = try context.wallet.managedIdentity(identityId: context.identityId) + return (try identity.getPublicKeys(), try identity.getRevision()) } /// What the wallet's store holds for each key of the identity. The store diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 1b45a8d4e6..877b31a1a9 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 83cb82a924..923a408105 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index d31369052b..fcb9b6c4f3 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 432891cb5c..3e61290826 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index abacd68730..b5b3907fcd 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 5cf03bc111..d8a4ef434d 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index de47dbd583..3af2216e88 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 00e967a464..b50be6cc38 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6198,6 +6198,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 69c90d37d7..275927f8b4 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 3df8812c48..081003dcc1 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index cd887fca97..2ec63ec681 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 73b8dd5b5a..ee95ca5b77 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index a73ba7af05..5ee92952a8 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index bf08c216b5..87bf4f8087 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index fa1fae6961..07c7717a99 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 6f5fe24660..ce79f6ca5e 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index ca5ec716ee..175eb3b350 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index d7933ceee4..8f5353cb39 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 6eb4457447..7d8a21b767 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index fc27f2a562..30985951cc 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 02de3b0edc..0647795e90 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 143fe77df3..dcfb1fd439 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index f416161925..4e980f00ac 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index c8d9c8432d..a402756eb9 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 5732f96f33..b26c76b68f 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 797d0b2b46..e459e3e1ac 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 6cb4d6a3b9..fd85a6ed34 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 6c9394dadf..64484f1ade 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 4a4c254890..0d0e1741e4 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 205d48dd88..7e187ffe4d 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 9996efb438..e8d1057946 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 9bc4cc80d3..a85b00ccf8 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 4b062f76e5..5b526bca86 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index dc438e947e..ef137f55c1 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 2e907f037d..54e0ccdb2d 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index f0c82511d6..5b63519d87 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 91379c093f..ca390ad3ca 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 9860f79f9d..ac25212ab8 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index e1fd711f61..b160496fab 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index b17778cdf5..08a819a89c 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 565c8d6237..4d18074a8e 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 24fef45e09..33a047261c 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 1060a52194..2520d09343 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index c357d264e2..fb0543b59b 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2766,38 +2766,82 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(rows.map(\.loginKind), [.oneQR]) } - /// A disconnect stops on an unconfirmed registration of the app whose - /// key is live: the local two-QR disconnect would leave it on. - func testALiveKeyOfAnUnconfirmedRegistrationIsFound() { - let appA = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" + /// What a fresh view says of an unconfirmed registration: its key live + /// under its id, an update that can never land once the identity is at + /// its revision without the key, or one that may still land. + func testAnUnconfirmedRegistrationIsSettledByItsKeyAndTheIdentityRevision() { let hash = Data(repeating: 0x5A, count: 20) let template = Self.grant(sessionKeyId: 9) var pending = AppConnectGrant( - identityId: "identity", appContractId: appA, documentId: nil, values: template.values, + identityId: "identity", appContractId: "app", documentId: nil, values: template.values, sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) pending.unconfirmedKeyHash160 = hash.toHexString() - func holds( - _ grants: [AppConnectGrant], keys: [ManagedIdentity.IdentityPublicKeyInfo], - app: String = appA, identity: String = "identity" - ) -> Bool { - PlatformDashConnectDataSource.holdsUnconfirmedKey( - in: grants, appContractId: app, identityId: identity, currentIdentityPublicKeys: keys) + pending.submittedRevision = 4 + func outcome( + _ grant: AppConnectGrant, keys: [ManagedIdentity.IdentityPublicKeyInfo], revision: UInt64 + ) -> PlatformDashConnectDataSource.RegistrationOutcome { + PlatformDashConnectDataSource.registrationOutcome( + of: grant, currentIdentityPublicKeys: keys, identityRevision: revision) } - XCTAssertTrue(holds([pending], keys: [Self.key(keyId: 9, data: hash)])) + XCTAssertEqual(outcome(pending, keys: [Self.key(keyId: 9, data: hash)], revision: 4), .keyLive) + // Still at the revision the update was built on: it may land. + XCTAssertEqual(outcome(pending, keys: [], revision: 3), .mayStillLand) + // Another update took the revision, or this one landed and its key + // was turned off since. + XCTAssertEqual(outcome(pending, keys: [], revision: 4), .cannotLand) + XCTAssertEqual(outcome(pending, keys: [], revision: 7), .cannotLand) + XCTAssertEqual(outcome(pending, keys: [Self.key(keyId: 9, data: hash, disabledAt: 1)], revision: 4), .cannotLand) // A refused submission under id 9 and a later one of the same request // that landed under id 12: the record of the first is not that key. - XCTAssertFalse( - holds([pending], keys: [Self.key(keyId: 9, data: Data([9])), Self.key(keyId: 12, data: hash)]), - "the same key under another id") - XCTAssertFalse(holds([pending], keys: []), "the key is not there") - XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: hash, disabledAt: 1)]), "a disabled key") - XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: Data(repeating: 0x01, count: 20))])) - XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: hash)], app: "another app")) - XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: hash)], identity: "another identity")) - var confirmed = pending - confirmed.unconfirmedKeyHash160 = nil - XCTAssertFalse(holds([confirmed], keys: [Self.key(keyId: 9, data: hash)]), "a confirmed record") + XCTAssertEqual( + outcome(pending, keys: [Self.key(keyId: 9, data: Data([9])), Self.key(keyId: 12, data: hash)], revision: 5), + .cannotLand) + var unnoted = pending + unnoted.submittedRevision = nil + XCTAssertEqual(outcome(unnoted, keys: [], revision: 9), .unknownRevision) + XCTAssertEqual(outcome(unnoted, keys: [Self.key(keyId: 9, data: hash)], revision: 9), .keyLive) + } + + /// A live key of a confirmed grant, or a registration that may still + /// land, makes the disconnect one-QR even over a two-QR row. + func testWhatMakesADisconnectOneQR() { + func oneQR(row: Bool = false, live: Bool = false, pending: Bool = false) -> Bool { + PlatformDashConnectDataSource.disconnectsAsOneQR( + rowIsOneQR: row, holdsLiveGrantedKey: live, hasRegistrationThatMayStillLand: pending) + } + + XCTAssertFalse(oneQR(), "a two-QR row and nothing live") + XCTAssertTrue(oneQR(row: true)) + XCTAssertTrue(oneQR(live: true), "a confirmed grant over a two-QR row, its row write lost") + XCTAssertTrue(oneQR(pending: true), "the one-QR disable update settles the registration") + } + + /// A two-QR row with a registration of the app whose outcome is not + /// known is not turned off locally: the disconnect goes to Platform, and + /// when that cannot be done the row stays as it was. + func testATwoQRRowWithARegistrationThatMayStillLandIsNotTurnedOffLocally() async throws { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + let grants = UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .connections(connections)) + let template = Self.grant(sessionKeyId: 9) + var pending = AppConnectGrant( + identityId: "identity", appContractId: row.id, documentId: nil, values: template.values, + sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) + pending.unconfirmedKeyHash160 = Data(repeating: 0x5A, count: 20).toHexString() + pending.submittedRevision = 4 + grants.pinned(toWalletIdHex: "wallet-a").save([pending]) + let shown = Self.shownRows(dataSource) + + do { + try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) + XCTFail("turned off locally while the registration may still land") + } catch {} + + XCTAssertEqual(connections.load().map(\.status), [.active]) + XCTAssertEqual(connections.load().map(\.loginKind), [.twoQR]) + XCTAssertEqual(grants.pinned(toWalletIdHex: "wallet-a").load().map(\.key), [pending.key]) } func testDisconnectWithNoActiveWalletIsRefused() async { From 13c1466262dbf6c8253e031a7bc05cfb385a9815 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sun, 18 Oct 2026 18:31:38 +0300 Subject: [PATCH 035/108] fix(dashpay): open an App Connect callback only for a request opened as a link A QR code scanned off another screen is answered on that screen: opening its callback on this phone started an unrelated session of the app in the phone's browser. The view model knows how the request arrived, and opens `cb` only for one delivered by `onURIReceived`. Co-Authored-By: Claude Opus 5.5 --- .../UI/DashConnect/ConnectionsViewModel.swift | 18 +++++-- .../PlatformDashConnectDataSourceTests.swift | 49 ++++++++++++++++++- 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 02d0a6ce0b..81a079d75c 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -73,6 +73,11 @@ final class ConnectionsViewModel: ObservableObject { /// The status the pending App Connect request's callback reports if the /// user closes the sheet now: set when an approval failed. private var pendingFailureStatus: AppConnect.CallbackStatus? + /// Whether the pending request came as a link opened on this phone. Only + /// then is its callback opened: a QR code scanned off another screen is + /// answered on that screen, and opening the callback here would start an + /// unrelated session of the app in this phone's browser. + private var pendingRequestArrivedByLink = false private var cancellables = Set() /// Serializes inbound requests. @@ -112,6 +117,10 @@ final class ConnectionsViewModel: ObservableObject { } func onQRScanned(_ content: String) { + receive(content, byLink: false) + } + + private func receive(_ content: String, byLink: Bool) { guard !featureUnavailable else { return } // A request the user is already looking at owns the screen until they @@ -169,6 +178,7 @@ final class ConnectionsViewModel: ObservableObject { let connectionRequest = await dataSource.makeConnectionRequest(from: request) guard generation == requestGeneration else { return } pendingLoginRequest = request + pendingRequestArrivedByLink = byLink pendingFailureStatus = nil pendingRequest = connectionRequest case let .stateTransition(request): @@ -200,9 +210,10 @@ final class ConnectionsViewModel: ObservableObject { } /// A `dash-key:` / `dash-st:` link opened by an app running on this phone. - /// It carries exactly what the QR code encodes, so it takes the same path. + /// It carries exactly what the QR code encodes, so it takes the same path, + /// except that only a link's callback is opened. func onURIReceived(_ uri: String) { - onQRScanned(uri) + receive(uri, byLink: true) } func approvePendingRequest() { @@ -282,7 +293,8 @@ final class ConnectionsViewModel: ObservableObject { /// The app treats it as a nudge to look for the response, never as /// proof of anything. private func openCallback(of request: DashKeyRequest, status: AppConnect.CallbackStatus) { - guard let callback = request.appConnect?.callback, + guard pendingRequestArrivedByLink, + let callback = request.appConnect?.callback, let url = AppConnect.callbackURL(callback, status: status) else { return } openURL(url) } diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 7821928da8..79cd29cebf 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1407,6 +1407,42 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertNil(viewModel.approveError) } + /// An App Connect request with a callback, approved from a scanned QR + /// code or from a link opened on this phone. + private func approveAppConnectRequest(byLink: Bool) async throws -> [URL] { + var request = MockDashConnectDataSource.sampleLoginRequest + request.appConnect = try DashConnectUri.parseAppConnectRequest( + "dash-key:2fAANHHASdojyjV9Sqa2wf2nwZE8kLLqmeHpZWa8sBfaGsddVqyMG2ZVte7xJkTKsXvmFYbXzXbNnMo7bJQBxNcf79N8YWi7pLKyb39Rqv6b1KUmxw9UeJGYz2CV9hFGNUQtcyMYVq2Fg6vAxtxpYays61H8gLMcWqaG8TfgGA3H7setGAYiBsM5YmdZgeuCdGAHSwfNfav5cfFjXNDkPWv37UNSgFxj6o58jfXc3kCLKqLJtc5ZPjm1thEGYxK8HVYBi8fRQeEVy76n27DXGrVTyHz94CfJRuMnH76xGYbMgeuvurxjJMLrQgWUu53cjocYyzzNWdJrgs2D5?n=d&v=2&cb=https%3A%2F%2Fyap.pr%2Fconnect%3Fr%3Dd77dc0da9df83a47755a15c42c5d9db9d7a7fd62") + let spy = LoginApprovalSpy(shown: [Self.consent(identityId: "identity-a", terms: .current)], loginRequest: request) + let opened = OpenedURLs() + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false, openURL: { opened.urls.append($0) }) + + if byLink { + viewModel.onURIReceived("login") + } else { + viewModel.onQRScanned("login") + } + await waitUntil { viewModel.pendingRequest != nil } + viewModel.approvePendingRequest() + await waitUntil { viewModel.pendingRequest == nil } + XCTAssertEqual(spy.approvedConsents.count, 1) + return opened.urls + } + + /// A QR code scanned off another screen is answered there: opening the + /// callback on this phone would start an unrelated session of the app. + func testApprovingAScannedAppConnectRequestDoesNotOpenItsCallback() async throws { + let opened = try await approveAppConnectRequest(byLink: false) + XCTAssertEqual(opened, []) + } + + /// A link opened by the app on this phone returns to it when answered. + func testApprovingALinkedAppConnectRequestOpensItsCallback() async throws { + let opened = try await approveAppConnectRequest(byLink: true) + XCTAssertEqual(opened.map(\.host), ["yap.pr"]) + XCTAssertEqual(opened.first?.absoluteString.contains("ac=ok"), true) + } + /// Another identity became active, or the network answers with the other /// login, while the sheet was up: nothing is approved on the old sheet, /// and the user decides again on what is true now. @@ -1583,8 +1619,11 @@ private final class LoginApprovalSpy: DashConnectDataSource { private var storedApproveFailures: [Error] = [] private var storedApprovedConsents: [ConnectionRequest] = [] - init(shown: [ConnectionRequest]) { + private let loginRequest: DashKeyRequest + + init(shown: [ConnectionRequest], loginRequest: DashKeyRequest = MockDashConnectDataSource.sampleLoginRequest) { self.shown = shown + self.loginRequest = loginRequest } /// Thrown by the approvals in order, one each; later approvals succeed. @@ -1602,7 +1641,7 @@ private final class LoginApprovalSpy: DashConnectDataSource { } func parseQR(_ content: String) async throws -> DashConnectQr { - .login(MockDashConnectDataSource.sampleLoginRequest) + .login(loginRequest) } func makeConnectionRequest(from loginRequest: DashKeyRequest) async -> ConnectionRequest { @@ -1633,6 +1672,12 @@ private final class LoginApprovalSpy: DashConnectDataSource { func remove(id: String, scope: String?) async {} } +/// The URLs a view model asked to open, in order. +@MainActor +private final class OpenedURLs { + var urls: [URL] = [] +} + private enum PurchaseSpyError: LocalizedError { case refused case unsupported From ce53cc7518fa6ccffd9cea05c9c372fab52bc900 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sun, 18 Oct 2026 18:37:22 +0300 Subject: [PATCH 036/108] fix(dashpay): report the user's last answer to an App Connect callback A failed attempt left `ac=failed` behind: a retry cancelled at the PIN prompt, or a sheet rebuilt after the approval went out of date, then closed with the earlier failure. A cancelled prompt now clears it, and so does each rebuild, so closing the sheet reports a decline. Co-Authored-By: Claude Opus 5.5 --- .../UI/DashConnect/ConnectionsViewModel.swift | 12 ++++++---- .../PlatformDashConnectDataSourceTests.swift | 24 +++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 81a079d75c..3499aec091 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -242,14 +242,17 @@ final class ConnectionsViewModel: ObservableObject { // with the other login: what the sheet showed is not what // would run. Nothing was signed. The sheet is rebuilt from // the same request as it stands now, for a new decision. + // An earlier failure was on the sheet this one replaces. + self.pendingFailureStatus = nil self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) self.approveError = DashConnectPlatformError.approvalOutOfDate.localizedDescription } catch { // Keep the sheet up so the user can retry without rescanning the QR. - // A cancelled PIN prompt is the user declining, not a failure. - if error as? DashConnectPlatformError != .authorizationCancelled { - self.pendingFailureStatus = (error as? AppConnect.Refusal)?.status ?? .failed - } + // A cancelled PIN prompt is the user declining, not a failure, + // whatever an earlier attempt ended in. + self.pendingFailureStatus = error as? DashConnectPlatformError == .authorizationCancelled + ? nil + : (error as? AppConnect.Refusal)?.status ?? .failed self.approveError = String( format: NSLocalizedString("Could not complete the DashConnect request: %@", comment: "DashConnect"), error.localizedDescription @@ -268,6 +271,7 @@ final class ConnectionsViewModel: ObservableObject { Task { defer { isApproving = false } + self.pendingFailureStatus = nil self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) } } diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 79cd29cebf..dbdcd6ce81 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1443,6 +1443,30 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertEqual(opened.first?.absoluteString.contains("ac=ok"), true) } + /// An attempt failed, the next one was cancelled at the PIN prompt, and + /// the user then closed the sheet: the app hears the user's last answer, + /// a decline, not the earlier failure. + func testClosingTheSheetAfterACancelledRetryReportsADecline() async throws { + var request = MockDashConnectDataSource.sampleLoginRequest + request.appConnect = try DashConnectUri.parseAppConnectRequest( + "dash-key:2fAANHHASdojyjV9Sqa2wf2nwZE8kLLqmeHpZWa8sBfaGsddVqyMG2ZVte7xJkTKsXvmFYbXzXbNnMo7bJQBxNcf79N8YWi7pLKyb39Rqv6b1KUmxw9UeJGYz2CV9hFGNUQtcyMYVq2Fg6vAxtxpYays61H8gLMcWqaG8TfgGA3H7setGAYiBsM5YmdZgeuCdGAHSwfNfav5cfFjXNDkPWv37UNSgFxj6o58jfXc3kCLKqLJtc5ZPjm1thEGYxK8HVYBi8fRQeEVy76n27DXGrVTyHz94CfJRuMnH76xGYbMgeuvurxjJMLrQgWUu53cjocYyzzNWdJrgs2D5?n=d&v=2&cb=https%3A%2F%2Fyap.pr%2Fconnect%3Fr%3Dd77dc0da9df83a47755a15c42c5d9db9d7a7fd62") + let spy = LoginApprovalSpy(shown: [Self.consent(identityId: "identity-a", terms: .current)], loginRequest: request) + spy.approveFailures = [DashConnectPlatformError.noIdentity, DashConnectPlatformError.authorizationCancelled] + let opened = OpenedURLs() + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false, openURL: { opened.urls.append($0) }) + + viewModel.onURIReceived("login") + await waitUntil { viewModel.pendingRequest != nil } + viewModel.approvePendingRequest() + await waitUntil { spy.approvedConsents.count == 1 && !viewModel.isApproving } + viewModel.approvePendingRequest() + await waitUntil { spy.approvedConsents.count == 2 && !viewModel.isApproving } + viewModel.denyPendingRequest() + + XCTAssertEqual(opened.urls.count, 1) + XCTAssertEqual(opened.urls.first?.absoluteString.contains("ac=declined"), true) + } + /// Another identity became active, or the network answers with the other /// login, while the sheet was up: nothing is approved on the old sheet, /// and the user decides again on what is true now. From 87a75f1e98ba853ba51e910144b60f22f82f9554 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sun, 18 Oct 2026 18:37:23 +0300 Subject: [PATCH 037/108] fix(dashpay): check an App Connect v2 request against the app's website MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - A request for an app in the wallet's brand map whose callback is on a host the app does not have is refused (`invalid`): the sheet would be branded as the app and return somewhere else. - The sheet warns when the app is not in the brand map (its name and website come from the request), and when a known app's request does not return to its website. "Only approve if you just started signing in on …" names the app's website first, not the request's callback. - A key the app asked for with no budget is shown as able to spend the identity's credits without a limit. - `v=2` is recognised in the form-decoded query, as the v2 parser reads it, so `v=%32` is no longer sent to the v1 parser. New strings ship in English in every locale (Transifex translates). Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 28 +++++++++++++++++ .../PlatformDashConnectDataSource.swift | 11 ++++++- .../DashConnect/Protocol/DashConnectUri.swift | 12 +++++-- .../DashConnect/ApproveConnectionSheet.swift | 31 +++++++++++++++++-- DashWallet/ar.lproj/Localizable.strings | 5 ++- DashWallet/bg.lproj/Localizable.strings | 5 ++- DashWallet/ca.lproj/Localizable.strings | 5 ++- DashWallet/cs.lproj/Localizable.strings | 5 ++- DashWallet/da.lproj/Localizable.strings | 5 ++- DashWallet/de.lproj/Localizable.strings | 5 ++- DashWallet/el.lproj/Localizable.strings | 5 ++- DashWallet/en.lproj/Localizable.strings | 5 ++- DashWallet/eo.lproj/Localizable.strings | 5 ++- DashWallet/es.lproj/Localizable.strings | 5 ++- DashWallet/et.lproj/Localizable.strings | 5 ++- DashWallet/fa.lproj/Localizable.strings | 5 ++- DashWallet/fi.lproj/Localizable.strings | 5 ++- DashWallet/fil.lproj/Localizable.strings | 5 ++- DashWallet/fr.lproj/Localizable.strings | 5 ++- DashWallet/hr.lproj/Localizable.strings | 5 ++- DashWallet/hu.lproj/Localizable.strings | 5 ++- DashWallet/id.lproj/Localizable.strings | 5 ++- DashWallet/it.lproj/Localizable.strings | 5 ++- DashWallet/ja.lproj/Localizable.strings | 5 ++- DashWallet/ko.lproj/Localizable.strings | 5 ++- DashWallet/mk.lproj/Localizable.strings | 5 ++- DashWallet/ms.lproj/Localizable.strings | 5 ++- DashWallet/nb.lproj/Localizable.strings | 5 ++- DashWallet/nl.lproj/Localizable.strings | 5 ++- DashWallet/pl.lproj/Localizable.strings | 5 ++- DashWallet/pt.lproj/Localizable.strings | 5 ++- DashWallet/ro.lproj/Localizable.strings | 5 ++- DashWallet/ru.lproj/Localizable.strings | 5 ++- DashWallet/sk.lproj/Localizable.strings | 5 ++- DashWallet/sl.lproj/Localizable.strings | 5 ++- DashWallet/sl_SI.lproj/Localizable.strings | 5 ++- DashWallet/sq.lproj/Localizable.strings | 5 ++- DashWallet/sr.lproj/Localizable.strings | 5 ++- DashWallet/sv.lproj/Localizable.strings | 5 ++- DashWallet/th.lproj/Localizable.strings | 5 ++- DashWallet/tr.lproj/Localizable.strings | 5 ++- DashWallet/uk.lproj/Localizable.strings | 5 ++- DashWallet/vi.lproj/Localizable.strings | 5 ++- DashWallet/zh-Hans.lproj/Localizable.strings | 5 ++- .../zh-Hant-TW.lproj/Localizable.strings | 5 ++- DashWallet/zh.lproj/Localizable.strings | 5 ++- DashWallet/zh_TW.lproj/Localizable.strings | 5 ++- .../DashConnect/AppConnectV2LoginTests.swift | 20 ++++++++++++ 48 files changed, 268 insertions(+), 49 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index ee3955fff5..19c04c29c8 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -100,6 +100,10 @@ extension AppConnect { let createdAt: UInt64 /// Where the wallet returns when it is done; shown on the sheet. let callbackHost: String? + /// The app's website in the wallet's brand map, or nil for an app the + /// wallet does not know: then the name on the sheet is the one the + /// request gives. + var brandHost: String? = nil /// The largest budget among the keys, for the summary line. var totalBudget: UInt64? { @@ -198,6 +202,30 @@ extension AppConnect { ) } + /// The profile's callback rule for an app in the wallet's brand map: a + /// request whose `cb` is on a host that is not the app's is refused. + /// The sheet would be branded as the app and return somewhere else, and + /// the host is the user's main phishing signal. A request without `cb` + /// is not refused, the sheet warns instead (`isHost(_:of:)`). + /// + /// The request itself proves nothing about where it came from: anyone + /// can put the app's id and the app's host in a QR code. What the wallet + /// can check is that what it shows agrees with itself. + static func callbackRefusal(callbackHost: String?, brandHost: String?) -> Refusal? { + guard let brandHost, let callbackHost, !isHost(callbackHost, of: brandHost) else { return nil } + return Refusal(.invalid, String( + format: NSLocalizedString( + "This request would return to %@, which is not the app's website.", + comment: "DashConnect App Connect v2: the placeholder is a website, e.g. yap.pr"), + callbackHost)) + } + + /// Whether `host` is `brandHost` or one of its subdomains. Both are + /// lowercase DNS names: the callback parser takes no other host. + static func isHost(_ host: String, of brandHost: String) -> Bool { + host == brandHost || host.hasSuffix("." + brandHost) + } + /// Wallet rule 3, owner consistency, from what the network says: /// - a contract group must be owned by the owner of `appId`; /// - a contract, or a document type's contract, must be owned by that diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 87c135056a..d5c0c0046f 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -35,6 +35,11 @@ enum DashConnectFallbackAppMetadata { "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F": .init(name: "Yappr", url: "yap.pr") ] + /// The app's website, for an app the wallet knows. + static func brandHost(contractId: String) -> String? { + knownApps[contractId].flatMap { $0.url.isEmpty ? nil : $0.url } + } + static func resolve(contractId: String, unauthenticatedLabel: String) -> DashConnectAppMetadata { if let known = knownApps[contractId] { return known @@ -628,7 +633,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { comment: "DashConnect App Connect v2"))), nil) } do { - let plan = try AppConnect.grantPlan(for: uri, now: now()) + var plan = try AppConnect.grantPlan(for: uri, now: now()) + plan.brandHost = DashConnectFallbackAppMetadata.brandHost(contractId: plan.appId.toBase58String()) + if let refusal = AppConnect.callbackRefusal(callbackHost: plan.callbackHost, brandHost: plan.brandHost) { + return (.refused(refusal), nil) + } if let hint = plan.identityHint, hint != context.identityId { return (.refused(AppConnect.Refusal(.invalid, NSLocalizedString( "This sign-in is for another identity. Switch to it in this wallet and ask the app again.", diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift index 8a4ffe8bbd..00264dc4d4 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift @@ -192,10 +192,16 @@ enum DashConnectUri { /// Whether a `dash-key:` URI asks for request version 2 (`v=2`), and so /// belongs to `parseAppConnectRequest`. The v1 parser cannot tell: it - /// measures the body before it reads the version. + /// measures the body before it reads the version. The query is read as + /// that parser reads it, form-decoded, so `v=%32` is version 2 as well. static func isAppConnectUri(_ uri: String) -> Bool { - guard isKeyUri(uri), let queryIndex = uri.firstIndex(of: "?") else { return false } - return uri[uri.index(after: queryIndex)...].split(separator: "&").contains("v=2") + guard isKeyUri(uri), let queryIndex = uri.unicodeScalars.firstIndex(of: "?") else { return false } + var query = uri.unicodeScalars[uri.unicodeScalars.index(after: queryIndex)...] + if query.first == "?" { query = query.dropFirst() } + return query.split(separator: "&").contains { item in + let parts = item.split(separator: "=", maxSplits: 1, omittingEmptySubsequences: false) + return parts.count == 2 && formDecoded(parts[0]) == "v" && formDecoded(parts[1]) == appConnectVersion + } } /// Parses a `dash-key:` URI of version 2. A version 1 URI is diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index aefe509f42..838eb1fef6 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -282,6 +282,12 @@ struct ApproveConnectionSheet: View { ) VStack(alignment: .leading, spacing: 4) { + if let warning = originWarning(plan) { + Text(warning) + .font(.footnote) + .fontWeight(.semibold) + .foregroundColor(.primaryText) + } Text(requestOrigin(plan)) .font(.footnote) .foregroundColor(.secondaryText) @@ -290,7 +296,7 @@ struct ApproveConnectionSheet: View { format: NSLocalizedString( "Only approve if you just started signing in on %@.", comment: "DashConnect App Connect v2: the placeholder is the app's website or name"), - plan.callbackHost ?? resolvedAppLabel) + plan.brandHost ?? plan.callbackHost ?? resolvedAppLabel) ) .font(.footnote) .foregroundColor(.secondaryText) @@ -337,13 +343,34 @@ struct ApproveConnectionSheet: View { comment: "DashConnect App Connect v2: what a key can do, an amount with its unit (0.5 DASH), a date"), action, PlatformCreditsFormatter.dashString(budget), expiry) } + // The app asked for no budget, and the wallet adds none: the key can + // spend the identity's credits without a cap, so the sheet says so. return String( format: NSLocalizedString( - "%1$@, until %2$@", + "%1$@, with no limit on spending your identity's credits, until %2$@", comment: "DashConnect App Connect v2: what a key can do, a date"), action, expiry) } + /// The profile's warnings. Nothing in a request proves where it came + /// from: an app the wallet does not know is named by the request alone, + /// and a known app's request that does not return to its website may + /// come from a page that is not the app's. A known app's request that + /// returns elsewhere is refused before it gets here. + private func originWarning(_ plan: AppConnect.GrantPlan) -> String? { + guard let brandHost = plan.brandHost else { + return NSLocalizedString( + "This wallet does not know this app. Its name and website come from the request itself.", + comment: "DashConnect App Connect v2") + } + guard plan.callbackHost == nil else { return nil } + return String( + format: NSLocalizedString( + "This request does not return to %@. It may not come from the app's website.", + comment: "DashConnect App Connect v2: the placeholder is the app's website, e.g. yap.pr"), + brandHost) + } + private func requestOrigin(_ plan: AppConnect.GrantPlan) -> String { let requested = Self.ageFormatter.localizedString( for: Date(timeIntervalSince1970: TimeInterval(plan.createdAt) / 1000), relativeTo: Date()) diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 5b194412ed..f503f2b6c8 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 5a2ecef9a8..1a2247179d 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index df3450f254..1e72a146da 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 566b21a035..800004157f 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index b7ec30d8b8..62902a6999 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 40fa0ff4ae..32ae2b7b53 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 78384aa410..eab3210ebc 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 857a0a9bff..66db71042f 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6379,7 +6379,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6403,3 +6403,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 357aa46af8..172f6d8008 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 7e3bbcac9d..c87533e264 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 4a854e5933..1e744d19b6 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index f344af2b59..1264b28908 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 684bf952bb..25c78b8427 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 3aa7a4869d..c76f4ce277 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index c7d4ad24f1..b5599fe9af 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index f5f07fce4d..567e10de96 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 763ba9dbbe..375bef4dfe 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index f2d667380d..41595d594e 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 49cbbaaa72..edc94d5a47 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 5458d26dd4..98332c0efb 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 939724c8c2..99777ad0df 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 247f8e87b1..f2243592e7 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 0e321ee880..ebf6f93875 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 756fde4232..a4742e0243 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 4f11714ee5..4d76d90f6b 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 4693e23456..bcb25f9490 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 52aaa836d8..dfc6c38556 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index fdbc04825d..4597bc54ad 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index e1ae4cbd08..ec89a556c5 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index b344a83e34..6ed3771062 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 2603b0d14d..782e98c4a7 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index b8bd25c9ba..734f0ea9e8 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 38c41d9f78..6fd3d0ac5b 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 361a7a0e2a..5e243707e4 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 3ee1ac33af..3124316065 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index fc0891e2ac..023ecb8878 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 20ecaef250..50cfdb1df3 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 466c12dfd8..f652138305 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index ebaef57ecb..cf6dd37fde 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 16de9c6252..8f7ff42d6b 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index bd8dfaf3b2..f0572b8b8c 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6626,7 +6626,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6650,3 +6650,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 73dbdaa12c..d1799c1636 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 7e46693196..27836b7caf 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6624,7 +6624,7 @@ /* DashConnect App Connect v2 */ "%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; -"%1$@, until %2$@" = "%1$@, until %2$@"; +"%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; "Act as you in one of %@'s contracts" = "Act as you in one of %@'s contracts"; @@ -6648,3 +6648,6 @@ "This wallet will not answer this sign-in request." = "This wallet will not answer this sign-in request."; "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; +"This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"This wallet does not know this app. Its name and website come from the request itself." = "This wallet does not know this app. Its name and website come from the request itself."; +"This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 6d497b8afc..d4b7482b2f 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -486,6 +486,26 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertFalse(DashConnectUri.isAppConnectUri("dash-key:abc?n=d&v=1")) XCTAssertFalse(DashConnectUri.isAppConnectUri("dash-st:abc?n=d&v=2")) XCTAssertFalse(DashConnectUri.isAppConnectUri("dash-key:abc?n=d&v=22")) + // Read as the v2 parser reads the query: form-decoded. + XCTAssertTrue(DashConnectUri.isAppConnectUri("dash-key:abc?n=d&v=%32")) + XCTAssertTrue(DashConnectUri.isAppConnectUri("dash-key:abc?n=d&%76=2")) + XCTAssertFalse(DashConnectUri.isAppConnectUri("dash-key:abc?n=d&v")) + } + + /// A request for an app in the brand map that returns to a host the + /// app does not have is refused; one without a callback, or for an app + /// the wallet does not know, is left to the sheet's warning. + func testAKnownAppsRequestThatReturnsElsewhereIsRefused() { + XCTAssertEqual( + AppConnect.callbackRefusal(callbackHost: "yap.pr.example.com", brandHost: "yap.pr")?.status, .invalid) + XCTAssertEqual(AppConnect.callbackRefusal(callbackHost: "notyap.pr", brandHost: "yap.pr")?.status, .invalid) + XCTAssertNil(AppConnect.callbackRefusal(callbackHost: "yap.pr", brandHost: "yap.pr")) + XCTAssertNil(AppConnect.callbackRefusal(callbackHost: "www.yap.pr", brandHost: "yap.pr")) + XCTAssertNil(AppConnect.callbackRefusal(callbackHost: nil, brandHost: "yap.pr")) + XCTAssertNil(AppConnect.callbackRefusal(callbackHost: "example.com", brandHost: nil)) + XCTAssertEqual( + DashConnectFallbackAppMetadata.brandHost(contractId: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F"), "yap.pr") + XCTAssertNil(DashConnectFallbackAppMetadata.brandHost(contractId: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec")) } func testTheCallbackKeepsItsQueryAndAddsTheStatus() throws { From aaee08873b7931d13e663b84685d5c1cbfeaa0ff Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sun, 18 Oct 2026 18:40:22 +0300 Subject: [PATCH 038/108] fix(dashpay): send an App Connect v2 key again only as the binding's, by its record A key on the identity at a binding's derived payload was sent again when its level and limits fit: a request repeating another's ephemeral key derives the same payload, and with the grant record lost nothing tied the key to this request. Now it is sent again only when the wallet's store shows it with exactly the binding's bound (contract, document type or group) and the grant recorded for this request names it. Otherwise the approval fails closed and the app asks again. The store's key records carry the full bound for this (`StoredBound`). Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 24 +++++++++ .../DashConnect/AppConnectV2Login.swift | 25 +++++++-- .../PlatformDashConnectDataSource.swift | 38 +++++++++----- .../DashConnect/AppConnectV2LoginTests.swift | 51 +++++++++++++++---- 4 files changed, 110 insertions(+), 28 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 2970d7341a..e36c617dc2 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -207,6 +207,30 @@ enum AppConnect { /// login's authentication key, or of its encryption key. var isTwoQRAuthenticationKeyShaped = false var isTwoQREncryptionKeyShaped = false + /// The key's bound as the store holds it; nil for a key with no + /// bound, or one this build cannot read (`hasUnreadableBound`). + var bound: StoredBound? = nil + } + + /// A key's contract bound, as the wallet's store records it. + enum StoredBound: Equatable { + case singleContract(Data) + case documentType(contractId: Data, name: String) + case contractGroup(Data) + } + + /// The bound of a stored key: the store's discriminant (`boundsKind`, + /// see `singleContractId(boundsKind:boundIds:)`), its ids and, for a + /// document type, its name. Nil for no bound and for one that cannot be + /// read. + static func storedBound(boundsKind: Int, boundIds: [Data]?, documentTypeName: String?) -> StoredBound? { + guard let id = boundIds?.first, id.count == 32 else { return nil } + switch boundsKind { + case 1: return .singleContract(id) + case 2: return documentTypeName.map { .documentType(contractId: id, name: $0) } + case 3: return .contractGroup(id) + default: return nil + } } /// Whether the store shows either key of the two-QR login, not disabled, diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 19c04c29c8..cfe6734320 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -59,6 +59,15 @@ extension AppConnect { binding.securityLevel == .critical ? .critical : .high } + /// The bound the key is registered with, as the store records it. + var storedBound: StoredBound { + switch binding.kind { + case .singleContract: return .singleContract(binding.id) + case .documentType: return .documentType(contractId: binding.id, name: binding.documentTypeName ?? "") + case .contractGroup: return .contractGroup(binding.id) + } + } + var contractBounds: ManagedPlatformWallet.ContractBounds { switch binding.kind { case .singleContract: @@ -409,16 +418,22 @@ extension AppConnect { /// Whether a key already on the identity at this binding's derived /// payload can be sent again for it: an earlier answer to the same - /// request (a retry, or an update that landed without confirming). Only - /// this wallet derives that payload, for this request and binding. It - /// still has to be live and carry the level the plan grants, and limits - /// no wider than the plan's (`clockTolerance` covers a clock moved back - /// between two tries). + /// request (a retry, or an update that landed without confirming). It + /// still has to be live, bound as the binding asks (`binding`, the + /// store's record of the key; a key the store does not show, or shows + /// with another bound, is not sent), carry the level the plan grants, + /// and limits no wider than the plan's (`clockTolerance` covers a clock + /// moved back between two tries). The payload alone proves nothing: a + /// request that repeats another's ephemeral key derives the same one. + /// The caller also requires a grant recorded for this request. static func canResendAuthKey( _ key: ManagedIdentity.IdentityPublicKeyInfo, for grant: AuthGrant, + binding: KeyBinding?, now: Date ) -> Bool { + guard let binding, binding.keyId == UInt32(bitPattern: key.keyId), binding.data == key.data, + !binding.isDisabled, !binding.hasUnreadableBound, binding.bound == grant.storedBound else { return false } guard isLiveGrantedKey(key), key.securityLevel == grant.securityLevel, key.totalBudget == grant.totalBudget, let expiresAt = key.expiresAt, expiresAt > Int64(milliseconds(now)) else { return false } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index d5c0c0046f..9d272a0204 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1214,28 +1214,35 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) - // An auth key already on the identity is this request answered - // before: only this wallet derives it, for this request and binding. - // It is sent again while it can still sign within the plan's terms; - // Platform never re-adds a key, so otherwise the app has to ask again. + // An auth key already on the identity at a binding's derived payload + // is sent again only as this request answered before: bound as the + // binding asks, within the plan's terms, and named by the grant + // recorded for this request. Anything else fails closed: a request + // repeating another's ephemeral key derives the same payload, and a + // key whose record is lost cannot be shown to be this request's. + // Platform never re-adds a key, so the app then has to ask again. var authKeyIds: [UInt32?] = try zip(plan.auth, authKeys).map { grant, key in guard let existing = currentPublicKeys.first(where: { $0.keyType == .ecdsaHash160 && $0.data == key.publicKeyHash160 }) else { return nil } - guard AppConnect.canResendAuthKey(existing, for: grant, now: now()) else { + let keyId = UInt32(bitPattern: existing.keyId) + guard AppConnect.canResendAuthKey( + existing, for: grant, + binding: bindings.first { $0.keyId == keyId && $0.data == existing.data }, + now: now() + ) else { throw DashConnectPlatformError.sessionKeyUnusable } - return UInt32(bitPattern: existing.keyId) + return keyId } - // A grant already recorded for this request must name exactly these - // keys: its response carries them. A key recorded for another app or - // request is that one's: a request repeating its ephemeral key derives - // the same payload, and must not take it over. + // The grant recorded for this request must name exactly these keys: + // its response carries them. A key recorded for another app or + // request is that one's, and must not be taken over. let reused = Set(authKeyIds.compactMap { $0 }) if !reused.isEmpty { let grants = stores.grants.load().filter { $0.identityId == identityId } - if let recorded = grants.first(where: isGrantForRequest), - Set(recorded.keyIds) != reused || authKeyIds.contains(nil) { + guard let recorded = grants.first(where: isGrantForRequest), + Set(recorded.keyIds) == reused, !authKeyIds.contains(nil) else { throw DashConnectPlatformError.sessionKeyUnusable } if grants.contains(where: { !isGrantForRequest($0) && !reused.isDisjoint(with: $0.keyIds) }) { @@ -2685,7 +2692,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { && $0.securityLevelEnum == .high, isTwoQREncryptionKeyShaped: $0.keyTypeEnum == .ecdsaSecp256k1 && $0.purposeEnum == .encryption - && $0.securityLevelEnum == .medium + && $0.securityLevelEnum == .medium, + bound: AppConnect.storedBound( + boundsKind: $0.effectiveContractBoundsKind, + boundIds: $0.contractBounds, + documentTypeName: $0.contractBoundsDocumentTypeName + ) ) } } diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index d4b7482b2f..a765717372 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -327,16 +327,47 @@ final class AppConnectV2LoginTests: XCTestCase { disabledAt: disabled ? 1 : nil, data: Data(repeating: 7, count: 20), totalBudget: budget, expiresAt: expiresAt.map { Int64($0) }) } - XCTAssertTrue(AppConnect.canResendAuthKey(key(), for: group, now: Self.now)) - XCTAssertFalse(AppConnect.canResendAuthKey(key(disabled: true), for: group, now: Self.now)) - XCTAssertFalse(AppConnect.canResendAuthKey(key(level: .high), for: group, now: Self.now)) - XCTAssertFalse(AppConnect.canResendAuthKey(key(budget: 60_000_000_000), for: group, now: Self.now)) - XCTAssertFalse(AppConnect.canResendAuthKey(key(budget: nil), for: group, now: Self.now)) - XCTAssertFalse( - AppConnect.canResendAuthKey(key(expiresAt: Self.expiresAt + 2 * Self.dayMilliseconds), for: group, now: Self.now)) - XCTAssertFalse( - AppConnect.canResendAuthKey(key(), for: group, now: Self.date(milliseconds: Self.expiresAt + 1)), - "an expired key cannot sign") + let stored = AppConnect.KeyBinding( + keyId: 7, data: Data(repeating: 7, count: 20), singleContractId: nil, bound: group.storedBound) + func resend(_ key: ManagedIdentity.IdentityPublicKeyInfo, binding: AppConnect.KeyBinding? = stored, + now: Date = AppConnectV2LoginTests.now) -> Bool { + AppConnect.canResendAuthKey(key, for: group, binding: binding, now: now) + } + XCTAssertTrue(resend(key())) + XCTAssertFalse(resend(key(disabled: true))) + XCTAssertFalse(resend(key(level: .high))) + XCTAssertFalse(resend(key(budget: 60_000_000_000))) + XCTAssertFalse(resend(key(budget: nil))) + XCTAssertFalse(resend(key(expiresAt: Self.expiresAt + 2 * Self.dayMilliseconds))) + XCTAssertFalse(resend(key(), now: Self.date(milliseconds: Self.expiresAt + 1)), "an expired key cannot sign") + // The payload alone does not make the key this binding's: the store + // has to show it with the binding's bound. + XCTAssertFalse(resend(key(), binding: nil), "a key the store does not show") + var otherBound = stored + otherBound.bound = .contractGroup(Data(repeating: 0xEE, count: 32)) + XCTAssertFalse(resend(key(), binding: otherBound), "a key bound to another group") + var wholeContract = stored + wholeContract.bound = .singleContract(group.binding.id) + XCTAssertFalse(resend(key(), binding: wholeContract), "the same id as a contract, not a group") + var unreadable = stored + unreadable.hasUnreadableBound = true + XCTAssertFalse(resend(key(), binding: unreadable)) + let otherKey = AppConnect.KeyBinding( + keyId: 8, data: Data(repeating: 7, count: 20), singleContractId: nil, bound: group.storedBound) + XCTAssertFalse(resend(key(), binding: otherKey), "a record of another key id") + } + + /// A stored bound is read from the store's discriminant, ids and name. + func testAStoredBoundIsReadFromTheStore() { + let id = Data(repeating: 1, count: 32) + XCTAssertEqual(AppConnect.storedBound(boundsKind: 1, boundIds: [id], documentTypeName: nil), .singleContract(id)) + XCTAssertEqual( + AppConnect.storedBound(boundsKind: 2, boundIds: [id], documentTypeName: "profile"), + .documentType(contractId: id, name: "profile")) + XCTAssertEqual(AppConnect.storedBound(boundsKind: 3, boundIds: [id], documentTypeName: nil), .contractGroup(id)) + XCTAssertNil(AppConnect.storedBound(boundsKind: 0, boundIds: nil, documentTypeName: nil)) + XCTAssertNil(AppConnect.storedBound(boundsKind: 2, boundIds: [id], documentTypeName: nil)) + XCTAssertNil(AppConnect.storedBound(boundsKind: 1, boundIds: [Data([1])], documentTypeName: nil)) } // MARK: - Encryption key (wallet rule 7) From bf4e32c2a18b2dc0cf7a96717f057434b8aa76da Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sun, 18 Oct 2026 18:41:04 +0300 Subject: [PATCH 039/108] fix(dashpay): settle a registration that lands during a disconnect, and keep the row for another identity's - A one-QR registration that could still land when the disconnect picked its keys may land before the disable update, which a reload elsewhere can then build on the newer identity. Once a disable update has landed none of them can land any more, so one more read settles each: a key that turned up is disabled too, one that never will is dropped, and a read still below the update keeps the records and the row. - A registration on another identity of the wallet that may still land keeps the row (`registrationPendingOnAnotherIdentity`) instead of a local downgrade on this one; only that identity's own read settles it. This identity's own pending registration is reported first, so the two identities never send the user back and forth. - A confirmed grant not yet recorded as off makes a disconnect one-QR while no two-QR login key is live, so a retry after a one-QR disconnect that stopped after disabling still removes the row. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 212 +++++++++++++----- DashWallet/ar.lproj/Localizable.strings | 1 + DashWallet/bg.lproj/Localizable.strings | 1 + DashWallet/ca.lproj/Localizable.strings | 1 + DashWallet/cs.lproj/Localizable.strings | 1 + DashWallet/da.lproj/Localizable.strings | 1 + DashWallet/de.lproj/Localizable.strings | 1 + DashWallet/el.lproj/Localizable.strings | 1 + DashWallet/en.lproj/Localizable.strings | 1 + DashWallet/eo.lproj/Localizable.strings | 1 + DashWallet/es.lproj/Localizable.strings | 1 + DashWallet/et.lproj/Localizable.strings | 1 + DashWallet/fa.lproj/Localizable.strings | 1 + DashWallet/fi.lproj/Localizable.strings | 1 + DashWallet/fil.lproj/Localizable.strings | 1 + DashWallet/fr.lproj/Localizable.strings | 1 + DashWallet/hr.lproj/Localizable.strings | 1 + DashWallet/hu.lproj/Localizable.strings | 1 + DashWallet/id.lproj/Localizable.strings | 1 + DashWallet/it.lproj/Localizable.strings | 1 + DashWallet/ja.lproj/Localizable.strings | 1 + DashWallet/ko.lproj/Localizable.strings | 1 + DashWallet/mk.lproj/Localizable.strings | 1 + DashWallet/ms.lproj/Localizable.strings | 1 + DashWallet/nb.lproj/Localizable.strings | 1 + DashWallet/nl.lproj/Localizable.strings | 1 + DashWallet/pl.lproj/Localizable.strings | 1 + DashWallet/pt.lproj/Localizable.strings | 1 + DashWallet/ro.lproj/Localizable.strings | 1 + DashWallet/ru.lproj/Localizable.strings | 1 + DashWallet/sk.lproj/Localizable.strings | 1 + DashWallet/sl.lproj/Localizable.strings | 1 + DashWallet/sl_SI.lproj/Localizable.strings | 1 + DashWallet/sq.lproj/Localizable.strings | 1 + DashWallet/sr.lproj/Localizable.strings | 1 + DashWallet/sv.lproj/Localizable.strings | 1 + DashWallet/th.lproj/Localizable.strings | 1 + DashWallet/tr.lproj/Localizable.strings | 1 + DashWallet/uk.lproj/Localizable.strings | 1 + DashWallet/vi.lproj/Localizable.strings | 1 + DashWallet/zh-Hans.lproj/Localizable.strings | 1 + .../zh-Hant-TW.lproj/Localizable.strings | 1 + DashWallet/zh.lproj/Localizable.strings | 1 + DashWallet/zh_TW.lproj/Localizable.strings | 1 + .../PlatformDashConnectDataSourceTests.swift | 91 +++++++- 45 files changed, 285 insertions(+), 61 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 8174a88406..fbab4f52bd 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -81,6 +81,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case noFreeKeyId case otherIdentitiesNotChecked case registrationPending + case registrationPendingOnAnotherIdentity case walletChanged case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection @@ -153,6 +154,10 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again.", comment: "DashConnect") + case .registrationPendingOnAnotherIdentity: + return NSLocalizedString( + "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it.", + comment: "DashConnect") case .walletChanged: return NSLocalizedString("The active wallet or identity changed. Try again.", comment: "DashConnect") case .noFreeKeyId: @@ -1679,7 +1684,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // What can reach Platform: a confirmed grant of the app, and a // registration of it whose outcome is not known yet. Which of the // two disconnects runs is settled by the revocation, from a fresh - // view of the identity, not by the row alone. + // view of the identity, not by the row alone. Records of every + // identity of the wallet count: the row is shared, and one held by + // another identity is reported by the revocation. let hasGrants = stores.grants.load().contains { $0.appContractId == id && (!$0.isUnconfirmed || $0.submittedRevision != nil) } @@ -1687,10 +1694,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let revocation = try await revokeAppConnectGrants( appContractId: id, rowIsOneQR: rowIsOneQR, stores: stores) // The row stands for the app, and the app still holds a key on - // another identity of this wallet. That key can only be disabled - // while its identity is the active one, so the row stays to get - // there, and the user is told; this identity's keys are off. - if revocation.liveElsewhere { throw DashConnectPlatformError.grantOnAnotherIdentity } + // another identity of this wallet, or may still be given one + // there. That identity's keys can only be read and disabled + // while it is the active one, so the row stays to get there, and + // the user is told; this identity's keys are off. + if let heldElsewhere = revocation.heldElsewhere { throw heldElsewhere } if revocation.asOneQR { // The session keys are disabled, and so are the keys of an // earlier two-QR login that were found: the same QR can no @@ -1723,15 +1731,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// Whether a disconnect of the app takes the one-QR path. A live session /// key of a confirmed grant makes it one-QR however the row reads: a row /// write lost after the grant was confirmed leaves the app's two-QR row - /// in place. So does a registration that may still land: any disable - /// update the one-QR path then sends lands above the revision that - /// registration was built on, after which it can never land. + /// in place. So does a confirmed grant not yet recorded as off while no + /// key of the two-QR login is live: a one-QR disconnect that stopped + /// after disabling its keys, those of the two-QR login among them. With + /// a two-QR login key live, that login came after the grant's key went + /// off, and the row is its. So does a registration that may still land: + /// any disable update the one-QR path then sends lands above the + /// revision that registration was built on, after which it can never + /// land. static func disconnectsAsOneQR( rowIsOneQR: Bool, holdsLiveGrantedKey: Bool, + holdsUnrevokedGrant: Bool, + holdsLiveTwoQRLoginKey: Bool, hasRegistrationThatMayStillLand: Bool ) -> Bool { - rowIsOneQR || holdsLiveGrantedKey || hasRegistrationThatMayStillLand + rowIsOneQR || holdsLiveGrantedKey || (holdsUnrevokedGrant && !holdsLiveTwoQRLoginKey) + || hasRegistrationThatMayStillLand } /// What a view of the identity at `identityRevision` tells of an @@ -1766,6 +1782,51 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return .cannotLand } + /// The ids of the keys that registrations which might still land put on + /// the identity after all, read once an update of this disconnect has + /// landed: none of them can land any more, so each key is either live + /// now or never will be. Throws when the read still shows one that + /// could land: the node that answered is behind that update. + static func keyIdsOfRegistrationsThatLanded( + _ registrations: [AppConnectGrant], + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + identityRevision: UInt64 + ) throws -> [UInt32] { + try registrations.compactMap { registration in + switch registrationOutcome( + of: registration, + currentIdentityPublicKeys: currentIdentityPublicKeys, + identityRevision: identityRevision + ) { + case .keyLive: return registration.sessionKeyId + case .cannotLand: return nil + case .mayStillLand, .unknownRevision: throw DashConnectPlatformError.identityKeysOutOfDate + } + } + } + + /// Why the app's row has to stay for another identity of this wallet, + /// as the error to show, or `nil` when no identity but `identityId` has + /// part in it. A live key there (`heldOnAnotherIdentity` covers the keys + /// no record names) comes first; a registration there that may still + /// land, one with a noted revision, is settled only by a read of that + /// identity, once it is the active one. + static func reasonHeldElsewhere( + grants: [AppConnectGrant], + appContractId: String, + identityId: String, + heldOnAnotherIdentity: Bool + ) -> DashConnectPlatformError? { + let elsewhere = grants.filter { $0.appContractId == appContractId && $0.identityId != identityId } + if heldOnAnotherIdentity || elsewhere.contains(where: { !$0.isUnconfirmed && $0.keyDisabled != true }) { + return .grantOnAnotherIdentity + } + if elsewhere.contains(where: { $0.isUnconfirmed && $0.submittedRevision != nil }) { + return .registrationPendingOnAnotherIdentity + } + return nil + } + /// Ends the access one-QR logins gave an app: disables its session keys /// on the identity, then deletes the responses that carried them. /// @@ -1786,12 +1847,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// every time and Platform never re-adds a key, so the app cannot sign /// in with two QRs again. A two-QR row keeps them. /// - /// Returns, as `liveElsewhere`, whether a grant record shows the app with - /// a live key on another identity of this wallet. When this identity gave - /// it none, that is thrown instead: nothing was turned off. For a one-QR - /// disconnect that also covers keys on another identity that no grant - /// record names, as far as the wallet's store shows them. `asOneQR` says - /// which disconnect this was. + /// Returns, as `heldElsewhere`, the error to show when a grant record + /// shows the app with a live key on another identity of this wallet, or + /// with a registration there that may still land + /// (`reasonHeldElsewhere`). When this identity gave it none, that is + /// thrown instead: nothing was turned off. For a one-QR disconnect that + /// also covers keys on another identity that no grant record names, as + /// far as the wallet's store shows them. `asOneQR` says which disconnect + /// this was. /// /// For a row made by the one-QR login, with no record for this identity, /// the keys are still looked for on it. When it holds none bound to the @@ -1803,13 +1866,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// identity's registrations of the app whose outcome was not known are /// settled by that read (`registrationOutcome`): a live key that cannot /// be confirmed stops the disconnect, one that can never land is - /// dropped, and one that may still land is dropped once a disable update - /// has landed; with no key to disable it stops the disconnect. + /// dropped, and one that may still land is settled by one more read once + /// a disable update has landed, its key disabled if it turned up; with + /// no key to disable it stops the disconnect. private func revokeAppConnectGrants( appContractId: String, rowIsOneQR: Bool, stores: Stores - ) async throws -> (liveElsewhere: Bool, asOneQR: Bool) { + ) async throws -> (heldElsewhere: DashConnectPlatformError?, asOneQR: Bool) { // The row was picked in the wallet `stores` belongs to; another // wallet's identity is not the one the row belongs to. var context = try await requireContext(pinnedTo: stores) @@ -1818,14 +1882,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { grant.identityId == identityId && grant.appContractId == appContractId } // TODO(dashconnect-unconfirmed-row): a registration of the app on - // another identity whose outcome is not known is not counted here. - // If it lands after this disconnect, its key is shown again only by - // the next one-QR approval with that identity. + // another identity that does not note its revision (from a build + // before `submittedRevision`) is not counted here. If it lands after + // this disconnect, its key is shown again only by the next one-QR + // approval with that identity. func hasLiveGrantElsewhere() -> Bool { - stores.grants.load().contains { - $0.appContractId == appContractId && $0.identityId != identityId && $0.keyDisabled != true - && !$0.isUnconfirmed - } + Self.reasonHeldElsewhere( + grants: stores.grants.load(), appContractId: appContractId, identityId: identityId, + heldOnAnotherIdentity: false) == .grantOnAnotherIdentity + } + func reasonHeldElsewhere(heldOnAnotherIdentity: Bool = false) -> DashConnectPlatformError? { + Self.reasonHeldElsewhere( + grants: stores.grants.load(), appContractId: appContractId, identityId: identityId, + heldOnAnotherIdentity: heldOnAnotherIdentity) } guard let appContract = Self.decodeIdentifier(appContractId) else { throw DashConnectPlatformError.loginContractUnavailable @@ -1841,8 +1910,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // A one-QR row goes on to the PIN prompt either way: the keys of // an earlier two-QR login can only be looked for after it. if !holdsUnrecordedKey, !rowIsOneQR { - if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } - return (liveElsewhere: false, asOneQR: false) + if let heldElsewhere = reasonHeldElsewhere() { throw heldElsewhere } + return (heldElsewhere: nil, asOneQR: false) } } @@ -1884,11 +1953,24 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { updateGrants(in: stores) { grants in grants.removeAll { cannotLand.contains($0.key) } } } let granted = stores.grants.load().filter { isGranted($0) && !$0.isUnconfirmed } + // The keys the two-QR login derives for this app, known before + // anything is disabled: its authentication key has the kind and the + // bound of a session key. A one-QR row disables both of them; a + // two-QR row keeps them, so there the authentication key is named + // as one to leave. If they cannot be derived, nothing is turned off. + let twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) + let liveTwoQRLoginKeyIds = Self.liveLoginKeyIds( + authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, + encryptionPublicKey: twoQRKeys.encryptionPublicKey, + currentIdentityPublicKeys: currentPublicKeys + ) let asOneQR = Self.disconnectsAsOneQR( rowIsOneQR: rowIsOneQR, holdsLiveGrantedKey: granted.contains { grant in currentPublicKeys.contains { UInt32(bitPattern: $0.keyId) == grant.sessionKeyId && $0.disabledAt == nil } }, + holdsUnrevokedGrant: granted.contains { $0.keyDisabled != true }, + holdsLiveTwoQRLoginKey: !liveTwoQRLoginKeyIds.isEmpty, hasRegistrationThatMayStillLand: !mayStillLand.isEmpty) let checksUnrecordedKeys = asOneQR guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { @@ -1913,12 +1995,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // as turned off. throw DashConnectPlatformError.identityKeysOutOfDate } - // The keys the two-QR login derives for this app, known before - // anything is disabled: its authentication key has the kind and the - // bound of a session key. A one-QR row disables both of them; a - // two-QR row keeps them, so there the authentication key is named - // as one to leave. If they cannot be derived, nothing is turned off. - let twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) var keyIds = AppConnect.sessionKeyIdsToDisable( for: granted, appContractId: appContract, @@ -1927,48 +2003,58 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { twoQRAuthenticationKeyHash160: checksUnrecordedKeys ? nil : twoQRKeys.authenticationPublicKeyHash160 ) if checksUnrecordedKeys { - keyIds = Array(Set(keyIds).union(Self.liveLoginKeyIds( - authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, - encryptionPublicKey: twoQRKeys.encryptionPublicKey, - currentIdentityPublicKeys: currentPublicKeys - ))).sorted() - } - // For a one-QR row, the keys on another identity that no grant - // record shows. `nil` when that could not be told. - let heldOnAnotherIdentity: Bool? = checksUnrecordedKeys && !hasLiveGrantElsewhere() - ? await anotherIdentityHoldsAppKeys(appContractId: appContract, context: context) - : false - if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { - throw DashConnectPlatformError.grantOnAnotherIdentity + keyIds = Array(Set(keyIds).union(liveTwoQRLoginKeyIds)).sorted() } if !mayStillLand.isEmpty, keyIds.isEmpty { // No update would be sent, so nothing settles the registration. + // This identity's own state comes first: whatever another + // identity holds, this one cannot be told to be done. // TODO(dashconnect-pending-registration): an update that was // refused, or never sent, cannot be told from one still on its // way, so this stays until the identity's revision moves or the - // app's code is approved again. + // app's code is approved again. Until then the record also holds + // the row for the wallet's other identities + // (`registrationPendingOnAnotherIdentity`). Self.logger.error("🔗 DASHCONNECT :: a session key registration of the app may still land, and there is no key to disable") throw DashConnectPlatformError.registrationPending } + // For a one-QR row, the keys on another identity that no grant + // record shows. `nil` when that could not be told. + let heldOnAnotherIdentity: Bool? = checksUnrecordedKeys && !hasLiveGrantElsewhere() + ? await anotherIdentityHoldsAppKeys(appContractId: appContract, context: context) + : false + if granted.isEmpty, keyIds.isEmpty, + let heldElsewhere = reasonHeldElsewhere(heldOnAnotherIdentity: heldOnAnotherIdentity == true) { + throw heldElsewhere + } if !keyIds.isEmpty { Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) app key(s)") // Platform takes a limited number of keys per update. A failure // part way leaves the rest live and the row in place; the next // attempt picks up what is still live. - for start in stride(from: 0, to: keyIds.count, by: AppConnect.maxKeysDisabledPerUpdate) { - try await context.wallet.updateIdentity( - identityId: context.identityId, - disablePublicKeyIds: Array(keyIds[start ..< min(start + AppConnect.maxKeysDisabledPerUpdate, keyIds.count)]), - signer: signer - ) - } + try await disableKeys(keyIds, context: context, signer: signer) Self.logger.info("🔗 DASHCONNECT :: app key(s) disabled") // Each registration that might still land names a revision above // `revision`, the one below it the identity was already at. The // update that just landed took one above the identity's revision // when it was built, at least the revision such a registration // names, and a revision only grows: none of them can land now. + // One may have landed since `revision` was read, though, and the + // update was built on whatever copy of the identity the SDK held + // by then, which a reload elsewhere may have moved past that + // read: its key is not among `keyIds`. One more read settles + // each of them, and a key that turned up is disabled as well. + // Until then the records and the row stay. if !mayStillLand.isEmpty { + let (keysAfter, revisionAfter) = try await refreshedIdentityKeysAndRevision(context: context) + let landedKeyIds = try Self.keyIdsOfRegistrationsThatLanded( + stores.grants.load().filter { mayStillLand.contains($0.key) }, + currentIdentityPublicKeys: keysAfter, + identityRevision: revisionAfter) + if !landedKeyIds.isEmpty { + Self.logger.info("🔗 DASHCONNECT :: disabling \(landedKeyIds.count, privacy: .public) session key(s) registered after the identity was read") + try await disableKeys(landedKeyIds.sorted(), context: context, signer: signer) + } updateGrants(in: stores) { grants in grants.removeAll { mayStillLand.contains($0.key) } } } } @@ -1987,12 +2073,26 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - if hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { return (liveElsewhere: true, asOneQR: asOneQR) } + if let heldElsewhere = reasonHeldElsewhere(heldOnAnotherIdentity: heldOnAnotherIdentity == true) { + return (heldElsewhere: heldElsewhere, asOneQR: asOneQR) + } // This identity's keys are off. Whether another one holds a key of // the app could not be read from the store, so the row stays, with // an error rather than without one. guard heldOnAnotherIdentity != nil else { throw DashConnectPlatformError.otherIdentitiesNotChecked } - return (liveElsewhere: false, asOneQR: asOneQR) + return (heldElsewhere: nil, asOneQR: asOneQR) + } + + /// Disables `keyIds` on the identity, as many per update as Platform + /// takes. + private func disableKeys(_ keyIds: [UInt32], context: Context, signer: KeychainSigner) async throws { + for start in stride(from: 0, to: keyIds.count, by: AppConnect.maxKeysDisabledPerUpdate) { + try await context.wallet.updateIdentity( + identityId: context.identityId, + disablePublicKeyIds: Array(keyIds[start ..< min(start + AppConnect.maxKeysDisabledPerUpdate, keyIds.count)]), + signer: signer + ) + } } /// Whether the wallet's store shows another identity of this wallet with diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 877b31a1a9..5112f3e33c 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 923a408105..c50c54d1b3 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index fcb9b6c4f3..1e3f4ec4c0 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 3e61290826..c50dcfd404 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index b5b3907fcd..f6c1d26821 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index d8a4ef434d..48771b41db 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 3af2216e88..af64c887f6 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index b50be6cc38..93378af49a 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6199,6 +6199,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 275927f8b4..1e58816709 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 081003dcc1..9968cd6ab0 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 2ec63ec681..5b294faf39 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index ee95ca5b77..f3da95337f 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 5ee92952a8..3ec9bd13d6 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 87bf4f8087..6de485a71b 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 07c7717a99..57f7d07e8a 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index ce79f6ca5e..e0664629f4 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 175eb3b350..d9d9b1769f 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 8f5353cb39..30534d3256 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 7d8a21b767..d6352932be 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 30985951cc..7f5e332785 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 0647795e90..bce58c7dfa 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index dcfb1fd439..9fa4d3643a 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 4e980f00ac..4b982b4453 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index a402756eb9..2084691c19 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index b26c76b68f..37dbae433b 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index e459e3e1ac..3812797868 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index fd85a6ed34..08ab577f9a 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 64484f1ade..7b1edd76fb 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 0d0e1741e4..ba3b86c112 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 7e187ffe4d..4f7f18ebca 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index e8d1057946..c88ea3955c 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index a85b00ccf8..f42dbaa289 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 5b526bca86..83793bb712 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index ef137f55c1..f82d5aec6e 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 54e0ccdb2d..466c578317 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 5b63519d87..9ae6fa5023 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index ca390ad3ca..32d31d4e90 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index ac25212ab8..a7a3bc66c1 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index b160496fab..c213678450 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 08a819a89c..10c8fc2fb3 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 4d18074a8e..e8a60a339e 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 33a047261c..60c15b6951 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 2520d09343..80747ed2ad 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index fb0543b59b..9f60b1a678 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2803,17 +2803,98 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(outcome(unnoted, keys: [Self.key(keyId: 9, data: hash)], revision: 9), .keyLive) } - /// A live key of a confirmed grant, or a registration that may still - /// land, makes the disconnect one-QR even over a two-QR row. + /// After a disable update of the disconnect has landed, a registration + /// that could still land when its keys were picked has either put its + /// key on the identity, which is then picked for disabling too, or + /// never will. + func testARegistrationThatLandedWhileTheDisconnectRanIsPickedForDisabling() throws { + let hash = Data(repeating: 0x5A, count: 20) + let template = Self.grant(sessionKeyId: 9) + var pending = AppConnectGrant( + identityId: "identity", appContractId: "app", documentId: nil, values: template.values, + sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) + pending.unconfirmedKeyHash160 = hash.toHexString() + pending.submittedRevision = 4 + func landed(keys: [ManagedIdentity.IdentityPublicKeyInfo], revision: UInt64) throws -> [UInt32] { + try PlatformDashConnectDataSource.keyIdsOfRegistrationsThatLanded( + [pending], currentIdentityPublicKeys: keys, identityRevision: revision) + } + + // Landed at 4 before the disable update, which then took 5. + XCTAssertEqual(try landed(keys: [Self.key(keyId: 9, data: hash)], revision: 5), [9]) + // The disable update took 4: the registration can never land. + XCTAssertEqual(try landed(keys: [], revision: 4), []) + // It landed and its key is off already. + XCTAssertEqual(try landed(keys: [Self.key(keyId: 9, data: hash, disabledAt: 1)], revision: 6), []) + // A node still below the disable update cannot settle it. + XCTAssertThrowsError(try landed(keys: [], revision: 3)) { error in + guard case DashConnectPlatformError.identityKeysOutOfDate = error else { + return XCTFail("unexpected error: \(error)") + } + } + } + + /// A row stays for another identity of the wallet that holds a key of + /// the app, or may still be given one by a registration with a noted + /// revision. Only that identity's own read settles the registration. + func testAnotherIdentityKeepsTheRowForItsLiveKeyOrPendingRegistration() { + let template = Self.grant(sessionKeyId: 9) + func record(identity: String, app: String = "app", unconfirmed: Bool, revision: UInt64? = 4) -> AppConnectGrant { + var grant = AppConnectGrant( + identityId: identity, appContractId: app, documentId: nil, values: template.values, + sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) + if unconfirmed { + grant.unconfirmedKeyHash160 = Data(repeating: 0x5A, count: 20).toHexString() + grant.submittedRevision = revision + } + return grant + } + func reason(_ grants: [AppConnectGrant], heldOnAnotherIdentity: Bool = false) -> String? { + PlatformDashConnectDataSource.reasonHeldElsewhere( + grants: grants, appContractId: "app", identityId: "b", + heldOnAnotherIdentity: heldOnAnotherIdentity + ).map { "\($0)" } + } + var disabled = record(identity: "a", unconfirmed: false) + disabled.keyDisabled = true + + XCTAssertNil(reason([])) + XCTAssertNil(reason([record(identity: "b", unconfirmed: true)]), "this identity's own registration") + XCTAssertNil(reason([record(identity: "a", app: "other", unconfirmed: true)])) + XCTAssertNil(reason([disabled])) + XCTAssertNil( + reason([record(identity: "a", unconfirmed: true, revision: nil)]), + "a record with no revision can never be settled, so it takes no part") + XCTAssertEqual(reason([record(identity: "a", unconfirmed: true)]), "registrationPendingOnAnotherIdentity") + XCTAssertEqual(reason([record(identity: "a", unconfirmed: false)]), "grantOnAnotherIdentity") + XCTAssertEqual(reason([], heldOnAnotherIdentity: true), "grantOnAnotherIdentity") + XCTAssertEqual( + reason([record(identity: "a", unconfirmed: true), record(identity: "c", unconfirmed: false)]), + "grantOnAnotherIdentity", "a live key comes first") + } + + /// A live key of a confirmed grant, a confirmed grant not recorded as + /// off while no two-QR login key is live, or a registration that may + /// still land makes the disconnect one-QR even over a two-QR row. func testWhatMakesADisconnectOneQR() { - func oneQR(row: Bool = false, live: Bool = false, pending: Bool = false) -> Bool { + func oneQR( + row: Bool = false, live: Bool = false, unrevoked: Bool = false, twoQRKeyLive: Bool = false, + pending: Bool = false + ) -> Bool { PlatformDashConnectDataSource.disconnectsAsOneQR( - rowIsOneQR: row, holdsLiveGrantedKey: live, hasRegistrationThatMayStillLand: pending) + rowIsOneQR: row, holdsLiveGrantedKey: live, holdsUnrevokedGrant: unrevoked, + holdsLiveTwoQRLoginKey: twoQRKeyLive, hasRegistrationThatMayStillLand: pending) } XCTAssertFalse(oneQR(), "a two-QR row and nothing live") XCTAssertTrue(oneQR(row: true)) - XCTAssertTrue(oneQR(live: true), "a confirmed grant over a two-QR row, its row write lost") + XCTAssertTrue( + oneQR(live: true, unrevoked: true, twoQRKeyLive: true), + "a confirmed grant over a two-QR row, its row write lost") + XCTAssertTrue(oneQR(unrevoked: true), "a one-QR disconnect that stopped after disabling every key") + XCTAssertFalse( + oneQR(unrevoked: true, twoQRKeyLive: true), + "a two-QR login came after the grant's key went off: the row is its") XCTAssertTrue(oneQR(pending: true), "the one-QR disable update settles the registration") } From f796a86815a574087d6ed33e18410ddaa947793a Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sun, 18 Oct 2026 20:59:12 +0300 Subject: [PATCH 040/108] fix(dashpay): close the second round of App Connect v2 review blockers - Disconnect finds unrecorded v2 keys bound to any contract or group the app's owner owns, which are the bindings the owner check lets a request have, not only the app's own contract (`appsV2KeyIds`, `ownedByOwner`). The other identities of the wallet are scanned for those shapes too, from the store; an owner lookup that fails leaves the row in place. - A retry sends a recorded response again only while the encryption keys it carries are still the identity's: `AppConnectGrant.encryptionKeyIds` is recorded, and a retry whose keys changed stops with `appConnectEncryptionKeyChanged` before anything is registered. - A contract group with administrators is disclosed on the sheet: they can add their own contracts, and a group key acts in the contracts the group holds when it signs. - The budget line says it is a limit on the identity's credits, and a CRITICAL group key's line says that limit does not cap the tokens it can move. New strings ship in English in every locale (Transifex translates). Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 7 + .../DashConnect/AppConnectV2Login.swift | 97 ++++++++---- .../PlatformDashConnectDataSource.swift | 148 +++++++++++++----- .../DashConnect/ApproveConnectionSheet.swift | 41 +++-- DashWallet/ar.lproj/Localizable.strings | 5 +- DashWallet/bg.lproj/Localizable.strings | 5 +- DashWallet/ca.lproj/Localizable.strings | 5 +- DashWallet/cs.lproj/Localizable.strings | 5 +- DashWallet/da.lproj/Localizable.strings | 5 +- DashWallet/de.lproj/Localizable.strings | 5 +- DashWallet/el.lproj/Localizable.strings | 5 +- DashWallet/en.lproj/Localizable.strings | 5 +- DashWallet/eo.lproj/Localizable.strings | 5 +- DashWallet/es.lproj/Localizable.strings | 5 +- DashWallet/et.lproj/Localizable.strings | 5 +- DashWallet/fa.lproj/Localizable.strings | 5 +- DashWallet/fi.lproj/Localizable.strings | 5 +- DashWallet/fil.lproj/Localizable.strings | 5 +- DashWallet/fr.lproj/Localizable.strings | 5 +- DashWallet/hr.lproj/Localizable.strings | 5 +- DashWallet/hu.lproj/Localizable.strings | 5 +- DashWallet/id.lproj/Localizable.strings | 5 +- DashWallet/it.lproj/Localizable.strings | 5 +- DashWallet/ja.lproj/Localizable.strings | 5 +- DashWallet/ko.lproj/Localizable.strings | 5 +- DashWallet/mk.lproj/Localizable.strings | 5 +- DashWallet/ms.lproj/Localizable.strings | 5 +- DashWallet/nb.lproj/Localizable.strings | 5 +- DashWallet/nl.lproj/Localizable.strings | 5 +- DashWallet/pl.lproj/Localizable.strings | 5 +- DashWallet/pt.lproj/Localizable.strings | 5 +- DashWallet/ro.lproj/Localizable.strings | 5 +- DashWallet/ru.lproj/Localizable.strings | 5 +- DashWallet/sk.lproj/Localizable.strings | 5 +- DashWallet/sl.lproj/Localizable.strings | 5 +- DashWallet/sl_SI.lproj/Localizable.strings | 5 +- DashWallet/sq.lproj/Localizable.strings | 5 +- DashWallet/sr.lproj/Localizable.strings | 5 +- DashWallet/sv.lproj/Localizable.strings | 5 +- DashWallet/th.lproj/Localizable.strings | 5 +- DashWallet/tr.lproj/Localizable.strings | 5 +- DashWallet/uk.lproj/Localizable.strings | 5 +- DashWallet/vi.lproj/Localizable.strings | 5 +- DashWallet/zh-Hans.lproj/Localizable.strings | 5 +- .../zh-Hant-TW.lproj/Localizable.strings | 5 +- DashWallet/zh.lproj/Localizable.strings | 5 +- DashWallet/zh_TW.lproj/Localizable.strings | 5 +- .../DashConnect/AppConnectV2LoginTests.swift | 36 +++-- 48 files changed, 408 insertions(+), 136 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 47432b7220..c02dcfbccc 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -243,6 +243,9 @@ enum AppConnect { /// The key's bound as the store holds it; nil for a key with no /// bound, or one this build cannot read (`hasUnreadableBound`). var bound: StoredBound? = nil + /// The stored key has the shape of an App Connect v2 auth key: + /// HASH160 authentication at HIGH or CRITICAL, with an expiry. + var isV2AuthKeyShaped = false } /// A key's contract bound, as the wallet's store records it. @@ -654,6 +657,10 @@ struct AppConnectGrant: Codable, Equatable { /// App Connect v2: the request's `CONNECTION_ID` (hex). A later login /// with the same one replaces this grant's keys. var connectionId: String? = nil + /// App Connect v2: the ids of the identity's encryption keys the + /// response carries, in slot order. A retry sends the recorded response + /// only while it would carry the same ones. + var encryptionKeyIds: [UInt32]? = nil /// Every auth key of the grant. var keyIds: [UInt32] { diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index cdf1393c89..1abd80dbf1 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -115,6 +115,12 @@ extension AppConnect { /// wallet does not know: then the name on the sheet is the one the /// request gives. var brandHost: String? = nil + /// The groups among the bindings that have administrators besides + /// their owner, as Platform proves them. Each administrator can add + /// contracts of its own to the group, and a group key acts in every + /// contract of the group when it signs, not only in those it had + /// when it was granted. + var administeredGroupIds: Set = [] /// The largest budget among the keys, for the summary line. var totalBudget: UInt64? { @@ -412,45 +418,51 @@ extension AppConnect { .sorted() } - /// The contract groups that live v2-shaped keys no record names are - /// bound to (`unrecordedV2KeyIds`): a disconnect looks each one up to - /// tell whether the app's owner owns it. - static func unrecordedV2KeyGroupIds( - recordedKeyIds: Set, - bindings: [KeyBinding], - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] - ) -> Set { - Set(unrecordedV2KeyBounds( - recordedKeyIds: recordedKeyIds, bindings: bindings, currentIdentityPublicKeys: currentIdentityPublicKeys - ).compactMap { _, bound in - if case .contractGroup(let id) = bound { return id } - return nil - }) + /// The contracts and contract groups that v2-shaped keys no record names + /// are bound to (`unrecordedV2Keys`), other than `appContractId`, the + /// allowlisted foreign document types and Platform's system contracts + /// (never a binding's target): a disconnect looks each one up to tell + /// whether the app's owner owns it. + static func unrecordedV2KeyBoundIds( + appContractId: Data, + keys: [(keyId: UInt32, bound: StoredBound)] + ) -> (contracts: Set, groups: Set) { + var contracts: Set = [] + var groups: Set = [] + for (_, bound) in keys { + switch bound { + case .singleContract(let id): + if id != appContractId, !systemContractIds.contains(id.toBase58String()) { contracts.insert(id) } + case .documentType(let id, let name): + if id != appContractId, !systemContractIds.contains(id.toBase58String()), + !allowedForeignDocumentTypes.contains("\(id.toBase58String())/\(name)") { + contracts.insert(id) + } + case .contractGroup(let id): + groups.insert(id) + } + } + return (contracts, groups) } - /// The live keys of the app's v2 grants that no grant record of the - /// identity names, as a reinstall or a lost record leaves them: HASH160 - /// authentication keys at HIGH or CRITICAL with an expiry (every v2 auth - /// key has one), whose stored bound is the app's contract, a document - /// type on it, a contract group the app's owner owns (`appGroupIds`), or - /// a foreign document type v2 allows (DashPay `profile`). The last can - /// be another app's when its record is lost too; it is disabled all the - /// same, since a key left on rather than off is what a disconnect must - /// not do, and that app's next sign-in adds a new one. - static func unrecordedV2KeyIds( - appContractId: Data, + /// The ids of the keys in `keys` that belong to the app's v2 grants: + /// bound to a contract the app's owner owns (`appContractIds`, the app's + /// own among them), a document type on one, a contract group that owner + /// owns (`appGroupIds`), or a foreign document type v2 allows (DashPay + /// `profile`). Those are the bindings `ownershipRefusal` lets a request + /// have. The last can be another app's when its record is lost too; it + /// is disabled all the same, since a key left on rather than off is what + /// a disconnect must not do, and that app's next sign-in adds a new one. + static func appsV2KeyIds( + appContractIds: Set, appGroupIds: Set, - recordedKeyIds: Set, - bindings: [KeyBinding], - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + keys: [(keyId: UInt32, bound: StoredBound)] ) -> [UInt32] { - unrecordedV2KeyBounds( - recordedKeyIds: recordedKeyIds, bindings: bindings, currentIdentityPublicKeys: currentIdentityPublicKeys - ).filter { _, bound in + keys.filter { _, bound in switch bound { - case .singleContract(let id): return id == appContractId + case .singleContract(let id): return appContractIds.contains(id) case .documentType(let id, let name): - return id == appContractId || allowedForeignDocumentTypes.contains("\(id.toBase58String())/\(name)") + return appContractIds.contains(id) || allowedForeignDocumentTypes.contains("\(id.toBase58String())/\(name)") case .contractGroup(let id): return appGroupIds.contains(id) } } @@ -458,7 +470,11 @@ extension AppConnect { .sorted() } - private static func unrecordedV2KeyBounds( + /// The live v2-shaped keys on the identity that no grant record of it + /// names, as a reinstall or a lost record leaves them: HASH160 + /// authentication keys at HIGH or CRITICAL with an expiry (every v2 + /// auth key has one) and a bound the store can read. + static func unrecordedV2Keys( recordedKeyIds: Set, bindings: [KeyBinding], currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] @@ -472,6 +488,19 @@ extension AppConnect { } } + /// `unrecordedV2Keys` from the store alone, for an identity that is not + /// the active one: its keys as last loaded. + static func unrecordedV2Keys( + recordedKeyIds: Set, + bindings: [KeyBinding] + ) -> [(keyId: UInt32, bound: StoredBound)] { + bindings.compactMap { binding in + guard binding.isV2AuthKeyShaped, !binding.isDisabled, !binding.hasUnreadableBound, + !recordedKeyIds.contains(binding.keyId), let bound = binding.bound else { return nil } + return (binding.keyId, bound) + } + } + /// A live auth key a login could have granted: HASH160 and never MASTER, /// so a damaged record cannot get the identity's own keys disabled. static func isLiveGrantedKey(_ key: ManagedIdentity.IdentityPublicKeyInfo) -> Bool { diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 7105434f12..b3ad6b36b2 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -86,6 +86,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case noFreeKeyId case otherIdentitiesNotChecked case registrationPending + case appConnectEncryptionKeyChanged case registrationPendingOnAnotherIdentity case walletChanged case ephemeralKeyGenerationFailed @@ -163,6 +164,10 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it.", comment: "DashConnect") + case .appConnectEncryptionKeyChanged: + return NSLocalizedString( + "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again.", + comment: "DashConnect App Connect v2") case .walletChanged: return NSLocalizedString("The active wallet or identity changed. Try again.", comment: "DashConnect") case .noFreeKeyId: @@ -677,9 +682,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { "This sign-in is for another identity. Switch to it in this wallet and ask the app again.", comment: "DashConnect App Connect v2"))), nil) } - if let refusal = try await appConnectOwnershipRefusal(plan, sdk: context.sdk) { + let ownership = try await appConnectOwnership(plan, sdk: context.sdk) + if let refusal = ownership.refusal { return (.refused(refusal), nil) } + plan.administeredGroupIds = ownership.administeredGroupIds return (.appConnect(plan), nil) } catch let refusal as AppConnect.Refusal { return (.refused(refusal), nil) @@ -689,42 +696,69 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - /// The ids in `groupIds` of the contract groups whose owner is the owner - /// of `contractId`. A group the network proves absent is not; any other - /// failure to read throws, and so does a contract with no readable - /// owner: nothing can then be said of its groups. - private static func groupsOwnedByOwner(of contractId: Data, among groupIds: Set, sdk: SDK) async throws -> Set { - guard !groupIds.isEmpty else { return [] } - let contract = try await sdk.dataContractGetOffMain(id: contractId.toBase58String()) - guard let ownerId = (contract["ownerId"] as? String ?? contract["$ownerId"] as? String) - .flatMap(decodeIdentifier) else { throw DashConnectPlatformError.loginContractUnavailable } - var owned: Set = [] - for groupId in groupIds { + /// The ids among `contractIds` and `groupIds` of the contracts and the + /// contract groups whose owner is the owner of `contractId`, which is + /// itself among the contracts returned. One the network proves absent + /// is not; any other failure to read throws, and so does a contract + /// with no readable owner: nothing can then be said of what it owns. + /// TODO(app-connect-v2-owner-lookup): a contract this build can never + /// read (a format newer than its SDK) fails the same way on every try, + /// so a disconnect that has to look it up keeps the row until the app + /// is updated. + private static func ownedByOwner( + of contractId: Data, + contractIds: Set, + groupIds: Set, + sdk: SDK + ) async throws -> (contracts: Set, groups: Set) { + guard !contractIds.isEmpty || !groupIds.isEmpty else { return ([contractId], []) } + func ownerId(_ object: [String: Any]) -> Data? { + (object["ownerId"] as? String ?? object["$ownerId"] as? String).flatMap(decodeIdentifier) + } + guard let appOwnerId = ownerId(try await sdk.dataContractGetOffMain(id: contractId.toBase58String())) else { + throw DashConnectPlatformError.loginContractUnavailable + } + var contracts: Set = [contractId] + for id in contractIds { do { - let info = try await sdk.getContractGroupInfo(contractGroupId: groupId.toBase58String()) - if (info["ownerId"] as? String).flatMap(decodeIdentifier) == ownerId { owned.insert(groupId) } + if ownerId(try await sdk.dataContractGetOffMain(id: id.toBase58String())) == appOwnerId { contracts.insert(id) } } catch SDKError.notFound { continue } } - return owned + var groups: Set = [] + for id in groupIds { + do { + if ownerId(try await sdk.getContractGroupInfo(contractGroupId: id.toBase58String())) == appOwnerId { + groups.insert(id) + } + } catch SDKError.notFound { + continue + } + } + return (contracts, groups) } /// Reads the owners wallet rule 3 compares from Platform. A group the /// network proves absent counts as not the app's; any other failure to /// read throws, so the sheet offers to try again. The reads run off the /// main actor (`dataContractGetOffMain`; `getContractGroupInfo` is - /// nonisolated), so the sheet stays responsive while they wait. - private func appConnectOwnershipRefusal(_ plan: AppConnect.GrantPlan, sdk: SDK) async throws -> AppConnect.Refusal? { + /// nonisolated), so the sheet stays responsive while they wait. Also + /// returns the groups that have administrators, for the sheet. + private func appConnectOwnership( + _ plan: AppConnect.GrantPlan, + sdk: SDK + ) async throws -> (refusal: AppConnect.Refusal?, administeredGroupIds: Set) { func ownerId(of contract: [String: Any]) -> Data? { (contract["ownerId"] as? String ?? contract["$ownerId"] as? String).flatMap(Self.decodeIdentifier) } let app = try await sdk.dataContractGetOffMain(id: plan.appId.toBase58String()) guard let appOwnerId = ownerId(of: app) else { - return AppConnect.Refusal(.invalid, NSLocalizedString( - "The app's contract has no readable owner.", comment: "DashConnect App Connect v2")) + return (AppConnect.Refusal(.invalid, NSLocalizedString( + "The app's contract has no readable owner.", comment: "DashConnect App Connect v2")), []) } var groupOwners: [Data: Data] = [:] + var administeredGroupIds: Set = [] var contractOwners: [Data: Data] = [plan.appId: appOwnerId] for grant in plan.auth { let id = grant.binding.id @@ -734,6 +768,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { do { let info = try await sdk.getContractGroupInfo(contractGroupId: id.toBase58String()) groupOwners[id] = (info["ownerId"] as? String).flatMap(Self.decodeIdentifier) + // Read as administered unless the proof shows none. + if (info["adminIds"] as? [Any])?.isEmpty != true { administeredGroupIds.insert(id) } } catch SDKError.notFound { continue } @@ -752,12 +788,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if config["requiresIdentityDecryptionBoundedKey"].map({ !($0 is NSNull) }) == true { boundedKeyPurposes.insert(.decryption) } - return AppConnect.ownershipRefusal( + let refusal = AppConnect.ownershipRefusal( for: plan, appOwnerId: appOwnerId, groupOwners: groupOwners, contractOwners: contractOwners, appBoundedKeyPurposes: boundedKeyPurposes) + return (refusal, administeredGroupIds) } func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { @@ -1422,6 +1459,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } + // A response recorded for this request carries the encryption keys + // the identity had then, and a retry sends that response again. If + // one of them has been disabled or replaced since, it would hand the + // app a key that is no longer the identity's: the retry stops here, + // before anything is registered. A record from before the ids were + // noted carries none. + if let recorded = stores.grants.load().first(where: { isGrantForRequest($0) && !$0.isUnconfirmed }), + encryptionSlots.contains(where: { $0.keyId == nil }) + || encryptionSlots.compactMap(\.keyId) != (recorded.encryptionKeyIds ?? []) { + Self.logger.error("🔗 DASHCONNECT :: the recorded App Connect response carries encryption keys the identity no longer has") + throw DashConnectPlatformError.appConnectEncryptionKeyChanged + } + // Wallet rule 8: this connection's previous grant goes in the same // update. A key of it the fetched list lacks means the list is // behind, and it could not be shown to be off. @@ -1529,6 +1579,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // for this request keeps its values: if an earlier publish landed // without confirming, those are the ones on Platform. let grantedKeyIds = authKeyIds.compactMap { $0 } + let sentEncryptionKeyIds = encryptionSlots.compactMap(\.keyId) let primary = plan.auth[0] let grant = updateGrants(in: stores) { grants -> AppConnectGrant in AppConnect.markKeysDisabled(in: &grants) { retiredGrantKeys.contains($0.key) } @@ -1545,7 +1596,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { expiresAt: primary.expiresAt, publishedAt: now(), additionalKeyIds: Array(grantedKeyIds.dropFirst()), - connectionId: connectionId + connectionId: connectionId, + encryptionKeyIds: sentEncryptionKeyIds ) grants.append(new) return new @@ -2297,7 +2349,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// that are bound to the app's contract and shaped as this login /// registers them, so the keys a reinstalled wallet kept no record of go /// too. For a one-QR disconnect that includes the shapes App Connect v2 - /// registers (`AppConnect.unrecordedV2KeyIds`), among them a DashPay + /// registers (`AppConnect.appsV2KeyIds`), among them a DashPay /// profile key that may be another app's. A key another wallet gave the /// app in any other shape stays. /// TODO(app-connect-orphan-responses): the response behind a key with no @@ -2465,21 +2517,21 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { twoQRAuthenticationKeyHash160: checksUnrecordedKeys ? nil : twoQRKeys.authenticationPublicKeyHash160 ) if checksUnrecordedKeys { - // The keys of v2 grants whose record is gone. A group they are - // bound to is the app's if the app's owner owns it, which only - // the network says; if it cannot be read, nothing is turned off. + // The keys of v2 grants whose record is gone. A contract or a + // group they are bound to is the app's if the app's owner owns + // it, which only the network says; if it cannot be read, + // nothing is turned off and the row stays. // Confirmed records only: an unconfirmed one's id may belong to // another key by now. let recordedKeyIds = Set(stores.grants.load() .filter { $0.identityId == identityId && !$0.isUnconfirmed }.flatMap(\.keyIds)) - let appGroupIds = try await Self.groupsOwnedByOwner( - of: appContract, - among: AppConnect.unrecordedV2KeyGroupIds( - recordedKeyIds: recordedKeyIds, bindings: bindings, currentIdentityPublicKeys: currentPublicKeys), - sdk: context.sdk) - let unrecordedV2KeyIds = AppConnect.unrecordedV2KeyIds( - appContractId: appContract, appGroupIds: appGroupIds, recordedKeyIds: recordedKeyIds, - bindings: bindings, currentIdentityPublicKeys: currentPublicKeys) + let unrecorded = AppConnect.unrecordedV2Keys( + recordedKeyIds: recordedKeyIds, bindings: bindings, currentIdentityPublicKeys: currentPublicKeys) + let candidates = AppConnect.unrecordedV2KeyBoundIds(appContractId: appContract, keys: unrecorded) + let owned = try await Self.ownedByOwner( + of: appContract, contractIds: candidates.contracts, groupIds: candidates.groups, sdk: context.sdk) + let unrecordedV2KeyIds = AppConnect.appsV2KeyIds( + appContractIds: owned.contracts, appGroupIds: owned.groups, keys: unrecorded) keyIds = Array(Set(keyIds).union(liveTwoQRLoginKeyIds).union(unrecordedV2KeyIds)).sorted() } if !mayStillLand.isEmpty, keyIds.isEmpty { @@ -2581,9 +2633,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// TODO(app-connect-other-identity-keys): the store is as fresh as each /// identity's last load from Platform, and an identity it does not hold /// is not seen, so the row can go while such a key is live. - /// TODO(app-connect-v2-other-identity-keys): the v2 shapes - /// (`AppConnect.unrecordedV2KeyIds`: a document-type or group key, or one - /// without a budget) are not looked for on the other identities. + /// The v2 shapes no record names count too (`AppConnect.appsV2KeyIds`), + /// with the contracts and groups the app's owner owns read from + /// Platform; an identity whose read fails cannot be told. private func anotherIdentityHoldsAppKeys(appContractId: Data, context: Context) async -> Bool? { let others: [(identityId: Data, identityIndex: UInt32)] do { @@ -2605,11 +2657,27 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let bindings = try Self.storedKeyBindings( identityId: other.identityId.toBase58String(), modelContainer: context.modelContainer) if AppConnect.holdsLiveSessionKey(appContractId: appContractId, bindings: bindings) { return true } + let otherIdentityId = other.identityId.toBase58String() + let unrecorded = AppConnect.unrecordedV2Keys( + recordedKeyIds: Set(context.stores.grants.load() + .filter { $0.identityId == otherIdentityId && !$0.isUnconfirmed }.flatMap(\.keyIds)), + bindings: bindings) + if !unrecorded.isEmpty { + let candidates = AppConnect.unrecordedV2KeyBoundIds(appContractId: appContractId, keys: unrecorded) + let owned = try await Self.ownedByOwner( + of: appContractId, contractIds: candidates.contracts, groupIds: candidates.groups, + sdk: context.sdk) + if !AppConnect.appsV2KeyIds( + appContractIds: owned.contracts, appGroupIds: owned.groups, keys: unrecorded + ).isEmpty { + return true + } + } // An identity always has keys, so none stored means not // loaded; and a session-shaped key with an unreadable bound // may be the app's. if bindings.isEmpty || bindings.contains(where: { - !$0.isDisabled && $0.isSessionKeyShaped && $0.hasUnreadableBound + !$0.isDisabled && ($0.isSessionKeyShaped || $0.isV2AuthKeyShaped) && $0.hasUnreadableBound }) { hasUnknown = true } @@ -3201,7 +3269,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { boundsKind: $0.effectiveContractBoundsKind, boundIds: $0.contractBounds, documentTypeName: $0.contractBoundsDocumentTypeName - ) + ), + isV2AuthKeyShaped: $0.keyTypeEnum == .ecdsaHash160 + && $0.purposeEnum == .authentication + && ($0.securityLevelEnum == .high || $0.securityLevelEnum == .critical) + && $0.expiresAt != nil ) } } diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index 1b874ccf15..7854e82021 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -284,7 +284,7 @@ struct ApproveConnectionSheet: View { VStack(alignment: .leading, spacing: 20) { permissions( granted: [NSLocalizedString("See your username", comment: "DashConnect")] - + plan.auth.map(authGrantText) + + plan.auth.map { authGrantText($0, administered: plan.administeredGroupIds.contains($0.binding.id)) } + plan.encryption.map { _ in String( format: NSLocalizedString( @@ -322,7 +322,9 @@ struct ApproveConnectionSheet: View { } } - private func authGrantText(_ grant: AppConnect.AuthGrant) -> String { + /// What one key can do, what it can spend and until when. `administered`: + /// the group has administrators who can add their own contracts to it. + private func authGrantText(_ grant: AppConnect.AuthGrant, administered: Bool) -> String { let binding = grant.binding let action: String switch binding.kind { @@ -354,20 +356,37 @@ struct ApproveConnectionSheet: View { } } let expiry = Self.expiryFormatter.string(from: Date(timeIntervalSince1970: TimeInterval(grant.expiresAt) / 1000)) + var text: String if let budget = grant.totalBudget { - return String( + text = String( format: NSLocalizedString( - "%1$@, spending up to %2$@ until %3$@", + "%1$@, spending up to %2$@ of your identity's credits until %3$@", comment: "DashConnect App Connect v2: what a key can do, an amount with its unit (0.5 DASH), a date"), action, PlatformCreditsFormatter.dashString(budget), expiry) + } else { + // The app asked for no budget, and the wallet adds none: the key + // can spend the identity's credits without a cap, so the sheet + // says so. + text = String( + format: NSLocalizedString( + "%1$@, with no limit on spending your identity's credits, until %2$@", + comment: "DashConnect App Connect v2: what a key can do, a date"), + action, expiry) } - // The app asked for no budget, and the wallet adds none: the key can - // spend the identity's credits without a cap, so the sheet says so. - return String( - format: NSLocalizedString( - "%1$@, with no limit on spending your identity's credits, until %2$@", - comment: "DashConnect App Connect v2: what a key can do, a date"), - action, expiry) + // A budget is in credits: Platform checks a token transfer against + // the token balance, not against the key's credit budget. + if binding.kind == .contractGroup, grant.securityLevel == .critical { + text += " " + NSLocalizedString( + "The credit limit does not limit how many of your tokens it can move.", + comment: "DashConnect App Connect v2") + } + // Group membership is read when the key signs, not when it is granted. + if binding.kind == .contractGroup, administered { + text += " " + NSLocalizedString( + "Other identities can add their own contracts to this group, and the key will act as you in those too.", + comment: "DashConnect App Connect v2") + } + return text } /// The profile's warnings. Nothing in a request proves where it came diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 5fdd0045a1..ca0c66eb8f 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index bcee8b05ab..d36bd68168 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 484b95e0b4..981a1cb49a 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index a11053d0c2..f4e5caf598 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 6e4eab4d22..6a2b773ff3 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 2bb1a9fa09..7ec06bc5cc 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 507452f8c1..04ee3289ef 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 4ee8b1802f..906682d082 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6505,7 +6505,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6531,6 +6533,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 40f801194a..856ef23304 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index b3861ef204..63e30efae0 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 6c3d568fd3..c14c42f82c 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 40fb943c84..c14f0d55e2 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 9f0e3f4271..ec8bcc371c 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 823492b902..3351d93c28 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 55bb68ae53..91ba16192d 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 09d0043b6a..684913ef1d 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 4c42f2c612..f1402af763 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index a452b5ad50..57341a69c7 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index fe67922cc7..7032674049 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index c226a2e441..01a246d2c4 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 58542919d7..e4736c6a2f 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 479412f316..4f394e85d0 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 6003c51acd..258609aac8 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 5c8f51cfda..9fc243d601 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index eaa0db72e1..c44fb6d425 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 62a401fce3..59d57d9c6a 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 7445dea52f..c8cc128e4a 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index f1c179da12..511c57357d 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 888af0597d..8c61785fb3 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index cbbfafc744..320a70de9d 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 310c83dc04..0bf32042d8 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index aa64cde34c..6f0ae40075 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 2b63c71b6f..e121db1c53 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 11465c5bee..9fe4fc29ae 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 1bd66f98a9..1275143660 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 7482a446a9..6a9dd49201 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index dc2a15ac71..eec6998c1d 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 2aac72a63e..a11bc4f7c2 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index c2bdd88c83..6f90ef05aa 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 89ad6b7de9..ce2dbd782a 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 6439ce27c4..fb05b8fcad 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6732,7 +6732,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6758,6 +6760,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index fcddabbbbd..ba211733de 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index be91faa3b0..1e271bd37c 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6730,7 +6730,9 @@ "Preparing logs…" = "Preparing logs…"; /* DashConnect App Connect v2 */ -"%1$@, spending up to %2$@ until %3$@" = "%1$@, spending up to %2$@ until %3$@"; +"%1$@, spending up to %2$@ of your identity's credits until %3$@" = "%1$@, spending up to %2$@ of your identity's credits until %3$@"; +"The credit limit does not limit how many of your tokens it can move." = "The credit limit does not limit how many of your tokens it can move."; +"Other identities can add their own contracts to this group, and the key will act as you in those too." = "Other identities can add their own contracts to this group, and the key will act as you in those too."; "%1$@, with no limit on spending your identity's credits, until %2$@" = "%1$@, with no limit on spending your identity's credits, until %2$@"; "Act as you in all of %@'s contracts" = "Act as you in all of %@'s contracts"; "Act as you in all of %@'s contracts, including claiming and spending its tokens" = "Act as you in all of %@'s contracts, including claiming and spending its tokens"; @@ -6756,6 +6758,7 @@ "Write \"%@\" documents as you" = "Write \"%@\" documents as you"; "The request names a Dash Platform system contract as the app." = "The request names a Dash Platform system contract as the app."; "This request would return to %@, which is not the app's website." = "This request would return to %@, which is not the app's website."; +"The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again." = "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again."; "This wallet does not know this app, so it cannot confirm the name shown or where the request came from." = "This wallet does not know this app, so it cannot confirm the name shown or where the request came from."; "This request does not return to %@. It may not come from the app's website." = "This request does not return to %@. It may not come from the app's website."; diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index e3cbef023b..3c32002c0b 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -395,21 +395,37 @@ final class AppConnectV2LoginTests: XCTestCase { binding(12, .singleContract(app)), ] let recorded: Set = [12] + let unrecorded = AppConnect.unrecordedV2Keys( + recordedKeyIds: recorded, bindings: bindings, currentIdentityPublicKeys: keys) + XCTAssertEqual(unrecorded.map(\.keyId), [1, 2, 3, 4, 5, 6, 11]) + let candidates = AppConnect.unrecordedV2KeyBoundIds(appContractId: app, keys: unrecorded) + XCTAssertEqual(candidates.contracts, [other], "never the app itself, the allowlisted profile or a system contract") + XCTAssertEqual(candidates.groups, [group, otherGroup]) XCTAssertEqual( - AppConnect.unrecordedV2KeyGroupIds(recordedKeyIds: recorded, bindings: bindings, currentIdentityPublicKeys: keys), - [group, otherGroup]) - XCTAssertEqual( - AppConnect.unrecordedV2KeyIds( - appContractId: app, appGroupIds: [group], recordedKeyIds: recorded, - bindings: bindings, currentIdentityPublicKeys: keys), + AppConnect.appsV2KeyIds(appContractIds: [app], appGroupIds: [group], keys: unrecorded), [1, 2, 3, 5]) + // Another contract of the app's owner: a binding the request could + // have had, so its key goes too. + XCTAssertEqual( + AppConnect.appsV2KeyIds(appContractIds: [app, other], appGroupIds: [group], keys: unrecorded), + [1, 2, 3, 5, 11]) // A key the store cannot place is the disconnect's stop, not a guess. XCTAssertEqual( - AppConnect.unrecordedV2KeyIds( - appContractId: app, appGroupIds: [], recordedKeyIds: [], - bindings: [binding(1, .singleContract(app), unreadable: true)], currentIdentityPublicKeys: [key(1)]), - []) + AppConnect.unrecordedV2Keys( + recordedKeyIds: [], bindings: [binding(1, .singleContract(app), unreadable: true)], + currentIdentityPublicKeys: [key(1)]).count, + 0) + // Another identity's keys, from the store alone. + var stored = binding(1, .singleContract(app)) + stored.isV2AuthKeyShaped = true + var storedOff = binding(2, .singleContract(app)) + storedOff.isV2AuthKeyShaped = true + storedOff.isDisabled = true + XCTAssertEqual( + AppConnect.unrecordedV2Keys(recordedKeyIds: [], bindings: [stored, storedOff, binding(3, .singleContract(app))]) + .map(\.keyId), + [1]) XCTAssertEqual( AppConnect.sessionKeyIdsWithUnknownBinding(for: [], bindings: [], currentIdentityPublicKeys: [key(3, level: .critical)]), [3], "a CRITICAL HASH160 key the store does not show stops a disconnect too") From 2286399c805361f799eb495e8a0a28a7936370df Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sun, 18 Oct 2026 21:16:25 +0300 Subject: [PATCH 041/108] fix(dashpay): take an App Connect v2 key that settled late only as it was added - After an update reported a failure, a key under an added id counted as landed by its payload alone. A stale first read and a request that repeated an earlier one's ephemeral key could then export that request's broader key. It now has to carry everything it was added with, the bound as the store reads it included (`isAddedKey`). - A response recorded by a build that did not note its encryption keys cannot be checked, and a retry of it is refused. - A disconnect that finds a stored v2 key of the app missing from the fetched identity stops with `identityKeysOutOfDate`: the node that answered is behind, and the key could not be shown to be off. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 36 ++++++++++++++++++- .../PlatformDashConnectDataSource.swift | 34 +++++++++++++----- .../DashConnect/AppConnectV2LoginTests.swift | 26 ++++++++++++++ 3 files changed, 87 insertions(+), 9 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 1abd80dbf1..0e2c10c12b 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -501,6 +501,39 @@ extension AppConnect { } } + /// The stored form of a bound the wallet registers a key with. + static func storedBound(of bounds: ManagedPlatformWallet.ContractBounds) -> StoredBound { + switch bounds { + case .singleContract(let id): return .singleContract(id) + case .singleContractDocumentType(let id, let name): return .documentType(contractId: id, name: name) + case .contractGroup(let id): return .contractGroup(id) + } + } + + /// Whether `key`, found on the identity after an update reported a + /// failure, is the key the update added (`added`): the same id and + /// payload, live, and everything it was registered with — type, + /// purpose, level, read-only flag, limits, and the bound as the store + /// reads it + /// (`binding`). A key with the same payload but another bound came from + /// another request that repeated the ephemeral key, and is not taken. + static func isAddedKey( + _ key: ManagedIdentity.IdentityPublicKeyInfo, + added: ManagedPlatformWallet.IdentityPubkey, + binding: KeyBinding? + ) -> Bool { + guard UInt32(bitPattern: key.keyId) == added.keyId, key.data == added.pubkeyBytes, key.disabledAt == nil, + key.keyType == added.keyType, key.purpose == added.purpose, key.securityLevel == added.securityLevel, + key.readOnly == added.readOnly, + key.totalBudget == added.totalBudget, + key.expiresAt.map({ UInt64(max(0, $0)) }) == added.expiresAt else { return false } + guard let bounds = added.contractBounds else { return binding == nil || binding?.bound == nil } + guard let binding, binding.keyId == added.keyId, binding.data == key.data, !binding.hasUnreadableBound else { + return false + } + return binding.bound == storedBound(of: bounds) + } + /// A live auth key a login could have granted: HASH160 and never MASTER, /// so a damaged record cannot get the identity's own keys disabled. static func isLiveGrantedKey(_ key: ManagedIdentity.IdentityPublicKeyInfo) -> Bool { @@ -517,7 +550,8 @@ extension AppConnect { /// and limits no wider than the plan's (`clockTolerance` covers a clock /// moved back between two tries). The payload alone proves nothing: a /// request that repeats another's ephemeral key derives the same one. - /// The caller also requires a grant recorded for this request. + /// A grant recorded for this request, when there is one, must name + /// exactly the keys sent again; the caller checks that. static func canResendAuthKey( _ key: ManagedIdentity.IdentityPublicKeyInfo, for grant: AuthGrant, diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index b3ad6b36b2..0bb6288984 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1464,10 +1464,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // one of them has been disabled or replaced since, it would hand the // app a key that is no longer the identity's: the retry stops here, // before anything is registered. A record from before the ids were - // noted carries none. + // noted cannot be checked, and is refused the same way. if let recorded = stores.grants.load().first(where: { isGrantForRequest($0) && !$0.isUnconfirmed }), encryptionSlots.contains(where: { $0.keyId == nil }) - || encryptionSlots.compactMap(\.keyId) != (recorded.encryptionKeyIds ?? []) { + || recorded.encryptionKeyIds != encryptionSlots.compactMap(\.keyId) { Self.logger.error("🔗 DASHCONNECT :: the recorded App Connect response carries encryption keys the identity no longer has") throw DashConnectPlatformError.appConnectEncryptionKeyChanged } @@ -1536,9 +1536,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // An update can land without confirming, and the node asked // next may not have it yet. If every new key shows up and // every replaced key is off, it went through. - func landed(_ keys: [ManagedIdentity.IdentityPublicKeyInfo]) -> Bool { - add.allSatisfy { new in keys.contains { - UInt32(bitPattern: $0.keyId) == new.keyId && $0.data == new.pubkeyBytes && $0.disabledAt == nil + // Each new key has to be there as it was added, bound as the + // store reads it: a key under its id with the same payload + // but another bound is another request's, and is not sent. + func landed(_ keys: [ManagedIdentity.IdentityPublicKeyInfo], _ bindings: [AppConnect.KeyBinding]) -> Bool { + add.allSatisfy { new in keys.contains { key in + AppConnect.isAddedKey( + key, added: new, + binding: bindings.first { $0.keyId == new.keyId && $0.data == key.data }) } } && disable.allSatisfy { id in keys.contains { UInt32(bitPattern: $0.keyId) == id && $0.disabledAt != nil } } @@ -1546,8 +1551,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { var confirmed = false for attempt in 0 ..< 3 where !confirmed { if attempt > 0 { try? await Task.sleep(nanoseconds: 3_000_000_000) } - if let refreshed = try? await refreshedIdentityPublicKeys(context: context) { - confirmed = landed(refreshed) + if let refreshed = try? await refreshedIdentityPublicKeys(context: context), + let refreshedBindings = try? Self.storedKeyBindings( + identityId: identityId, modelContainer: context.modelContainer) { + confirmed = landed(refreshed, refreshedBindings) } } guard confirmed else { throw error } @@ -2527,9 +2534,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { .filter { $0.identityId == identityId && !$0.isUnconfirmed }.flatMap(\.keyIds)) let unrecorded = AppConnect.unrecordedV2Keys( recordedKeyIds: recordedKeyIds, bindings: bindings, currentIdentityPublicKeys: currentPublicKeys) - let candidates = AppConnect.unrecordedV2KeyBoundIds(appContractId: appContract, keys: unrecorded) + // The store keeps every key it was ever given, the fetched view + // only what the node answered with. A stored key of the app's + // that the view lacks means the view is behind. + let storedUnrecorded = AppConnect.unrecordedV2Keys(recordedKeyIds: recordedKeyIds, bindings: bindings) + let candidates = AppConnect.unrecordedV2KeyBoundIds( + appContractId: appContract, keys: unrecorded + storedUnrecorded) let owned = try await Self.ownedByOwner( of: appContract, contractIds: candidates.contracts, groupIds: candidates.groups, sdk: context.sdk) + let fetchedKeyIds = Set(currentPublicKeys.map { UInt32(bitPattern: $0.keyId) }) + guard AppConnect.appsV2KeyIds( + appContractIds: owned.contracts, appGroupIds: owned.groups, keys: storedUnrecorded + ).allSatisfy(fetchedKeyIds.contains) else { + throw DashConnectPlatformError.identityKeysOutOfDate + } let unrecordedV2KeyIds = AppConnect.appsV2KeyIds( appContractIds: owned.contracts, appGroupIds: owned.groups, keys: unrecorded) keyIds = Array(Set(keyIds).union(liveTwoQRLoginKeyIds).union(unrecordedV2KeyIds)).sorted() diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 3c32002c0b..dea9cf4641 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -474,6 +474,32 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertEqual(AppConnect.freeKeyIds(count: 0, currentIdentityPublicKeys: keys([1])), []) } + /// After an update reported a failure, a key found under the added id is + /// taken as the added one only with everything it was registered with: + /// the same payload alone may be another request's key, bound otherwise. + func testASettledKeyIsTheAddedOneOnlyAsItWasAdded() throws { + let plan = try Self.vectorPlan() + let group = plan.auth[0] + let added = AppConnect.authIdentityPubkey(group, keyId: 7, publicKeyHash160: Data(repeating: 7, count: 20)) + func key(level: SecurityLevel = .critical, budget: UInt64? = group.totalBudget, disabled: Bool = false) + -> ManagedIdentity.IdentityPublicKeyInfo { + ManagedIdentity.IdentityPublicKeyInfo( + keyId: 7, purpose: .authentication, securityLevel: level, keyType: .ecdsaHash160, readOnly: false, + disabledAt: disabled ? 1 : nil, data: Data(repeating: 7, count: 20), + totalBudget: budget, expiresAt: Int64(group.expiresAt)) + } + let stored = AppConnect.KeyBinding( + keyId: 7, data: Data(repeating: 7, count: 20), singleContractId: nil, bound: group.storedBound) + XCTAssertTrue(AppConnect.isAddedKey(key(), added: added, binding: stored)) + var narrower = stored + narrower.bound = .documentType(contractId: group.binding.id, name: "post") + XCTAssertFalse(AppConnect.isAddedKey(key(), added: added, binding: narrower), "another request's bound") + XCTAssertFalse(AppConnect.isAddedKey(key(), added: added, binding: nil), "a key the store does not show") + XCTAssertFalse(AppConnect.isAddedKey(key(level: .high), added: added, binding: stored)) + XCTAssertFalse(AppConnect.isAddedKey(key(budget: 1), added: added, binding: stored)) + XCTAssertFalse(AppConnect.isAddedKey(key(disabled: true), added: added, binding: stored)) + } + /// A stored bound is read from the store's discriminant, ids and name. func testAStoredBoundIsReadFromTheStore() { let id = Data(repeating: 1, count: 32) From 74b7feddea688553ec46e7a2fa7ed6bcaa4cffb4 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 19 Oct 2026 15:52:32 +0300 Subject: [PATCH 042/108] fix(dashconnect): take the app's current encryption key from Platform The current encryption key for the app's MultipleReferenceToLatest requirement was taken to be the identity's live key of that purpose with the highest id. Platform names the key registered last instead, which can have a lower id, and keeps naming it after it is disabled. A wallet whose older key 5 is live after another wallet registered and disabled key 9 would export key 5, which the app's verifier refuses, and still answer ok. The login now reads the current key with a proved identities.contractKeys query and sends this wallet's key only while it is that key and live. A response that leaves out the identity or the purpose throws. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 64 +++++++++-- .../PlatformDashConnectDataSource.swift | 29 ++++- .../DashConnect/AppConnectV2LoginTests.swift | 102 ++++++++++++++++-- 3 files changed, 176 insertions(+), 19 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 0e2c10c12b..04ca797f04 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -362,20 +362,68 @@ extension AppConnect { case notThisWallets } + /// The key Platform names as the identity's current one for a contract + /// and purpose, from a proved `identities.contractKeys` read. It is the + /// key registered last, which need not have the highest id, and it stays + /// named after it is disabled: Platform does not fall back to an older + /// one. + struct CurrentContractKey: Equatable { + let keyId: UInt32 + let keyType: KeyType? + let data: Data + let isDisabled: Bool + } + + /// The current key `response` names for `identityId` and `purpose`, or + /// nil when it proves there is none. The response lists every identity + /// and purpose asked for; one that lacks either, or a key it cannot + /// read, throws. + static func currentContractKey( + from response: [String: Any], + identityId: String, + purpose: KeyPurpose + ) throws -> CurrentContractKey? { + let name: String + switch purpose { + case .encryption: name = "encryption" + case .decryption: name = "decryption" + default: throw SDKError.invalidParameter("Only encryption and decryption keys have a current key here") + } + guard let purposes = response[identityId] as? [String: Any], let entry = purposes[name] else { + throw SDKError.serializationError("The contract keys response leaves out the identity's \(name) key") + } + if entry is NSNull { return nil } + guard let key = entry as? [String: Any], + let keyId = (key["id"] as? NSNumber)?.uint32Value, + let type = (key["type"] as? NSNumber)?.uint8Value, + let hex = key["data"] as? String, let bytes = AppConnect.data(fromHex: hex), !bytes.isEmpty else { + throw SDKError.serializationError("The contract keys response carries an unreadable \(name) key") + } + return CurrentContractKey( + keyId: keyId, keyType: KeyType(rawValue: type), data: bytes, + isDisabled: !(key["disabled_at"] is NSNull || key["disabled_at"] == nil)) + } + /// Rotation 0 only: the key at DIP-13 `7'` for (identity, contract, - /// purpose). The current key is the newest live one, as - /// `identities.contractKeys` resolves it for the app's - /// `MultipleReferenceToLatest` requirement; this wallet's key is sent - /// only while it is that one. A live key of the purpose whose bound the - /// wallet's store cannot place counts as the app's, so a key of unknown - /// origin is never shadowed by a second one. + /// purpose). `currentKey` is the key Platform names as current for the + /// app's `MultipleReferenceToLatest` requirement; this wallet's key is + /// sent only while it is that one and live. A live key of the purpose + /// whose bound the wallet's store cannot place counts as the app's, so a + /// key of unknown origin is never shadowed by a second one. static func encryptionKeyState( derivedPublicKey: Data, purpose: KeyPurpose, contractId: Data, + currentKey: CurrentContractKey?, currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], bindings: [KeyBinding] ) -> EncryptionKeyState { + if let currentKey, !currentKey.isDisabled { + guard currentKey.keyType == .ecdsaSecp256k1, currentKey.data == derivedPublicKey else { + return .notThisWallets + } + return .current(keyId: currentKey.keyId) + } let live = currentIdentityPublicKeys.filter { key in guard key.purpose == purpose, key.disabledAt == nil else { return false } let keyId = UInt32(bitPattern: key.keyId) @@ -383,10 +431,6 @@ extension AppConnect { !stored.hasUnreadableBound else { return true } return stored.singleContractId == contractId } - if let latest = live.max(by: { UInt32(bitPattern: $0.keyId) < UInt32(bitPattern: $1.keyId) }), - latest.keyType == .ecdsaSecp256k1, latest.data == derivedPublicKey { - return .current(keyId: UInt32(bitPattern: latest.keyId)) - } if !live.isEmpty || currentIdentityPublicKeys.contains(where: { $0.data == derivedPublicKey }) { return .notThisWallets } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 0bb6288984..3ff526cad8 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1440,13 +1440,21 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // Wallet rule 7: re-send the identity's key for the app when this // wallet made it, register it when there is none, leave it out when - // another wallet made it. + // another wallet made it. Which key is current is Platform's to say: + // the app's verifier checks the slot against the same proved read. var encryptionSlots: [(keyIndex: Int, keyId: UInt32?)] = [] for (index, grant) in plan.encryption.enumerated() { + let contractKeys = try await DashConnectPlatformQueries.identityContractKeys( + sdk: context.sdk, + identityId: identityId, + contractId: grant.binding.contractId.toBase58String(), + purposes: [grant.keyPurpose]) switch AppConnect.encryptionKeyState( derivedPublicKey: encryptionKeys[index].publicKey, purpose: grant.keyPurpose, contractId: grant.binding.contractId, + currentKey: try AppConnect.currentContractKey( + from: contractKeys, identityId: identityId, purpose: grant.keyPurpose), currentIdentityPublicKeys: currentPublicKeys, bindings: bindings ) { @@ -3649,12 +3657,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// here on one serial queue instead, with the SDK kept alive for the call; /// each copies the native result and releases it before returning. /// TODO(dashconnect-off-main-queries): use the SDK's own off-main reads once -/// it has them for these two, as it has `dataContractGetOffMain`. +/// it has them for these, as it has `dataContractGetOffMain`. enum DashConnectPlatformQueries { /// One queue per kind of read, so a slow document search does not hold /// back the protocol-version read a sheet waits for. private static let epochQueue = DispatchQueue(label: "org.dashfoundation.dash.dashconnect.epoch-query") private static let documentQueue = DispatchQueue(label: "org.dashfoundation.dash.dashconnect.document-query") + private static let contractKeysQueue = DispatchQueue(label: "org.dashfoundation.dash.dashconnect.contract-keys-query") /// The protocol version the network runs, from a proved read of the /// current epoch. It throws when that read fails: there is no fallback @@ -3704,6 +3713,22 @@ enum DashConnectPlatformQueries { } } + /// `SDK.identityGetContractKeys(identityIds:contractId:documentType:purposes:)` + /// off the main actor: the proved current key of each purpose the + /// identity holds for the contract, as `AppConnect.currentContractKey` + /// reads it. + static func identityContractKeys( + sdk: SDK, + identityId: String, + contractId: String, + purposes: [KeyPurpose] + ) async throws -> [String: Any] { + let purposeList = purposes.map { String($0.rawValue) }.joined(separator: ",") + return try await run(sdk, on: contractKeysQueue) { handle in + try json(from: dash_sdk_identities_fetch_contract_keys(handle, identityId, contractId, nil, purposeList)) + } + } + private static func run( _ sdk: SDK, on queue: DispatchQueue, diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index dea9cf4641..c818068239 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -519,16 +519,22 @@ final class AppConnectV2LoginTests: XCTestCase { private func encryptionState( _ keys: [ManagedIdentity.IdentityPublicKeyInfo], + current: AppConnect.CurrentContractKey?, bindings: [AppConnect.KeyBinding] ) -> AppConnect.EncryptionKeyState { AppConnect.encryptionKeyState( derivedPublicKey: Self.derivedPoint, purpose: .encryption, contractId: Self.appId, + currentKey: current, currentIdentityPublicKeys: keys, bindings: bindings) } + private static func current(_ keyId: UInt32, data: Data, disabled: Bool = false) -> AppConnect.CurrentContractKey { + AppConnect.CurrentContractKey(keyId: keyId, keyType: .ecdsaSecp256k1, data: data, isDisabled: disabled) + } + private static func encryptionKey(_ keyId: UInt32, data: Data, disabled: Bool = false) -> ManagedIdentity.IdentityPublicKeyInfo { key(keyId, purpose: .encryption, level: .medium, type: .ecdsaSecp256k1, data: data, disabled: disabled) } @@ -536,32 +542,48 @@ final class AppConnectV2LoginTests: XCTestCase { func testTheCurrentKeyIsSentAgainWhenThisWalletMadeIt() { let mine = Self.encryptionKey(5, data: Self.derivedPoint) XCTAssertEqual( - encryptionState([mine], bindings: [.init(keyId: 5, data: Self.derivedPoint, singleContractId: Self.appId)]), + encryptionState( + [mine], current: Self.current(5, data: Self.derivedPoint), + bindings: [.init(keyId: 5, data: Self.derivedPoint, singleContractId: Self.appId)]), .current(keyId: 5)) + // Platform's answer stands when the fetched keys are behind it. + XCTAssertEqual(encryptionState([], current: Self.current(5, data: Self.derivedPoint), bindings: []), .current(keyId: 5)) } func testTheKeyIsRegisteredWhenTheIdentityHasNoneForTheApp() { let elsewhere = Self.encryptionKey(5, data: Data(repeating: 0x66, count: 33)) let other = Data(repeating: 0x0C, count: 32) - XCTAssertEqual(encryptionState([], bindings: []), .absent) + XCTAssertEqual(encryptionState([], current: nil, bindings: []), .absent) // A key bound to another contract is not the app's. XCTAssertEqual( - encryptionState([elsewhere], bindings: [.init(keyId: 5, data: elsewhere.data, singleContractId: other)]), + encryptionState( + [elsewhere], current: nil, + bindings: [.init(keyId: 5, data: elsewhere.data, singleContractId: other)]), + .absent) + // Nor is a disabled current key of another wallet's in the way. + XCTAssertEqual( + encryptionState([], current: Self.current(9, data: elsewhere.data, disabled: true), bindings: []), .absent) } func testAnotherWalletsKeyIsNeitherSentNorReplaced() { let theirs = Self.encryptionKey(5, data: Data(repeating: 0x66, count: 33)) XCTAssertEqual( - encryptionState([theirs], bindings: [.init(keyId: 5, data: theirs.data, singleContractId: Self.appId)]), + encryptionState( + [theirs], current: Self.current(5, data: theirs.data), + bindings: [.init(keyId: 5, data: theirs.data, singleContractId: Self.appId)]), .notThisWallets) + // Nor one the fetched keys do not show yet. + XCTAssertEqual(encryptionState([], current: Self.current(5, data: theirs.data), bindings: []), .notThisWallets) // Nor one whose bound the store cannot place. - XCTAssertEqual(encryptionState([theirs], bindings: []), .notThisWallets) + XCTAssertEqual(encryptionState([theirs], current: nil, bindings: []), .notThisWallets) // Rotating is never part of a login: a disabled key of this wallet's // cannot be added again, and is not replaced either. let disabledMine = Self.encryptionKey(6, data: Self.derivedPoint, disabled: true) XCTAssertEqual( - encryptionState([disabledMine], bindings: [.init(keyId: 6, data: Self.derivedPoint, singleContractId: Self.appId)]), + encryptionState( + [disabledMine], current: Self.current(6, data: Self.derivedPoint, disabled: true), + bindings: [.init(keyId: 6, data: Self.derivedPoint, singleContractId: Self.appId)]), .notThisWallets) } @@ -569,13 +591,79 @@ final class AppConnectV2LoginTests: XCTestCase { let mine = Self.encryptionKey(5, data: Self.derivedPoint) let newer = Self.encryptionKey(9, data: Data(repeating: 0x66, count: 33)) XCTAssertEqual( - encryptionState([mine, newer], bindings: [ + encryptionState([mine, newer], current: Self.current(9, data: newer.data), bindings: [ .init(keyId: 5, data: Self.derivedPoint, singleContractId: Self.appId), .init(keyId: 9, data: newer.data, singleContractId: Self.appId), ]), .notThisWallets) } + /// Platform keeps naming the last key registered after it is disabled. + /// This wallet's older live key is not current then, and the app's + /// verifier would refuse it. + func testThisWalletsKeyIsNotSentWhenTheLatestKeyWasDisabled() { + let mine = Self.encryptionKey(5, data: Self.derivedPoint) + let disabled = Self.encryptionKey(9, data: Data(repeating: 0x66, count: 33), disabled: true) + let bindings: [AppConnect.KeyBinding] = [ + .init(keyId: 5, data: Self.derivedPoint, singleContractId: Self.appId), + .init(keyId: 9, data: disabled.data, singleContractId: Self.appId), + ] + XCTAssertEqual( + encryptionState([mine, disabled], current: Self.current(9, data: disabled.data, disabled: true), bindings: bindings), + .notThisWallets) + } + + /// The current key is the one registered last, not the one with the + /// highest id. + func testTheCurrentKeyIsTheLastRegisteredNotTheHighestId() { + let theirs = Self.encryptionKey(9, data: Data(repeating: 0x66, count: 33)) + let mineLower = Self.encryptionKey(3, data: Self.derivedPoint) + let bindings: [AppConnect.KeyBinding] = [ + .init(keyId: 3, data: Self.derivedPoint, singleContractId: Self.appId), + .init(keyId: 9, data: theirs.data, singleContractId: Self.appId), + ] + XCTAssertEqual( + encryptionState([theirs, mineLower], current: Self.current(3, data: Self.derivedPoint), bindings: bindings), + .current(keyId: 3)) + let mineHigher = Self.encryptionKey(9, data: Self.derivedPoint) + let theirsLower = Self.encryptionKey(3, data: Data(repeating: 0x66, count: 33)) + XCTAssertEqual( + encryptionState( + [mineHigher, theirsLower], current: Self.current(3, data: theirsLower.data), + bindings: [ + .init(keyId: 9, data: Self.derivedPoint, singleContractId: Self.appId), + .init(keyId: 3, data: theirsLower.data, singleContractId: Self.appId), + ]), + .notThisWallets) + } + + func testTheCurrentKeyIsReadFromTheContractKeysResponse() throws { + let identityId = "identity" + func read(_ response: [String: Any], _ purpose: KeyPurpose = .encryption) throws -> AppConnect.CurrentContractKey? { + try AppConnect.currentContractKey(from: response, identityId: identityId, purpose: purpose) + } + let key: [String: Any] = [ + "id": 9, "type": 0, "data": Self.derivedPoint.toHexString(), "purpose": 1, + "security_level": 2, "read_only": false, "disabled_at": NSNull(), + ] + XCTAssertEqual( + try read([identityId: ["encryption": key]]), + AppConnect.CurrentContractKey(keyId: 9, keyType: .ecdsaSecp256k1, data: Self.derivedPoint, isDisabled: false)) + var disabled = key + disabled["disabled_at"] = 1_700_000_000_000 + XCTAssertEqual(try read([identityId: ["encryption": disabled]])?.isDisabled, true) + XCTAssertNil(try read([identityId: ["encryption": NSNull()]]), "proved absent") + XCTAssertEqual(try read([identityId: ["decryption": key]], .decryption)?.keyId, 9) + // A response that leaves the identity or the purpose out says nothing. + XCTAssertThrowsError(try read([:])) + XCTAssertThrowsError(try read([identityId: [:] as [String: Any]])) + XCTAssertThrowsError(try read([identityId: ["decryption": key]])) + var unreadable = key + unreadable["data"] = "zz" + XCTAssertThrowsError(try read([identityId: ["encryption": unreadable]])) + XCTAssertThrowsError(try read([identityId: ["authentication": key]], .authentication)) + } + // MARK: - Supersession (wallet rule 8) func testALoginReplacesTheLiveKeysOfTheSameConnectionOnly() { From 074aa111ab3205acd51cd8cfaee943d18040f70b Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 19 Oct 2026 17:12:30 +0300 Subject: [PATCH 043/108] fix(dashconnect): send the current encryption key only when both reads agree The fetched identity keys and Platform's current-key reference are two reads, and either can be behind. The login now goes ahead only when the fetched keys show the referenced key as Platform does (same id, data and disabled state), and a live key of this wallet's bound to the app with no reference at all stops it as out of date instead of dropping the slot. That also keeps a stale list from offering the referenced key's id to a new key, and keeps a disabled own key from being registered again. A contract whose requirement is Multiple keeps no current key, so a login that asks for one is refused up front. The contract keys are read once per contract, and their numbers only when exact. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 72 ++++++++++++++---- .../PlatformDashConnectDataSource.swift | 23 ++++-- DashWallet/ar.lproj/Localizable.strings | 2 +- DashWallet/bg.lproj/Localizable.strings | 2 +- DashWallet/ca.lproj/Localizable.strings | 2 +- DashWallet/cs.lproj/Localizable.strings | 2 +- DashWallet/da.lproj/Localizable.strings | 2 +- DashWallet/de.lproj/Localizable.strings | 2 +- DashWallet/el.lproj/Localizable.strings | 2 +- DashWallet/en.lproj/Localizable.strings | 2 +- DashWallet/eo.lproj/Localizable.strings | 2 +- DashWallet/es.lproj/Localizable.strings | 2 +- DashWallet/et.lproj/Localizable.strings | 2 +- DashWallet/fa.lproj/Localizable.strings | 2 +- DashWallet/fi.lproj/Localizable.strings | 2 +- DashWallet/fil.lproj/Localizable.strings | 2 +- DashWallet/fr.lproj/Localizable.strings | 2 +- DashWallet/hr.lproj/Localizable.strings | 2 +- DashWallet/hu.lproj/Localizable.strings | 2 +- DashWallet/id.lproj/Localizable.strings | 2 +- DashWallet/it.lproj/Localizable.strings | 2 +- DashWallet/ja.lproj/Localizable.strings | 2 +- DashWallet/ko.lproj/Localizable.strings | 2 +- DashWallet/mk.lproj/Localizable.strings | 2 +- DashWallet/ms.lproj/Localizable.strings | 2 +- DashWallet/nb.lproj/Localizable.strings | 2 +- DashWallet/nl.lproj/Localizable.strings | 2 +- DashWallet/pl.lproj/Localizable.strings | 2 +- DashWallet/pt.lproj/Localizable.strings | 2 +- DashWallet/ro.lproj/Localizable.strings | 2 +- DashWallet/ru.lproj/Localizable.strings | 2 +- DashWallet/sk.lproj/Localizable.strings | 2 +- DashWallet/sl.lproj/Localizable.strings | 2 +- DashWallet/sl_SI.lproj/Localizable.strings | 2 +- DashWallet/sq.lproj/Localizable.strings | 2 +- DashWallet/sr.lproj/Localizable.strings | 2 +- DashWallet/sv.lproj/Localizable.strings | 2 +- DashWallet/th.lproj/Localizable.strings | 2 +- DashWallet/tr.lproj/Localizable.strings | 2 +- DashWallet/uk.lproj/Localizable.strings | 2 +- DashWallet/vi.lproj/Localizable.strings | 2 +- DashWallet/zh-Hans.lproj/Localizable.strings | 2 +- .../zh-Hant-TW.lproj/Localizable.strings | 2 +- DashWallet/zh.lproj/Localizable.strings | 2 +- DashWallet/zh_TW.lproj/Localizable.strings | 2 +- .../DashConnect/AppConnectV2LoginTests.swift | 76 +++++++++++++++++-- 46 files changed, 187 insertions(+), 70 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 04ca797f04..dacc1c4046 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -248,7 +248,8 @@ extension AppConnect { /// - a contract group must be owned by the owner of `appId`; /// - a contract, or a document type's contract, must be owned by that /// owner, unless the document type is on the allowlist; - /// - `appId` must opt in to bounded keys of each encryption purpose asked. + /// - `appId` must keep a current bounded key (`Unique` or + /// `MultipleReferenceToLatest`) of each encryption purpose asked. /// /// `groupOwners` and `contractOwners` map ids to owner ids; an id missing /// from them does not exist. Returns why the request is refused, or nil. @@ -288,7 +289,7 @@ extension AppConnect { } for grant in plan.encryption where !appBoundedKeyPurposes.contains(grant.keyPurpose) { return Refusal(.invalid, NSLocalizedString( - "The app's contract does not take encryption keys bound to it.", + "The app's contract keeps no current encryption key bound to it.", comment: "DashConnect App Connect v2")) } return nil @@ -360,6 +361,18 @@ extension AppConnect { /// rotation, which orphans what peers encrypted to it; that is an /// explicit user action, never part of a login. case notThisWallets + /// The fetched keys and Platform's current key disagree: one of the + /// two reads is behind, and nothing can be said until both agree. + case outOfDate + } + + /// Whether a contract's bounded-key requirement for a purpose keeps a + /// current key, which is what a login sends: `Unique` (0) and + /// `MultipleReferenceToLatest` (2) do; `Multiple` (1) and no requirement + /// do not. + static func keepsACurrentKey(_ requirement: Any?) -> Bool { + guard let number = requirement as? NSNumber, CFGetTypeID(number) != CFBooleanGetTypeID() else { return false } + return number == 0 || number == 2 } /// The key Platform names as the identity's current one for a contract @@ -393,23 +406,38 @@ extension AppConnect { throw SDKError.serializationError("The contract keys response leaves out the identity's \(name) key") } if entry is NSNull { return nil } + // JSON numbers are read only when they are exact, so a value out + // of range is unreadable rather than wrapped. + func exact(_ value: Any?) -> Value? { + guard let number = value as? NSNumber, CFGetTypeID(number) != CFBooleanGetTypeID() else { return nil } + let whole = number.int64Value + guard Double(whole) == number.doubleValue else { return nil } + return Value(exactly: whole) + } guard let key = entry as? [String: Any], - let keyId = (key["id"] as? NSNumber)?.uint32Value, - let type = (key["type"] as? NSNumber)?.uint8Value, + let keyId: UInt32 = exact(key["id"]), + let type: UInt8 = exact(key["type"]), let hex = key["data"] as? String, let bytes = AppConnect.data(fromHex: hex), !bytes.isEmpty else { throw SDKError.serializationError("The contract keys response carries an unreadable \(name) key") } + let disabledAt = key["disabled_at"] + guard disabledAt == nil || disabledAt is NSNull || (exact(disabledAt) as UInt64?) != nil else { + throw SDKError.serializationError("The contract keys response carries an unreadable \(name) key") + } return CurrentContractKey( keyId: keyId, keyType: KeyType(rawValue: type), data: bytes, - isDisabled: !(key["disabled_at"] is NSNull || key["disabled_at"] == nil)) + isDisabled: !(disabledAt == nil || disabledAt is NSNull)) } /// Rotation 0 only: the key at DIP-13 `7'` for (identity, contract, /// purpose). `currentKey` is the key Platform names as current for the - /// app's `MultipleReferenceToLatest` requirement; this wallet's key is - /// sent only while it is that one and live. A live key of the purpose - /// whose bound the wallet's store cannot place counts as the app's, so a - /// key of unknown origin is never shadowed by a second one. + /// app's `Unique` or `MultipleReferenceToLatest` requirement; this + /// wallet's key is sent only while it is that one and live. The fetched + /// keys must show that key as Platform does, and a key bound to the app + /// that Platform does not name means Platform's read is behind. A live + /// key of the purpose whose bound the wallet's store cannot place counts + /// as the app's, so a key of unknown origin is never shadowed by a + /// second one. static func encryptionKeyState( derivedPublicKey: Data, purpose: KeyPurpose, @@ -418,18 +446,34 @@ extension AppConnect { currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], bindings: [KeyBinding] ) -> EncryptionKeyState { - if let currentKey, !currentKey.isDisabled { - guard currentKey.keyType == .ecdsaSecp256k1, currentKey.data == derivedPublicKey else { - return .notThisWallets + if let currentKey { + guard let fetched = currentIdentityPublicKeys.first(where: { UInt32(bitPattern: $0.keyId) == currentKey.keyId }), + fetched.purpose == purpose, fetched.data == currentKey.data, + (fetched.disabledAt != nil) == currentKey.isDisabled else { + return .outOfDate + } + if !currentKey.isDisabled { + guard fetched.keyType == .ecdsaSecp256k1, currentKey.keyType == .ecdsaSecp256k1, + currentKey.data == derivedPublicKey else { + return .notThisWallets + } + return .current(keyId: currentKey.keyId) } - return .current(keyId: currentKey.keyId) } + var placedOnTheApp = false let live = currentIdentityPublicKeys.filter { key in guard key.purpose == purpose, key.disabledAt == nil else { return false } let keyId = UInt32(bitPattern: key.keyId) guard let stored = bindings.first(where: { $0.keyId == keyId && $0.data == key.data }), !stored.hasUnreadableBound else { return true } - return stored.singleContractId == contractId + guard stored.singleContractId == contractId else { return false } + placedOnTheApp = true + return true + } + // Registering a key bound to the app makes it current, so a live one + // with no current key at all is a read from before it landed. + if currentKey == nil && placedOnTheApp { + return .outOfDate } if !live.isEmpty || currentIdentityPublicKeys.contains(where: { $0.data == derivedPublicKey }) { return .notThisWallets diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 3ff526cad8..bd552578c6 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -782,10 +782,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } let config = app["config"] as? [String: Any] ?? [:] var boundedKeyPurposes: Set = [] - if config["requiresIdentityEncryptionBoundedKey"].map({ !($0 is NSNull) }) == true { + if AppConnect.keepsACurrentKey(config["requiresIdentityEncryptionBoundedKey"]) { boundedKeyPurposes.insert(.encryption) } - if config["requiresIdentityDecryptionBoundedKey"].map({ !($0 is NSNull) }) == true { + if AppConnect.keepsACurrentKey(config["requiresIdentityDecryptionBoundedKey"]) { boundedKeyPurposes.insert(.decryption) } let refusal = AppConnect.ownershipRefusal( @@ -1442,19 +1442,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // wallet made it, register it when there is none, leave it out when // another wallet made it. Which key is current is Platform's to say: // the app's verifier checks the slot against the same proved read. - var encryptionSlots: [(keyIndex: Int, keyId: UInt32?)] = [] - for (index, grant) in plan.encryption.enumerated() { - let contractKeys = try await DashConnectPlatformQueries.identityContractKeys( + var contractKeys: [Data: [String: Any]] = [:] + for contractId in Set(plan.encryption.map(\.binding.contractId)) { + let purposes = Set(plan.encryption.filter { $0.binding.contractId == contractId }.map(\.keyPurpose)) + contractKeys[contractId] = try await DashConnectPlatformQueries.identityContractKeys( sdk: context.sdk, identityId: identityId, - contractId: grant.binding.contractId.toBase58String(), - purposes: [grant.keyPurpose]) + contractId: contractId.toBase58String(), + purposes: purposes.sorted { $0.rawValue < $1.rawValue }) + } + var encryptionSlots: [(keyIndex: Int, keyId: UInt32?)] = [] + for (index, grant) in plan.encryption.enumerated() { switch AppConnect.encryptionKeyState( derivedPublicKey: encryptionKeys[index].publicKey, purpose: grant.keyPurpose, contractId: grant.binding.contractId, currentKey: try AppConnect.currentContractKey( - from: contractKeys, identityId: identityId, purpose: grant.keyPurpose), + from: contractKeys[grant.binding.contractId] ?? [:], identityId: identityId, purpose: grant.keyPurpose), currentIdentityPublicKeys: currentPublicKeys, bindings: bindings ) { @@ -1464,6 +1468,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { encryptionSlots.append((index, nil)) case .notThisWallets: Self.logger.info("🔗 DASHCONNECT :: the app's encryption key on this identity is not this wallet's; slot left out") + case .outOfDate: + Self.logger.error("🔗 DASHCONNECT :: the identity's keys and Platform's current encryption key disagree") + throw DashConnectPlatformError.identityKeysOutOfDate } } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index ca0c66eb8f..bf1f52eb31 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index d36bd68168..eb1d1849e7 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 981a1cb49a..8750c07515 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index f4e5caf598..a1c1715f40 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 6a2b773ff3..97cc9ebb69 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 7ec06bc5cc..fe3746ac3b 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 04ee3289ef..cf06eff8ea 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 906682d082..f6dc7a180c 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6522,7 +6522,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 856ef23304..9406b2f5a3 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 63e30efae0..563bffc71a 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index c14c42f82c..8b7e53f16a 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index c14f0d55e2..eed6db5143 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index ec8bcc371c..bc359124ec 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 3351d93c28..fd398d336f 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 91ba16192d..fd719081fe 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 684913ef1d..f2853f5f6b 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index f1402af763..ddbf1b6abd 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 57341a69c7..54f4636c95 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 7032674049..31a949d994 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 01a246d2c4..c28255ffb3 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index e4736c6a2f..0ad367d06e 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 4f394e85d0..208f952af4 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 258609aac8..7477d4a2c8 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 9fc243d601..5941701e3c 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index c44fb6d425..136b6bccb5 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 59d57d9c6a..687b710982 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index c8cc128e4a..94024887d9 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 511c57357d..573ec437aa 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 8c61785fb3..cb433e2deb 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 320a70de9d..a4327dbe7d 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 0bf32042d8..4cd96e32aa 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 6f0ae40075..5ffdeba625 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index e121db1c53..e56c3a681b 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 9fe4fc29ae..6f90343207 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 1275143660..5f58e427df 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 6a9dd49201..463cb49c6a 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index eec6998c1d..53a4fc9e48 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index a11bc4f7c2..f11d0d207b 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 6f90ef05aa..b6e2f7d6c6 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index ce2dbd782a..3feed2fd6a 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index fb05b8fcad..0f49ff6235 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6749,7 +6749,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index ba211733de..7cc225b44f 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 1e271bd37c..4214e78c7c 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6747,7 +6747,7 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract does not take encryption keys bound to it." = "The app's contract does not take encryption keys bound to it."; +"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index c818068239..15f66c5f8d 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -546,8 +546,8 @@ final class AppConnectV2LoginTests: XCTestCase { [mine], current: Self.current(5, data: Self.derivedPoint), bindings: [.init(keyId: 5, data: Self.derivedPoint, singleContractId: Self.appId)]), .current(keyId: 5)) - // Platform's answer stands when the fetched keys are behind it. - XCTAssertEqual(encryptionState([], current: Self.current(5, data: Self.derivedPoint), bindings: []), .current(keyId: 5)) + // Fetched keys that do not show it yet are behind Platform. + XCTAssertEqual(encryptionState([], current: Self.current(5, data: Self.derivedPoint), bindings: []), .outOfDate) } func testTheKeyIsRegisteredWhenTheIdentityHasNoneForTheApp() { @@ -561,8 +561,9 @@ final class AppConnectV2LoginTests: XCTestCase { bindings: [.init(keyId: 5, data: elsewhere.data, singleContractId: other)]), .absent) // Nor is a disabled current key of another wallet's in the way. + let disabledTheirs = Self.encryptionKey(9, data: Data(repeating: 0x77, count: 33), disabled: true) XCTAssertEqual( - encryptionState([], current: Self.current(9, data: elsewhere.data, disabled: true), bindings: []), + encryptionState([disabledTheirs], current: Self.current(9, data: disabledTheirs.data, disabled: true), bindings: []), .absent) } @@ -573,8 +574,8 @@ final class AppConnectV2LoginTests: XCTestCase { [theirs], current: Self.current(5, data: theirs.data), bindings: [.init(keyId: 5, data: theirs.data, singleContractId: Self.appId)]), .notThisWallets) - // Nor one the fetched keys do not show yet. - XCTAssertEqual(encryptionState([], current: Self.current(5, data: theirs.data), bindings: []), .notThisWallets) + // One the fetched keys do not show yet stops the login. + XCTAssertEqual(encryptionState([], current: Self.current(5, data: theirs.data), bindings: []), .outOfDate) // Nor one whose bound the store cannot place. XCTAssertEqual(encryptionState([theirs], current: nil, bindings: []), .notThisWallets) // Rotating is never part of a login: a disabled key of this wallet's @@ -637,6 +638,46 @@ final class AppConnectV2LoginTests: XCTestCase { .notThisWallets) } + /// The fetched keys and Platform's current key are two reads, and either + /// can be behind. The login goes ahead only when they agree. + func testTheFetchedKeysMustAgreeWithPlatformsCurrentKey() { + let mine = Self.encryptionKey(5, data: Self.derivedPoint) + let mineBinding = AppConnect.KeyBinding(keyId: 5, data: Self.derivedPoint, singleContractId: Self.appId) + // This wallet's live key bound to the app, and no current key: a + // registration Platform's read does not show yet. + XCTAssertEqual(encryptionState([mine], current: nil, bindings: [mineBinding]), .outOfDate) + // Platform shows it live, the fetched keys disabled; or the reverse. + XCTAssertEqual( + encryptionState( + [Self.encryptionKey(5, data: Self.derivedPoint, disabled: true)], + current: Self.current(5, data: Self.derivedPoint), bindings: [mineBinding]), + .outOfDate) + XCTAssertEqual( + encryptionState([mine], current: Self.current(5, data: Self.derivedPoint, disabled: true), bindings: [mineBinding]), + .outOfDate) + // The same id with other data. + XCTAssertEqual( + encryptionState( + [Self.encryptionKey(5, data: Data(repeating: 0x66, count: 33))], + current: Self.current(5, data: Self.derivedPoint), bindings: []), + .outOfDate) + // This wallet's key, current and disabled, before the fetched keys + // show it: never registered again. + XCTAssertEqual( + encryptionState([], current: Self.current(6, data: Self.derivedPoint, disabled: true), bindings: []), + .outOfDate) + } + + func testOnlyARequirementThatKeepsACurrentKeyTakesALogin() { + XCTAssertTrue(AppConnect.keepsACurrentKey(NSNumber(value: 0)), "Unique") + XCTAssertTrue(AppConnect.keepsACurrentKey(NSNumber(value: 2)), "MultipleReferenceToLatest") + XCTAssertFalse(AppConnect.keepsACurrentKey(NSNumber(value: 1)), "Multiple") + XCTAssertFalse(AppConnect.keepsACurrentKey(NSNull())) + XCTAssertFalse(AppConnect.keepsACurrentKey(nil)) + XCTAssertFalse(AppConnect.keepsACurrentKey(NSNumber(value: true))) + XCTAssertFalse(AppConnect.keepsACurrentKey("2")) + } + func testTheCurrentKeyIsReadFromTheContractKeysResponse() throws { let identityId = "identity" func read(_ response: [String: Any], _ purpose: KeyPurpose = .encryption) throws -> AppConnect.CurrentContractKey? { @@ -662,6 +703,31 @@ final class AppConnectV2LoginTests: XCTestCase { unreadable["data"] = "zz" XCTAssertThrowsError(try read([identityId: ["encryption": unreadable]])) XCTAssertThrowsError(try read([identityId: ["authentication": key]], .authentication)) + // Numbers are read only when exact. + for (field, value) in [("type", 256), ("id", -1), ("id", 4_294_967_301)] as [(String, Any)] { + var wrong = key + wrong[field] = value + XCTAssertThrowsError(try read([identityId: ["encryption": wrong]]), "\(field) = \(value)") + } + var fractional = key + fractional["id"] = 1.5 + XCTAssertThrowsError(try read([identityId: ["encryption": fractional]])) + var boolean = key + boolean["id"] = true + XCTAssertThrowsError(try read([identityId: ["encryption": boolean]])) + } + + /// The response as the SDK's JSON text decodes, not as Swift literals. + func testTheCurrentKeyIsReadFromTheSDKsJSONText() throws { + let text = """ + {"identity":{"encryption":{"id":9,"type":0,"data":"\(Self.derivedPoint.toHexString())","purpose":1,\ + "security_level":2,"read_only":false,"disabled_at":null},"decryption":null}} + """ + let response = try XCTUnwrap(JSONSerialization.jsonObject(with: Data(text.utf8)) as? [String: Any]) + XCTAssertEqual( + try AppConnect.currentContractKey(from: response, identityId: "identity", purpose: .encryption), + AppConnect.CurrentContractKey(keyId: 9, keyType: .ecdsaSecp256k1, data: Self.derivedPoint, isDisabled: false)) + XCTAssertNil(try AppConnect.currentContractKey(from: response, identityId: "identity", purpose: .decryption)) } // MARK: - Supersession (wallet rule 8) From d636c666fe53924b50677d5085e8a1542dda718b Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 19 Oct 2026 17:25:44 +0300 Subject: [PATCH 044/108] fix(dashconnect): follow the contract's current-key rule for the app's encryption key Unique keeps the first key ever registered current, even after it is disabled, and refuses a second one: the slot is left out there instead of a registration that fails the whole update. With no current key at all, a live key the store cannot place is bound elsewhere and no longer holds the slot back. The rule travels with the plan from the contract read the sheet already makes. When a key this login registered is passed over by another wallet's registration that landed later, the slot is left out of the response. The contract keys are read beside the identity's keys, once, and a failed read or a disagreement between the two now has its own sign-in message. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 84 ++++++++++------- .../PlatformDashConnectDataSource.swift | 93 ++++++++++++++----- DashWallet/ar.lproj/Localizable.strings | 2 + DashWallet/bg.lproj/Localizable.strings | 2 + DashWallet/ca.lproj/Localizable.strings | 2 + DashWallet/cs.lproj/Localizable.strings | 2 + DashWallet/da.lproj/Localizable.strings | 2 + DashWallet/de.lproj/Localizable.strings | 2 + DashWallet/el.lproj/Localizable.strings | 2 + DashWallet/en.lproj/Localizable.strings | 2 + DashWallet/eo.lproj/Localizable.strings | 2 + DashWallet/es.lproj/Localizable.strings | 2 + DashWallet/et.lproj/Localizable.strings | 2 + DashWallet/fa.lproj/Localizable.strings | 2 + DashWallet/fi.lproj/Localizable.strings | 2 + DashWallet/fil.lproj/Localizable.strings | 2 + DashWallet/fr.lproj/Localizable.strings | 2 + DashWallet/hr.lproj/Localizable.strings | 2 + DashWallet/hu.lproj/Localizable.strings | 2 + DashWallet/id.lproj/Localizable.strings | 2 + DashWallet/it.lproj/Localizable.strings | 2 + DashWallet/ja.lproj/Localizable.strings | 2 + DashWallet/ko.lproj/Localizable.strings | 2 + DashWallet/mk.lproj/Localizable.strings | 2 + DashWallet/ms.lproj/Localizable.strings | 2 + DashWallet/nb.lproj/Localizable.strings | 2 + DashWallet/nl.lproj/Localizable.strings | 2 + DashWallet/pl.lproj/Localizable.strings | 2 + DashWallet/pt.lproj/Localizable.strings | 2 + DashWallet/ro.lproj/Localizable.strings | 2 + DashWallet/ru.lproj/Localizable.strings | 2 + DashWallet/sk.lproj/Localizable.strings | 2 + DashWallet/sl.lproj/Localizable.strings | 2 + DashWallet/sl_SI.lproj/Localizable.strings | 2 + DashWallet/sq.lproj/Localizable.strings | 2 + DashWallet/sr.lproj/Localizable.strings | 2 + DashWallet/sv.lproj/Localizable.strings | 2 + DashWallet/th.lproj/Localizable.strings | 2 + DashWallet/tr.lproj/Localizable.strings | 2 + DashWallet/uk.lproj/Localizable.strings | 2 + DashWallet/vi.lproj/Localizable.strings | 2 + DashWallet/zh-Hans.lproj/Localizable.strings | 2 + .../zh-Hant-TW.lproj/Localizable.strings | 2 + DashWallet/zh.lproj/Localizable.strings | 2 + DashWallet/zh_TW.lproj/Localizable.strings | 2 + .../DashConnect/AppConnectV2LoginTests.swift | 52 +++++++++-- 46 files changed, 252 insertions(+), 63 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index dacc1c4046..a9b891fd16 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -121,6 +121,9 @@ extension AppConnect { /// contract of the group when it signs, not only in those it had /// when it was granted. var administeredGroupIds: Set = [] + /// How the app's contract keeps the current key of each encryption + /// purpose asked, as Platform proves the contract. + var currentKeyRules: [KeyPurpose: CurrentKeyRule] = [:] /// The largest budget among the keys, for the summary line. var totalBudget: UInt64? { @@ -366,20 +369,43 @@ extension AppConnect { case outOfDate } - /// Whether a contract's bounded-key requirement for a purpose keeps a - /// current key, which is what a login sends: `Unique` (0) and - /// `MultipleReferenceToLatest` (2) do; `Multiple` (1) and no requirement - /// do not. - static func keepsACurrentKey(_ requirement: Any?) -> Bool { - guard let number = requirement as? NSNumber, CFGetTypeID(number) != CFBooleanGetTypeID() else { return false } - return number == 0 || number == 2 + /// How a contract keeps the current key of a purpose it requires bound + /// keys for. A login sends that key, so only these two take one; + /// `Multiple` keeps none. + enum CurrentKeyRule: Equatable { + /// `Unique` (0): one key ever. The first one registered stays + /// current after it is disabled, and no other can be added. + case unique + /// `MultipleReferenceToLatest` (2): the key registered last is + /// current, and stays current after it is disabled. + case latest + } + + /// The rule a contract's `requiresIdentity…BoundedKey` value names, or + /// nil for `Multiple` (1), none, or a value this build cannot read. + static func currentKeyRule(_ requirement: Any?) -> CurrentKeyRule? { + switch exactInteger(requirement) as UInt8? { + case 0: return .unique + case 2: return .latest + default: return nil + } + } + + /// A JSON number read only when it is an exact integer that fits, so a + /// value out of range is unreadable rather than wrapped. + static func exactInteger(_ value: Any?) -> Value? { + guard let number = value as? NSNumber, CFGetTypeID(number) != CFBooleanGetTypeID() else { return nil } + let whole = number.int64Value + guard Double(whole) == number.doubleValue else { return nil } + return Value(exactly: whole) } /// The key Platform names as the identity's current one for a contract - /// and purpose, from a proved `identities.contractKeys` read. It is the - /// key registered last, which need not have the highest id, and it stays - /// named after it is disabled: Platform does not fall back to an older - /// one. + /// and purpose, from a proved `identities.contractKeys` read, as the + /// contract's `CurrentKeyRule` keeps it. Under `latest` it is the key + /// registered last, which need not have the highest id. Under either + /// rule it stays named after it is disabled: Platform does not fall back + /// to an older one. struct CurrentContractKey: Equatable { let keyId: UInt32 let keyType: KeyType? @@ -406,22 +432,14 @@ extension AppConnect { throw SDKError.serializationError("The contract keys response leaves out the identity's \(name) key") } if entry is NSNull { return nil } - // JSON numbers are read only when they are exact, so a value out - // of range is unreadable rather than wrapped. - func exact(_ value: Any?) -> Value? { - guard let number = value as? NSNumber, CFGetTypeID(number) != CFBooleanGetTypeID() else { return nil } - let whole = number.int64Value - guard Double(whole) == number.doubleValue else { return nil } - return Value(exactly: whole) - } guard let key = entry as? [String: Any], - let keyId: UInt32 = exact(key["id"]), - let type: UInt8 = exact(key["type"]), + let keyId: UInt32 = exactInteger(key["id"]), + let type: UInt8 = exactInteger(key["type"]), let hex = key["data"] as? String, let bytes = AppConnect.data(fromHex: hex), !bytes.isEmpty else { throw SDKError.serializationError("The contract keys response carries an unreadable \(name) key") } let disabledAt = key["disabled_at"] - guard disabledAt == nil || disabledAt is NSNull || (exact(disabledAt) as UInt64?) != nil else { + guard disabledAt == nil || disabledAt is NSNull || (exactInteger(disabledAt) as UInt64?) != nil else { throw SDKError.serializationError("The contract keys response carries an unreadable \(name) key") } return CurrentContractKey( @@ -430,18 +448,21 @@ extension AppConnect { } /// Rotation 0 only: the key at DIP-13 `7'` for (identity, contract, - /// purpose). `currentKey` is the key Platform names as current for the - /// app's `Unique` or `MultipleReferenceToLatest` requirement; this - /// wallet's key is sent only while it is that one and live. The fetched - /// keys must show that key as Platform does, and a key bound to the app - /// that Platform does not name means Platform's read is behind. A live - /// key of the purpose whose bound the wallet's store cannot place counts - /// as the app's, so a key of unknown origin is never shadowed by a - /// second one. + /// purpose). `currentKey` is the key Platform names as current under + /// the app's `rule`; this wallet's key is sent only while it is that one + /// and live. The fetched keys must show that key as Platform does. + /// + /// Every key bound to the app becomes current when it is registered, so + /// with no current key at all a live key the store places on the app + /// means Platform's read is behind, and a live key it cannot place is + /// bound elsewhere. Behind a disabled current key, a live key the store + /// cannot place counts as the app's, so a key of unknown origin is never + /// shadowed by a second one; under `unique` nothing can be added at all. static func encryptionKeyState( derivedPublicKey: Data, purpose: KeyPurpose, contractId: Data, + rule: CurrentKeyRule, currentKey: CurrentContractKey?, currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], bindings: [KeyBinding] @@ -459,13 +480,14 @@ extension AppConnect { } return .current(keyId: currentKey.keyId) } + if rule == .unique { return .notThisWallets } } var placedOnTheApp = false let live = currentIdentityPublicKeys.filter { key in guard key.purpose == purpose, key.disabledAt == nil else { return false } let keyId = UInt32(bitPattern: key.keyId) guard let stored = bindings.first(where: { $0.keyId == keyId && $0.data == key.data }), - !stored.hasUnreadableBound else { return true } + !stored.hasUnreadableBound else { return currentKey != nil } guard stored.singleContractId == contractId else { return false } placedOnTheApp = true return true diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index bd552578c6..1d46e17cf1 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -87,6 +87,8 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case otherIdentitiesNotChecked case registrationPending case appConnectEncryptionKeyChanged + case appConnectKeysOutOfDate + case appConnectKeysUnreadable case registrationPendingOnAnotherIdentity case walletChanged case ephemeralKeyGenerationFailed @@ -164,6 +166,14 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it.", comment: "DashConnect") + case .appConnectKeysOutOfDate: + return NSLocalizedString( + "The network has not caught up with your identity's keys yet. Try again in a moment.", + comment: "DashConnect App Connect v2") + case .appConnectKeysUnreadable: + return NSLocalizedString( + "The wallet could not read your identity's encryption key for this app from the network. Try again.", + comment: "DashConnect App Connect v2") case .appConnectEncryptionKeyChanged: return NSLocalizedString( "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again.", @@ -687,6 +697,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return (.refused(refusal), nil) } plan.administeredGroupIds = ownership.administeredGroupIds + plan.currentKeyRules = ownership.currentKeyRules return (.appConnect(plan), nil) } catch let refusal as AppConnect.Refusal { return (.refused(refusal), nil) @@ -748,14 +759,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private func appConnectOwnership( _ plan: AppConnect.GrantPlan, sdk: SDK - ) async throws -> (refusal: AppConnect.Refusal?, administeredGroupIds: Set) { + ) async throws -> ( + refusal: AppConnect.Refusal?, + administeredGroupIds: Set, + currentKeyRules: [KeyPurpose: AppConnect.CurrentKeyRule] + ) { func ownerId(of contract: [String: Any]) -> Data? { (contract["ownerId"] as? String ?? contract["$ownerId"] as? String).flatMap(Self.decodeIdentifier) } let app = try await sdk.dataContractGetOffMain(id: plan.appId.toBase58String()) guard let appOwnerId = ownerId(of: app) else { return (AppConnect.Refusal(.invalid, NSLocalizedString( - "The app's contract has no readable owner.", comment: "DashConnect App Connect v2")), []) + "The app's contract has no readable owner.", comment: "DashConnect App Connect v2")), [], [:]) } var groupOwners: [Data: Data] = [:] var administeredGroupIds: Set = [] @@ -781,20 +796,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } let config = app["config"] as? [String: Any] ?? [:] - var boundedKeyPurposes: Set = [] - if AppConnect.keepsACurrentKey(config["requiresIdentityEncryptionBoundedKey"]) { - boundedKeyPurposes.insert(.encryption) - } - if AppConnect.keepsACurrentKey(config["requiresIdentityDecryptionBoundedKey"]) { - boundedKeyPurposes.insert(.decryption) - } + var currentKeyRules: [KeyPurpose: AppConnect.CurrentKeyRule] = [:] + currentKeyRules[.encryption] = AppConnect.currentKeyRule(config["requiresIdentityEncryptionBoundedKey"]) + currentKeyRules[.decryption] = AppConnect.currentKeyRule(config["requiresIdentityDecryptionBoundedKey"]) let refusal = AppConnect.ownershipRefusal( for: plan, appOwnerId: appOwnerId, groupOwners: groupOwners, contractOwners: contractOwners, - appBoundedKeyPurposes: boundedKeyPurposes) - return (refusal, administeredGroupIds) + appBoundedKeyPurposes: Set(currentKeyRules.keys)) + return (refusal, administeredGroupIds, currentKeyRules) } func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { @@ -1397,6 +1408,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } let signer = KeychainSigner(modelContainer: context.modelContainer) + // The app's current encryption keys are a second read, from Platform; + // it runs while the identity's keys are fetched. + let encryptionPurposes = Set(plan.encryption.map(\.keyPurpose)).sorted { $0.rawValue < $1.rawValue } + async let contractKeysRead: [String: Any]? = encryptionPurposes.isEmpty ? nil + : try await DashConnectPlatformQueries.identityContractKeys( + sdk: context.sdk, identityId: identityId, + contractId: plan.appId.toBase58String(), purposes: encryptionPurposes) let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) @@ -1442,23 +1460,30 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // wallet made it, register it when there is none, leave it out when // another wallet made it. Which key is current is Platform's to say: // the app's verifier checks the slot against the same proved read. - var contractKeys: [Data: [String: Any]] = [:] - for contractId in Set(plan.encryption.map(\.binding.contractId)) { - let purposes = Set(plan.encryption.filter { $0.binding.contractId == contractId }.map(\.keyPurpose)) - contractKeys[contractId] = try await DashConnectPlatformQueries.identityContractKeys( - sdk: context.sdk, - identityId: identityId, - contractId: contractId.toBase58String(), - purposes: purposes.sorted { $0.rawValue < $1.rawValue }) + // Wallet rule 3 puts every encryption key on the app's contract. + var currentKeys: [KeyPurpose: AppConnect.CurrentContractKey] = [:] + do { + if let contractKeys = try await contractKeysRead { + for purpose in encryptionPurposes { + currentKeys[purpose] = try AppConnect.currentContractKey( + from: contractKeys, identityId: identityId, purpose: purpose) + } + } + } catch { + Self.logger.error("🔗 DASHCONNECT :: the app's current encryption keys could not be read — \(error.localizedDescription, privacy: .public)") + throw DashConnectPlatformError.appConnectKeysUnreadable } var encryptionSlots: [(keyIndex: Int, keyId: UInt32?)] = [] for (index, grant) in plan.encryption.enumerated() { + guard let rule = plan.currentKeyRules[grant.keyPurpose] else { + throw DashConnectPlatformError.loginContractUnavailable + } switch AppConnect.encryptionKeyState( derivedPublicKey: encryptionKeys[index].publicKey, purpose: grant.keyPurpose, contractId: grant.binding.contractId, - currentKey: try AppConnect.currentContractKey( - from: contractKeys[grant.binding.contractId] ?? [:], identityId: identityId, purpose: grant.keyPurpose), + rule: rule, + currentKey: currentKeys[grant.keyPurpose], currentIdentityPublicKeys: currentPublicKeys, bindings: bindings ) { @@ -1470,7 +1495,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: the app's encryption key on this identity is not this wallet's; slot left out") case .outOfDate: Self.logger.error("🔗 DASHCONNECT :: the identity's keys and Platform's current encryption key disagree") - throw DashConnectPlatformError.identityKeysOutOfDate + throw DashConnectPlatformError.appConnectKeysOutOfDate } } @@ -1525,8 +1550,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signingKeys.append((authKeys[index].publicKeyHash160, authKeys[index].privateKey)) authKeyIds[index] = keyId } + var registeredEncryptionSlots: [Int] = [] for slot in encryptionSlots.indices where encryptionSlots[slot].keyId == nil { guard let keyId = freeKeyIds.next() else { throw DashConnectPlatformError.noFreeKeyId } + registeredEncryptionSlots.append(slot) let keyIndex = encryptionSlots[slot].keyIndex add.append(AppConnect.encryptionIdentityPubkey( plan.encryption[keyIndex], keyId: keyId, publicKey: encryptionKeys[keyIndex].publicKey)) @@ -1578,6 +1605,28 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: identity updated") } + // Two wallets of the identity that register the app's key at once + // both land, and only the one registered later is current: a key + // passed over that way is left out of the response. A read that + // still shows the key that was current before is behind, and keeps + // the slot; so does a read that fails, the keys being on the + // identity already. + if !registeredEncryptionSlots.isEmpty, + let after = try? await DashConnectPlatformQueries.identityContractKeys( + sdk: context.sdk, identityId: identityId, + contractId: plan.appId.toBase58String(), purposes: encryptionPurposes) { + let passedOver = registeredEncryptionSlots.filter { slot in + let purpose = plan.encryption[encryptionSlots[slot].keyIndex].keyPurpose + guard let current = try? AppConnect.currentContractKey( + from: after, identityId: identityId, purpose: purpose) else { return false } + return current.keyId != encryptionSlots[slot].keyId && current.keyId != currentKeys[purpose]?.keyId + } + if !passedOver.isEmpty { + Self.logger.info("🔗 DASHCONNECT :: another key became the app's current encryption key; slot left out") + encryptionSlots = encryptionSlots.enumerated().filter { !passedOver.contains($0.offset) }.map(\.element) + } + } + // Slots: the auth keys in request order, then the encryption keys // that are sent. var slots = authKeys.map(\.privateKey) + encryptionSlots.map { encryptionKeys[$0.keyIndex].privateKey } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index bf1f52eb31..8c2ef68c4a 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index eb1d1849e7..fd6c28deb3 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 8750c07515..f12b88cc8d 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index a1c1715f40..0f954d7abd 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 97cc9ebb69..29a8f2bef9 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index fe3746ac3b..ac6806db8d 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index cf06eff8ea..692cb477ac 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index f6dc7a180c..ff37fb6bc3 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6523,6 +6523,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 9406b2f5a3..96e46e40a7 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 563bffc71a..ec7324e5d5 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 8b7e53f16a..1b94e26e72 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index eed6db5143..e9d25b7a3b 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index bc359124ec..4de4c3c302 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index fd398d336f..bd7b0f5f21 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index fd719081fe..8153fb5e15 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index f2853f5f6b..8997b0b81a 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index ddbf1b6abd..0c1698ded4 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 54f4636c95..93ad3287dd 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 31a949d994..1c5355ae16 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index c28255ffb3..e067e8f628 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 0ad367d06e..414065d558 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 208f952af4..4804ba43a1 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 7477d4a2c8..0a1f2d5dd2 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 5941701e3c..9dc8570111 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 136b6bccb5..f4dae20bde 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 687b710982..7f11919f5b 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 94024887d9..c0432a61e8 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 573ec437aa..e7fc167d89 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index cb433e2deb..ca305413db 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index a4327dbe7d..1464752bce 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 4cd96e32aa..df92b03c51 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 5ffdeba625..e596864b11 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index e56c3a681b..dc78eaade7 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 6f90343207..d599c42e92 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 5f58e427df..4e28fbe7de 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 463cb49c6a..2f9f3475de 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 53a4fc9e48..be38c683c1 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index f11d0d207b..3f76d4fbe2 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index b6e2f7d6c6..a560ddbd75 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 3feed2fd6a..f06384a4fa 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 0f49ff6235..43084e33ff 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6750,6 +6750,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 7cc225b44f..5222b43bfd 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 4214e78c7c..01ed141d06 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6748,6 +6748,8 @@ "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; +"The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 15f66c5f8d..cd9a7975d7 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -519,6 +519,7 @@ final class AppConnectV2LoginTests: XCTestCase { private func encryptionState( _ keys: [ManagedIdentity.IdentityPublicKeyInfo], + rule: AppConnect.CurrentKeyRule = .latest, current: AppConnect.CurrentContractKey?, bindings: [AppConnect.KeyBinding] ) -> AppConnect.EncryptionKeyState { @@ -526,6 +527,7 @@ final class AppConnectV2LoginTests: XCTestCase { derivedPublicKey: Self.derivedPoint, purpose: .encryption, contractId: Self.appId, + rule: rule, currentKey: current, currentIdentityPublicKeys: keys, bindings: bindings) @@ -560,7 +562,8 @@ final class AppConnectV2LoginTests: XCTestCase { [elsewhere], current: nil, bindings: [.init(keyId: 5, data: elsewhere.data, singleContractId: other)]), .absent) - // Nor is a disabled current key of another wallet's in the way. + // Nor is a disabled current key of another wallet's in the way, when + // the latest key registered is current. let disabledTheirs = Self.encryptionKey(9, data: Data(repeating: 0x77, count: 33), disabled: true) XCTAssertEqual( encryptionState([disabledTheirs], current: Self.current(9, data: disabledTheirs.data, disabled: true), bindings: []), @@ -576,8 +579,17 @@ final class AppConnectV2LoginTests: XCTestCase { .notThisWallets) // One the fetched keys do not show yet stops the login. XCTAssertEqual(encryptionState([], current: Self.current(5, data: theirs.data), bindings: []), .outOfDate) - // Nor one whose bound the store cannot place. - XCTAssertEqual(encryptionState([theirs], current: nil, bindings: []), .notThisWallets) + // Nor one whose bound the store cannot place, behind a disabled + // current key. + let disabledCurrent = Self.encryptionKey(9, data: Data(repeating: 0x77, count: 33), disabled: true) + XCTAssertEqual( + encryptionState( + [theirs, disabledCurrent], current: Self.current(9, data: disabledCurrent.data, disabled: true), + bindings: []), + .notThisWallets) + // With no current key at all, a key bound to the app would be it: a + // key the store cannot place is bound elsewhere. + XCTAssertEqual(encryptionState([theirs], current: nil, bindings: []), .absent) // Rotating is never part of a login: a disabled key of this wallet's // cannot be added again, and is not replaced either. let disabledMine = Self.encryptionKey(6, data: Self.derivedPoint, disabled: true) @@ -669,13 +681,33 @@ final class AppConnectV2LoginTests: XCTestCase { } func testOnlyARequirementThatKeepsACurrentKeyTakesALogin() { - XCTAssertTrue(AppConnect.keepsACurrentKey(NSNumber(value: 0)), "Unique") - XCTAssertTrue(AppConnect.keepsACurrentKey(NSNumber(value: 2)), "MultipleReferenceToLatest") - XCTAssertFalse(AppConnect.keepsACurrentKey(NSNumber(value: 1)), "Multiple") - XCTAssertFalse(AppConnect.keepsACurrentKey(NSNull())) - XCTAssertFalse(AppConnect.keepsACurrentKey(nil)) - XCTAssertFalse(AppConnect.keepsACurrentKey(NSNumber(value: true))) - XCTAssertFalse(AppConnect.keepsACurrentKey("2")) + XCTAssertEqual(AppConnect.currentKeyRule(NSNumber(value: 0)), .unique) + XCTAssertEqual(AppConnect.currentKeyRule(NSNumber(value: 2)), .latest) + XCTAssertNil(AppConnect.currentKeyRule(NSNumber(value: 1)), "Multiple") + XCTAssertNil(AppConnect.currentKeyRule(NSNull())) + XCTAssertNil(AppConnect.currentKeyRule(nil)) + XCTAssertNil(AppConnect.currentKeyRule(NSNumber(value: true))) + XCTAssertNil(AppConnect.currentKeyRule(NSNumber(value: 2.5))) + XCTAssertNil(AppConnect.currentKeyRule("2")) + } + + /// Under `Unique` the first key registered stays current for good, and + /// no second key can be added. + func testAUniqueRequirementNeverTakesASecondKey() { + let theirs = Self.encryptionKey(4, data: Data(repeating: 0x66, count: 33), disabled: true) + XCTAssertEqual( + encryptionState([theirs], rule: .unique, current: Self.current(4, data: theirs.data, disabled: true), bindings: []), + .notThisWallets) + let disabledMine = Self.encryptionKey(4, data: Self.derivedPoint, disabled: true) + XCTAssertEqual( + encryptionState( + [disabledMine], rule: .unique, current: Self.current(4, data: Self.derivedPoint, disabled: true), bindings: []), + .notThisWallets) + let mine = Self.encryptionKey(4, data: Self.derivedPoint) + XCTAssertEqual( + encryptionState([mine], rule: .unique, current: Self.current(4, data: Self.derivedPoint), bindings: []), + .current(keyId: 4)) + XCTAssertEqual(encryptionState([], rule: .unique, current: nil, bindings: []), .absent) } func testTheCurrentKeyIsReadFromTheContractKeysResponse() throws { From 1bbd2e7a01bb52d2b559896d3882644fc80b167c Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 19 Oct 2026 17:44:07 +0300 Subject: [PATCH 045/108] fix(dashconnect): wait for a second read before trusting an answer a lagging node could give Two answers about the app's encryption key look the same whether Platform's read is behind or not: no current key beside a live key the store cannot place, and a disabled current key beside a live key of the app's. They now hold only once a read a few seconds later names the same current keys; answers that keep changing stop the login as out of date. The same goes for a key this login registered that a read shows passed over: the slot is left out only when a second read names the same key. The first read runs in its own task, so a login that fails before it is needed does not wait for it, and an answer this build cannot read says to update the wallet instead of to try again. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 75 +++++++--- .../PlatformDashConnectDataSource.swift | 139 ++++++++++++------ DashWallet/ar.lproj/Localizable.strings | 1 + DashWallet/bg.lproj/Localizable.strings | 1 + DashWallet/ca.lproj/Localizable.strings | 1 + DashWallet/cs.lproj/Localizable.strings | 1 + DashWallet/da.lproj/Localizable.strings | 1 + DashWallet/de.lproj/Localizable.strings | 1 + DashWallet/el.lproj/Localizable.strings | 1 + DashWallet/en.lproj/Localizable.strings | 1 + DashWallet/eo.lproj/Localizable.strings | 1 + DashWallet/es.lproj/Localizable.strings | 1 + DashWallet/et.lproj/Localizable.strings | 1 + DashWallet/fa.lproj/Localizable.strings | 1 + DashWallet/fi.lproj/Localizable.strings | 1 + DashWallet/fil.lproj/Localizable.strings | 1 + DashWallet/fr.lproj/Localizable.strings | 1 + DashWallet/hr.lproj/Localizable.strings | 1 + DashWallet/hu.lproj/Localizable.strings | 1 + DashWallet/id.lproj/Localizable.strings | 1 + DashWallet/it.lproj/Localizable.strings | 1 + DashWallet/ja.lproj/Localizable.strings | 1 + DashWallet/ko.lproj/Localizable.strings | 1 + DashWallet/mk.lproj/Localizable.strings | 1 + DashWallet/ms.lproj/Localizable.strings | 1 + DashWallet/nb.lproj/Localizable.strings | 1 + DashWallet/nl.lproj/Localizable.strings | 1 + DashWallet/pl.lproj/Localizable.strings | 1 + DashWallet/pt.lproj/Localizable.strings | 1 + DashWallet/ro.lproj/Localizable.strings | 1 + DashWallet/ru.lproj/Localizable.strings | 1 + DashWallet/sk.lproj/Localizable.strings | 1 + DashWallet/sl.lproj/Localizable.strings | 1 + DashWallet/sl_SI.lproj/Localizable.strings | 1 + DashWallet/sq.lproj/Localizable.strings | 1 + DashWallet/sr.lproj/Localizable.strings | 1 + DashWallet/sv.lproj/Localizable.strings | 1 + DashWallet/th.lproj/Localizable.strings | 1 + DashWallet/tr.lproj/Localizable.strings | 1 + DashWallet/uk.lproj/Localizable.strings | 1 + DashWallet/vi.lproj/Localizable.strings | 1 + DashWallet/zh-Hans.lproj/Localizable.strings | 1 + .../zh-Hant-TW.lproj/Localizable.strings | 1 + DashWallet/zh.lproj/Localizable.strings | 1 + DashWallet/zh_TW.lproj/Localizable.strings | 1 + .../DashConnect/AppConnectV2LoginTests.swift | 38 ++++- 46 files changed, 230 insertions(+), 65 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index a9b891fd16..988c4aec23 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -367,6 +367,25 @@ extension AppConnect { /// The fetched keys and Platform's current key disagree: one of the /// two reads is behind, and nothing can be said until both agree. case outOfDate + /// `absent`, unless Platform's read is behind a key the store + /// cannot place: it holds only once a later read says the same. + case absentIfSettled + /// `notThisWallets`, unless Platform's read is behind a live key + /// bound to the app that was registered after the disabled current + /// one: it holds only once a later read says the same. + case notThisWalletsIfSettled + + /// What the state comes to once a later read of Platform's current + /// key has said the same. + var settled: EncryptionKeyState { + switch self { + case .absentIfSettled: return .absent + case .notThisWalletsIfSettled: return .notThisWallets + default: return self + } + } + + var needsSettling: Bool { settled != self } } /// How a contract keeps the current key of a purpose it requires bound @@ -455,9 +474,11 @@ extension AppConnect { /// Every key bound to the app becomes current when it is registered, so /// with no current key at all a live key the store places on the app /// means Platform's read is behind, and a live key it cannot place is - /// bound elsewhere. Behind a disabled current key, a live key the store - /// cannot place counts as the app's, so a key of unknown origin is never - /// shadowed by a second one; under `unique` nothing can be added at all. + /// bound elsewhere once a later read agrees. Behind a disabled current + /// key, a live key the app may hold was registered before it, or after + /// it with Platform's read behind; it is left alone once a later read + /// agrees, so a key of unknown origin is never shadowed by a second + /// one. Under `unique` nothing can be added at all. static func encryptionKeyState( derivedPublicKey: Data, purpose: KeyPurpose, @@ -483,24 +504,42 @@ extension AppConnect { if rule == .unique { return .notThisWallets } } var placedOnTheApp = false - let live = currentIdentityPublicKeys.filter { key in - guard key.purpose == purpose, key.disabledAt == nil else { return false } + var unplaced = false + for key in currentIdentityPublicKeys where key.purpose == purpose && key.disabledAt == nil { let keyId = UInt32(bitPattern: key.keyId) - guard let stored = bindings.first(where: { $0.keyId == keyId && $0.data == key.data }), - !stored.hasUnreadableBound else { return currentKey != nil } - guard stored.singleContractId == contractId else { return false } - placedOnTheApp = true - return true - } - // Registering a key bound to the app makes it current, so a live one - // with no current key at all is a read from before it landed. - if currentKey == nil && placedOnTheApp { - return .outOfDate + if let stored = bindings.first(where: { $0.keyId == keyId && $0.data == key.data }), + !stored.hasUnreadableBound { + if stored.singleContractId == contractId { placedOnTheApp = true } + } else { + unplaced = true + } } - if !live.isEmpty || currentIdentityPublicKeys.contains(where: { $0.data == derivedPublicKey }) { - return .notThisWallets + let holdsTheDerivedKey = currentIdentityPublicKeys.contains(where: { $0.data == derivedPublicKey }) + guard currentKey != nil else { + // Registering a key bound to the app makes it current, so a live + // one with no current key at all is a read from before it landed. + if placedOnTheApp { return .outOfDate } + if holdsTheDerivedKey { return .notThisWallets } + return unplaced ? .absentIfSettled : .absent } - return .absent + // The current key is disabled. A live key of the app's beside it was + // registered before it, or after it and Platform's read is behind. + if placedOnTheApp || unplaced { return .notThisWalletsIfSettled } + return holdsTheDerivedKey ? .notThisWallets : .absent + } + + /// The encryption slots this login registered whose key another one, + /// registered later, has replaced as current: `after` names a key that + /// is neither the slot's nor the one current before the login. + static func passedOverSlots( + registered: [(slot: Int, purpose: KeyPurpose, keyId: UInt32)], + before: [KeyPurpose: CurrentContractKey], + after: [KeyPurpose: CurrentContractKey] + ) -> Set { + Set(registered.filter { entry in + guard let current = after[entry.purpose] else { return false } + return current.keyId != entry.keyId && current.keyId != before[entry.purpose]?.keyId + }.map(\.slot)) } /// Wallet rule 8: the live auth keys of this wallet's earlier grants to diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 1d46e17cf1..678aa0c208 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -89,6 +89,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case appConnectEncryptionKeyChanged case appConnectKeysOutOfDate case appConnectKeysUnreadable + case appConnectKeysUnsupported case registrationPendingOnAnotherIdentity case walletChanged case ephemeralKeyGenerationFailed @@ -174,6 +175,10 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "The wallet could not read your identity's encryption key for this app from the network. Try again.", comment: "DashConnect App Connect v2") + case .appConnectKeysUnsupported: + return NSLocalizedString( + "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet.", + comment: "DashConnect App Connect v2") case .appConnectEncryptionKeyChanged: return NSLocalizedString( "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again.", @@ -1408,13 +1413,26 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } let signer = KeychainSigner(modelContainer: context.modelContainer) - // The app's current encryption keys are a second read, from Platform; - // it runs while the identity's keys are fetched. + // The app's current encryption keys are a second read, from Platform. + // Wallet rule 3 puts every encryption key on the app's contract. The + // first read runs while the identity's keys are fetched, in a task of + // its own, so a login that fails before it is needed does not wait + // for it. let encryptionPurposes = Set(plan.encryption.map(\.keyPurpose)).sorted { $0.rawValue < $1.rawValue } - async let contractKeysRead: [String: Any]? = encryptionPurposes.isEmpty ? nil - : try await DashConnectPlatformQueries.identityContractKeys( - sdk: context.sdk, identityId: identityId, - contractId: plan.appId.toBase58String(), purposes: encryptionPurposes) + let sdk = context.sdk + func readCurrentKeys() async throws -> [KeyPurpose: AppConnect.CurrentContractKey] { + guard !encryptionPurposes.isEmpty else { return [:] } + let response = try await DashConnectPlatformQueries.identityContractKeys( + sdk: sdk, identityId: identityId, contractId: appId, purposes: encryptionPurposes) + var keys: [KeyPurpose: AppConnect.CurrentContractKey] = [:] + for purpose in encryptionPurposes { + keys[purpose] = try AppConnect.currentContractKey( + from: response, identityId: identityId, purpose: purpose) + } + return keys + } + let firstCurrentKeysRead = Task { try await readCurrentKeys() } + defer { firstCurrentKeysRead.cancel() } let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) @@ -1460,40 +1478,67 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // wallet made it, register it when there is none, leave it out when // another wallet made it. Which key is current is Platform's to say: // the app's verifier checks the slot against the same proved read. - // Wallet rule 3 puts every encryption key on the app's contract. - var currentKeys: [KeyPurpose: AppConnect.CurrentContractKey] = [:] + func failedRead(_ error: Error) -> DashConnectPlatformError { + Self.logger.error("🔗 DASHCONNECT :: the app's current encryption keys could not be read — \(error.localizedDescription, privacy: .public)") + if let sdkError = error as? SDKError, case .serializationError = sdkError { return .appConnectKeysUnsupported } + return .appConnectKeysUnreadable + } + var currentKeys: [KeyPurpose: AppConnect.CurrentContractKey] do { - if let contractKeys = try await contractKeysRead { - for purpose in encryptionPurposes { - currentKeys[purpose] = try AppConnect.currentContractKey( - from: contractKeys, identityId: identityId, purpose: purpose) + currentKeys = try await firstCurrentKeysRead.value + } catch { + throw failedRead(error) + } + func states() throws -> [AppConnect.EncryptionKeyState] { + try plan.encryption.enumerated().map { index, grant in + guard let rule = plan.currentKeyRules[grant.keyPurpose] else { + throw DashConnectPlatformError.approvalOutOfDate } + return AppConnect.encryptionKeyState( + derivedPublicKey: encryptionKeys[index].publicKey, + purpose: grant.keyPurpose, + contractId: grant.binding.contractId, + rule: rule, + currentKey: currentKeys[grant.keyPurpose], + currentIdentityPublicKeys: currentPublicKeys, + bindings: bindings) + } + } + // A state that holds only if Platform's read is not behind holds + // once a read a few seconds later says the same; one that keeps + // changing is out of date. + var keyStates = try states() + var rereads = 0 + while keyStates.contains(where: \.needsSettling) && !keyStates.contains(.outOfDate) { + guard rereads < 3 else { + keyStates = keyStates.map { $0.needsSettling ? .outOfDate : $0 } + break + } + rereads += 1 + try? await Task.sleep(nanoseconds: 3_000_000_000) + let reread: [KeyPurpose: AppConnect.CurrentContractKey] + do { + reread = try await readCurrentKeys() + } catch { + throw failedRead(error) + } + if reread == currentKeys { + keyStates = keyStates.map(\.settled) + } else { + currentKeys = reread + keyStates = try states() } - } catch { - Self.logger.error("🔗 DASHCONNECT :: the app's current encryption keys could not be read — \(error.localizedDescription, privacy: .public)") - throw DashConnectPlatformError.appConnectKeysUnreadable } var encryptionSlots: [(keyIndex: Int, keyId: UInt32?)] = [] - for (index, grant) in plan.encryption.enumerated() { - guard let rule = plan.currentKeyRules[grant.keyPurpose] else { - throw DashConnectPlatformError.loginContractUnavailable - } - switch AppConnect.encryptionKeyState( - derivedPublicKey: encryptionKeys[index].publicKey, - purpose: grant.keyPurpose, - contractId: grant.binding.contractId, - rule: rule, - currentKey: currentKeys[grant.keyPurpose], - currentIdentityPublicKeys: currentPublicKeys, - bindings: bindings - ) { + for (index, state) in keyStates.enumerated() { + switch state { case .current(let keyId): encryptionSlots.append((index, keyId)) case .absent: encryptionSlots.append((index, nil)) case .notThisWallets: Self.logger.info("🔗 DASHCONNECT :: the app's encryption key on this identity is not this wallet's; slot left out") - case .outOfDate: + case .outOfDate, .absentIfSettled, .notThisWalletsIfSettled: Self.logger.error("🔗 DASHCONNECT :: the identity's keys and Platform's current encryption key disagree") throw DashConnectPlatformError.appConnectKeysOutOfDate } @@ -1610,20 +1655,28 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // passed over that way is left out of the response. A read that // still shows the key that was current before is behind, and keeps // the slot; so does a read that fails, the keys being on the - // identity already. - if !registeredEncryptionSlots.isEmpty, - let after = try? await DashConnectPlatformQueries.identityContractKeys( - sdk: context.sdk, identityId: identityId, - contractId: plan.appId.toBase58String(), purposes: encryptionPurposes) { - let passedOver = registeredEncryptionSlots.filter { slot in - let purpose = plan.encryption[encryptionSlots[slot].keyIndex].keyPurpose - guard let current = try? AppConnect.currentContractKey( - from: after, identityId: identityId, purpose: purpose) else { return false } - return current.keyId != encryptionSlots[slot].keyId && current.keyId != currentKeys[purpose]?.keyId - } - if !passedOver.isEmpty { - Self.logger.info("🔗 DASHCONNECT :: another key became the app's current encryption key; slot left out") - encryptionSlots = encryptionSlots.enumerated().filter { !passedOver.contains($0.offset) }.map(\.element) + // identity already. A node may also be behind this login's key but + // not the other one, so the slot goes only when a read a few seconds + // later names the same key. + let registered = registeredEncryptionSlots.compactMap { slot in + encryptionSlots[slot].keyId.map { + (slot: slot, purpose: plan.encryption[encryptionSlots[slot].keyIndex].keyPurpose, keyId: $0) + } + } + if !registered.isEmpty, let after = try? await readCurrentKeys(), + !AppConnect.passedOverSlots(registered: registered, before: currentKeys, after: after).isEmpty { + try? await Task.sleep(nanoseconds: 3_000_000_000) + if let confirming = try? await readCurrentKeys() { + let passedOver = AppConnect.passedOverSlots(registered: registered, before: currentKeys, after: after) + .intersection(AppConnect.passedOverSlots(registered: registered, before: currentKeys, after: confirming)) + .filter { slot in + let purpose = plan.encryption[encryptionSlots[slot].keyIndex].keyPurpose + return after[purpose] == confirming[purpose] + } + if !passedOver.isEmpty { + Self.logger.info("🔗 DASHCONNECT :: another key became the app's current encryption key; slot left out") + encryptionSlots = encryptionSlots.enumerated().filter { !passedOver.contains($0.offset) }.map(\.element) + } } } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 8c2ef68c4a..4a61687b3b 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index fd6c28deb3..a4997a1e24 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index f12b88cc8d..0217576649 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 0f954d7abd..7db7f5e3a1 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 29a8f2bef9..37045ae8c4 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index ac6806db8d..d2048e1b2f 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 692cb477ac..cfb5e41a6f 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index ff37fb6bc3..c78c11887d 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6525,6 +6525,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 96e46e40a7..aa344233cf 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index ec7324e5d5..69f9cb46f7 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 1b94e26e72..b71e8c5da0 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index e9d25b7a3b..37e0195821 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 4de4c3c302..ec001b1db0 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index bd7b0f5f21..33a57eecb0 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 8153fb5e15..b7b9e372af 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 8997b0b81a..8d07653e35 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 0c1698ded4..15d3c2c937 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 93ad3287dd..9e966449c9 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 1c5355ae16..e1c0d6c4e6 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index e067e8f628..60e3b3a524 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 414065d558..27db96e344 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 4804ba43a1..1d4e014db3 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 0a1f2d5dd2..069c99e354 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 9dc8570111..ba2e3e8413 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index f4dae20bde..f5462b9bf4 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 7f11919f5b..84feb30e77 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index c0432a61e8..b3d961ea62 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index e7fc167d89..918efa3a26 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index ca305413db..e7f692d0cc 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 1464752bce..3fa2a31e52 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index df92b03c51..230e78d47b 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index e596864b11..f0a40449fe 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index dc78eaade7..aac8efc60a 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index d599c42e92..bc5e464796 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 4e28fbe7de..0b2b253cbc 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 2f9f3475de..7eaec26dd3 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index be38c683c1..07952f0bf9 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 3f76d4fbe2..9730921f3a 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index a560ddbd75..9b0052ab0c 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index f06384a4fa..d33ae578dd 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 43084e33ff..dca393b147 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6752,6 +6752,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 5222b43bfd..4d51f70436 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 01ed141d06..ec6af57b96 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6750,6 +6750,7 @@ "The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; +"This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; "The app's contract has no readable owner." = "The app's contract has no readable owner."; "The sign-in request is dated in the future. Check this device's clock." = "The sign-in request is dated in the future. Check this device's clock."; "The sign-in request is more than 10 minutes old." = "The sign-in request is more than 10 minutes old."; diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index cd9a7975d7..fd5f839588 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -586,10 +586,11 @@ final class AppConnectV2LoginTests: XCTestCase { encryptionState( [theirs, disabledCurrent], current: Self.current(9, data: disabledCurrent.data, disabled: true), bindings: []), - .notThisWallets) + .notThisWalletsIfSettled) // With no current key at all, a key bound to the app would be it: a - // key the store cannot place is bound elsewhere. - XCTAssertEqual(encryptionState([theirs], current: nil, bindings: []), .absent) + // key the store cannot place is bound elsewhere, once a later read + // agrees. + XCTAssertEqual(encryptionState([theirs], current: nil, bindings: []), .absentIfSettled) // Rotating is never part of a login: a disabled key of this wallet's // cannot be added again, and is not replaced either. let disabledMine = Self.encryptionKey(6, data: Self.derivedPoint, disabled: true) @@ -623,7 +624,7 @@ final class AppConnectV2LoginTests: XCTestCase { ] XCTAssertEqual( encryptionState([mine, disabled], current: Self.current(9, data: disabled.data, disabled: true), bindings: bindings), - .notThisWallets) + .notThisWalletsIfSettled, "registered before the disabled key, or after it with Platform's read behind") } /// The current key is the one registered last, not the one with the @@ -680,6 +681,35 @@ final class AppConnectV2LoginTests: XCTestCase { .outOfDate) } + /// A state that holds only if Platform's read is not behind comes to + /// its plain form once a later read says the same. + func testAStateThatWaitsOnALaterReadSettles() { + XCTAssertEqual(AppConnect.EncryptionKeyState.absentIfSettled.settled, .absent) + XCTAssertEqual(AppConnect.EncryptionKeyState.notThisWalletsIfSettled.settled, .notThisWallets) + for state: AppConnect.EncryptionKeyState in [.current(keyId: 3), .absent, .notThisWallets, .outOfDate] { + XCTAssertEqual(state.settled, state) + XCTAssertFalse(state.needsSettling) + } + XCTAssertTrue(AppConnect.EncryptionKeyState.absentIfSettled.needsSettling) + } + + /// A key this login registered is passed over when Platform names a key + /// that is neither it nor the one current before the login. + func testARegisteredKeyIsPassedOverOnlyByAThirdKey() { + let registered: [(slot: Int, purpose: KeyPurpose, keyId: UInt32)] = [ + (slot: 0, purpose: .encryption, keyId: 12), (slot: 1, purpose: .decryption, keyId: 13), + ] + let before = [KeyPurpose.encryption: Self.current(4, data: Data(repeating: 0x44, count: 33), disabled: true)] + func passedOver(_ after: [KeyPurpose: AppConnect.CurrentContractKey]) -> Set { + AppConnect.passedOverSlots(registered: registered, before: before, after: after) + } + let other = Self.current(20, data: Data(repeating: 0x66, count: 33)) + XCTAssertEqual(passedOver([.encryption: other, .decryption: other]), [0, 1]) + XCTAssertEqual(passedOver([.encryption: Self.current(12, data: Self.derivedPoint)]), [], "this login's key") + XCTAssertEqual(passedOver([.encryption: before[.encryption]!]), [], "a read from before the login") + XCTAssertEqual(passedOver([:]), [], "no current key yet: behind") + } + func testOnlyARequirementThatKeepsACurrentKeyTakesALogin() { XCTAssertEqual(AppConnect.currentKeyRule(NSNumber(value: 0)), .unique) XCTAssertEqual(AppConnect.currentKeyRule(NSNumber(value: 2)), .latest) From f6d4446fb43803557dd4bb6b06987418fa76128a Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 19 Oct 2026 18:16:04 +0300 Subject: [PATCH 046/108] fix(dashconnect): never take a lagging read of the current keys over a newer one Platform never takes a current-key reference away and never gives a disabled key back, so a later read that lacks a key an earlier one named, or shows it live again, is behind: it is set aside instead of being taken, and cannot turn "leave the slot out" into a registration. The re-reads now also run when the first answer is out of date, and the loop is a function of its own with tests. With no current key at all, this wallet's own key on the identity means Platform's read is behind. A key sent again is checked after the update too, not only a key this login registered. A requirement value this build cannot read asks to update the wallet instead of blaming the app. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 95 ++++++++++++++++++- .../PlatformDashConnectDataSource.swift | 94 +++++++++--------- DashWallet/ar.lproj/Localizable.strings | 3 +- DashWallet/bg.lproj/Localizable.strings | 3 +- DashWallet/ca.lproj/Localizable.strings | 3 +- DashWallet/cs.lproj/Localizable.strings | 3 +- DashWallet/da.lproj/Localizable.strings | 3 +- DashWallet/de.lproj/Localizable.strings | 3 +- DashWallet/el.lproj/Localizable.strings | 3 +- DashWallet/en.lproj/Localizable.strings | 3 +- DashWallet/eo.lproj/Localizable.strings | 3 +- DashWallet/es.lproj/Localizable.strings | 3 +- DashWallet/et.lproj/Localizable.strings | 3 +- DashWallet/fa.lproj/Localizable.strings | 3 +- DashWallet/fi.lproj/Localizable.strings | 3 +- DashWallet/fil.lproj/Localizable.strings | 3 +- DashWallet/fr.lproj/Localizable.strings | 3 +- DashWallet/hr.lproj/Localizable.strings | 3 +- DashWallet/hu.lproj/Localizable.strings | 3 +- DashWallet/id.lproj/Localizable.strings | 3 +- DashWallet/it.lproj/Localizable.strings | 3 +- DashWallet/ja.lproj/Localizable.strings | 3 +- DashWallet/ko.lproj/Localizable.strings | 3 +- DashWallet/mk.lproj/Localizable.strings | 3 +- DashWallet/ms.lproj/Localizable.strings | 3 +- DashWallet/nb.lproj/Localizable.strings | 3 +- DashWallet/nl.lproj/Localizable.strings | 3 +- DashWallet/pl.lproj/Localizable.strings | 3 +- DashWallet/pt.lproj/Localizable.strings | 3 +- DashWallet/ro.lproj/Localizable.strings | 3 +- DashWallet/ru.lproj/Localizable.strings | 3 +- DashWallet/sk.lproj/Localizable.strings | 3 +- DashWallet/sl.lproj/Localizable.strings | 3 +- DashWallet/sl_SI.lproj/Localizable.strings | 3 +- DashWallet/sq.lproj/Localizable.strings | 3 +- DashWallet/sr.lproj/Localizable.strings | 3 +- DashWallet/sv.lproj/Localizable.strings | 3 +- DashWallet/th.lproj/Localizable.strings | 3 +- DashWallet/tr.lproj/Localizable.strings | 3 +- DashWallet/uk.lproj/Localizable.strings | 3 +- DashWallet/vi.lproj/Localizable.strings | 3 +- DashWallet/zh-Hans.lproj/Localizable.strings | 3 +- .../zh-Hant-TW.lproj/Localizable.strings | 3 +- DashWallet/zh.lproj/Localizable.strings | 3 +- DashWallet/zh_TW.lproj/Localizable.strings | 3 +- .../DashConnect/AppConnectV2LoginTests.swift | 60 ++++++++++++ 46 files changed, 280 insertions(+), 98 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 988c4aec23..1de1f5dc79 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -261,7 +261,8 @@ extension AppConnect { appOwnerId: Data, groupOwners: [Data: Data], contractOwners: [Data: Data], - appBoundedKeyPurposes: Set + appBoundedKeyPurposes: Set, + appUnreadableKeyPurposes: Set = [] ) -> Refusal? { if systemContractIds.contains(plan.appId.toBase58String()) { return Refusal(.invalid, NSLocalizedString( @@ -290,9 +291,14 @@ extension AppConnect { } } } + for grant in plan.encryption where appUnreadableKeyPurposes.contains(grant.keyPurpose) { + return Refusal(.unsupported, NSLocalizedString( + "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet.", + comment: "DashConnect App Connect v2")) + } for grant in plan.encryption where !appBoundedKeyPurposes.contains(grant.keyPurpose) { return Refusal(.invalid, NSLocalizedString( - "The app's contract keeps no current encryption key bound to it.", + "The app's contract keeps no current key bound to it for the encryption it asks for.", comment: "DashConnect App Connect v2")) } return nil @@ -410,6 +416,84 @@ extension AppConnect { } } + /// Whether a `requiresIdentity…BoundedKey` value is one this build + /// cannot read, rather than none or one it knows. + static func isUnreadableRequirement(_ requirement: Any?) -> Bool { + guard let requirement, !(requirement is NSNull) else { return false } + guard let value = exactInteger(requirement) as UInt8? else { return true } + return value > 2 + } + + /// How a later read of the current keys compares with an earlier one. + /// Platform never takes a current-key reference away and never gives a + /// disabled key back, so a read that lacks a key an earlier one named, + /// or shows it live again, comes from a node that is behind. + enum CurrentKeysRead: Equatable { + /// It names the same keys. + case same + /// It is behind the earlier read for some purpose, and newer for + /// none. + case behind + /// It is newer for some purpose: these are the keys to go on with, + /// the earlier read's kept wherever the later one is behind. + case newer([KeyPurpose: CurrentContractKey]) + } + + static func compare( + earlier: [KeyPurpose: CurrentContractKey], + later: [KeyPurpose: CurrentContractKey] + ) -> CurrentKeysRead { + guard earlier != later else { return .same } + var merged = earlier + var isNewer = false + for purpose in Set(earlier.keys).union(later.keys) { + let before = earlier[purpose] + let after = later[purpose] + guard before != after else { continue } + if let before { + guard let after else { continue } + if after.keyId == before.keyId && after.data == before.data && before.isDisabled && !after.isDisabled { + continue + } + } + merged[purpose] = after + isNewer = true + } + return isNewer ? .newer(merged) : .behind + } + + /// Reads Platform's current keys again while `states` holds a state that + /// waits on a later read, or one that is out of date, at most + /// `maxRereads` times with `pause` before each. A state that waits + /// settles once a read names the same keys; a read that is behind is + /// set aside; a newer one is taken and the states are worked out again. + /// What still waits at the end is out of date. + static func settle( + currentKeys: [KeyPurpose: CurrentContractKey], + maxRereads: Int = 3, + states: ([KeyPurpose: CurrentContractKey]) throws -> [EncryptionKeyState], + reread: () async throws -> [KeyPurpose: CurrentContractKey], + pause: () async -> Void + ) async throws -> (states: [EncryptionKeyState], currentKeys: [KeyPurpose: CurrentContractKey]) { + var keys = currentKeys + var result = try states(keys) + var rereads = 0 + while rereads < maxRereads, result.contains(where: { $0.needsSettling || $0 == .outOfDate }) { + rereads += 1 + await pause() + switch compare(earlier: keys, later: try await reread()) { + case .same: + result = result.map(\.settled) + case .behind: + continue + case .newer(let merged): + keys = merged + result = try states(keys) + } + } + return (result.map { $0.needsSettling ? .outOfDate : $0 }, keys) + } + /// A JSON number read only when it is an exact integer that fits, so a /// value out of range is unreadable rather than wrapped. static func exactInteger(_ value: Any?) -> Value? { @@ -517,9 +601,10 @@ extension AppConnect { let holdsTheDerivedKey = currentIdentityPublicKeys.contains(where: { $0.data == derivedPublicKey }) guard currentKey != nil else { // Registering a key bound to the app makes it current, so a live - // one with no current key at all is a read from before it landed. - if placedOnTheApp { return .outOfDate } - if holdsTheDerivedKey { return .notThisWallets } + // one with no current key at all, or this wallet's key in any + // state (it is derived for the app's contract), is a read from + // before it landed. + if placedOnTheApp || holdsTheDerivedKey { return .outOfDate } return unplaced ? .absentIfSettled : .absent } // The current key is disabled. A live key of the app's beside it was diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 678aa0c208..faa9c62091 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -804,12 +804,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { var currentKeyRules: [KeyPurpose: AppConnect.CurrentKeyRule] = [:] currentKeyRules[.encryption] = AppConnect.currentKeyRule(config["requiresIdentityEncryptionBoundedKey"]) currentKeyRules[.decryption] = AppConnect.currentKeyRule(config["requiresIdentityDecryptionBoundedKey"]) + var unreadableKeyPurposes: Set = [] + if AppConnect.isUnreadableRequirement(config["requiresIdentityEncryptionBoundedKey"]) { + unreadableKeyPurposes.insert(.encryption) + } + if AppConnect.isUnreadableRequirement(config["requiresIdentityDecryptionBoundedKey"]) { + unreadableKeyPurposes.insert(.decryption) + } let refusal = AppConnect.ownershipRefusal( for: plan, appOwnerId: appOwnerId, groupOwners: groupOwners, contractOwners: contractOwners, - appBoundedKeyPurposes: Set(currentKeyRules.keys)) + appBoundedKeyPurposes: Set(currentKeyRules.keys), + appUnreadableKeyPurposes: unreadableKeyPurposes) return (refusal, administeredGroupIds, currentKeyRules) } @@ -1489,7 +1497,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } catch { throw failedRead(error) } - func states() throws -> [AppConnect.EncryptionKeyState] { + func states(_ currentKeys: [KeyPurpose: AppConnect.CurrentContractKey]) throws -> [AppConnect.EncryptionKeyState] { try plan.encryption.enumerated().map { index, grant in guard let rule = plan.currentKeyRules[grant.keyPurpose] else { throw DashConnectPlatformError.approvalOutOfDate @@ -1505,29 +1513,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } // A state that holds only if Platform's read is not behind holds - // once a read a few seconds later says the same; one that keeps - // changing is out of date. - var keyStates = try states() - var rereads = 0 - while keyStates.contains(where: \.needsSettling) && !keyStates.contains(.outOfDate) { - guard rereads < 3 else { - keyStates = keyStates.map { $0.needsSettling ? .outOfDate : $0 } - break - } - rereads += 1 - try? await Task.sleep(nanoseconds: 3_000_000_000) - let reread: [KeyPurpose: AppConnect.CurrentContractKey] - do { - reread = try await readCurrentKeys() - } catch { - throw failedRead(error) - } - if reread == currentKeys { - keyStates = keyStates.map(\.settled) - } else { - currentKeys = reread - keyStates = try states() - } + // once a read a few seconds later says the same, and one that is out + // of date may be Platform's read catching up. + let keyStates: [AppConnect.EncryptionKeyState] + do { + (keyStates, currentKeys) = try await AppConnect.settle( + currentKeys: currentKeys, + states: states, + reread: readCurrentKeys, + pause: { try? await Task.sleep(nanoseconds: 3_000_000_000) }) + } catch let error as DashConnectPlatformError { + throw error + } catch { + throw failedRead(error) } var encryptionSlots: [(keyIndex: Int, keyId: UInt32?)] = [] for (index, state) in keyStates.enumerated() { @@ -1595,10 +1593,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signingKeys.append((authKeys[index].publicKeyHash160, authKeys[index].privateKey)) authKeyIds[index] = keyId } - var registeredEncryptionSlots: [Int] = [] for slot in encryptionSlots.indices where encryptionSlots[slot].keyId == nil { guard let keyId = freeKeyIds.next() else { throw DashConnectPlatformError.noFreeKeyId } - registeredEncryptionSlots.append(slot) let keyIndex = encryptionSlots[slot].keyIndex add.append(AppConnect.encryptionIdentityPubkey( plan.encryption[keyIndex], keyId: keyId, publicKey: encryptionKeys[keyIndex].publicKey)) @@ -1650,32 +1646,30 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: identity updated") } - // Two wallets of the identity that register the app's key at once - // both land, and only the one registered later is current: a key - // passed over that way is left out of the response. A read that - // still shows the key that was current before is behind, and keeps - // the slot; so does a read that fails, the keys being on the - // identity already. A node may also be behind this login's key but - // not the other one, so the slot goes only when a read a few seconds - // later names the same key. - let registered = registeredEncryptionSlots.compactMap { slot in - encryptionSlots[slot].keyId.map { - (slot: slot, purpose: plan.encryption[encryptionSlots[slot].keyIndex].keyPurpose, keyId: $0) - } - } - if !registered.isEmpty, let after = try? await readCurrentKeys(), - !AppConnect.passedOverSlots(registered: registered, before: currentKeys, after: after).isEmpty { - try? await Task.sleep(nanoseconds: 3_000_000_000) - if let confirming = try? await readCurrentKeys() { - let passedOver = AppConnect.passedOverSlots(registered: registered, before: currentKeys, after: after) - .intersection(AppConnect.passedOverSlots(registered: registered, before: currentKeys, after: confirming)) - .filter { slot in + // Another wallet of the identity can register the app's key while + // this login runs, and the key registered later is current: a slot + // whose key has been passed over that way is left out of the + // response, whether this login registered it or sends it again. A + // read that still names the key that was current before is behind, + // and keeps the slot; so does a read that fails. A node may also be + // behind this login's key but not the other one, so the slot goes + // only when a read a few seconds later names the same key. + let sent = encryptionSlots.enumerated().compactMap { slot, entry in + entry.keyId.map { (slot: slot, purpose: plan.encryption[entry.keyIndex].keyPurpose, keyId: $0) } + } + if !sent.isEmpty, let after = try? await readCurrentKeys() { + let candidates = AppConnect.passedOverSlots(registered: sent, before: currentKeys, after: after) + if !candidates.isEmpty { + try? await Task.sleep(nanoseconds: 3_000_000_000) + if let confirming = try? await readCurrentKeys() { + let passedOver = candidates.filter { slot in let purpose = plan.encryption[encryptionSlots[slot].keyIndex].keyPurpose return after[purpose] == confirming[purpose] } - if !passedOver.isEmpty { - Self.logger.info("🔗 DASHCONNECT :: another key became the app's current encryption key; slot left out") - encryptionSlots = encryptionSlots.enumerated().filter { !passedOver.contains($0.offset) }.map(\.element) + if !passedOver.isEmpty { + Self.logger.info("🔗 DASHCONNECT :: another key became the app's current encryption key; slot left out") + encryptionSlots = encryptionSlots.enumerated().filter { !passedOver.contains($0.offset) }.map(\.element) + } } } } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 4a61687b3b..19bc51a6c4 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index a4997a1e24..a5823343f2 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 0217576649..5ae0fa41bb 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 7db7f5e3a1..510ce8f44a 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 37045ae8c4..2a55b0175d 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index d2048e1b2f..dc4b03379f 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index cfb5e41a6f..8862e2bd4e 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index c78c11887d..81fb0f09ef 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6522,7 +6522,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index aa344233cf..dc1028e20b 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 69f9cb46f7..a6b9ab4488 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index b71e8c5da0..82f7f2d703 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 37e0195821..4cce5385cb 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index ec001b1db0..bde8da7870 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 33a57eecb0..bd74ff8542 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index b7b9e372af..c538ca51bd 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 8d07653e35..949c2fbd9d 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 15d3c2c937..7374a0a178 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 9e966449c9..f49c6820ca 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index e1c0d6c4e6..ef5fe1d503 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 60e3b3a524..43bcf950e3 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 27db96e344..4a616ebeee 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 1d4e014db3..56a5bf2c1d 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 069c99e354..688408a78a 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index ba2e3e8413..a3cebe7107 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index f5462b9bf4..4fd1983762 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 84feb30e77..57b0d3199f 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index b3d961ea62..8d5717537a 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 918efa3a26..69f08b0e68 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index e7f692d0cc..6a3b969e84 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 3fa2a31e52..e9358ef6c6 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 230e78d47b..e6918973dd 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index f0a40449fe..671dba4d63 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index aac8efc60a..3dcc98c339 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index bc5e464796..1201ce8c55 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 0b2b253cbc..93d5e0e2ac 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 7eaec26dd3..ca7247528d 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 07952f0bf9..78040f22da 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 9730921f3a..be7ae4832b 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 9b0052ab0c..553bbd0eb4 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index d33ae578dd..14fe8488d7 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index dca393b147..833bb6256a 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6749,7 +6749,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 4d51f70436..6443fc9697 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index ec6af57b96..9daeb6fd61 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6747,7 +6747,8 @@ "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; -"The app's contract keeps no current encryption key bound to it." = "The app's contract keeps no current encryption key bound to it."; +"The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; +"This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet." = "This version of the wallet cannot read how the app's contract keeps its keys. Update the wallet."; "The network has not caught up with your identity's keys yet. Try again in a moment." = "The network has not caught up with your identity's keys yet. Try again in a moment."; "The wallet could not read your identity's encryption key for this app from the network. Try again." = "The wallet could not read your identity's encryption key for this app from the network. Try again."; "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet." = "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet."; diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index fd5f839588..9e1c29d9ac 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -674,6 +674,9 @@ final class AppConnectV2LoginTests: XCTestCase { [Self.encryptionKey(5, data: Data(repeating: 0x66, count: 33))], current: Self.current(5, data: Self.derivedPoint), bindings: []), .outOfDate) + // This wallet's key on the identity with no current key at all: it + // is derived for the app's contract, so Platform's read is behind. + XCTAssertEqual(encryptionState([mine], current: nil, bindings: []), .outOfDate) // This wallet's key, current and disabled, before the fetched keys // show it: never registered again. XCTAssertEqual( @@ -710,6 +713,63 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertEqual(passedOver([:]), [], "no current key yet: behind") } + func testARequirementThisBuildCannotReadIsToldApart() { + XCTAssertTrue(AppConnect.isUnreadableRequirement(NSNumber(value: 3))) + XCTAssertTrue(AppConnect.isUnreadableRequirement("2")) + XCTAssertTrue(AppConnect.isUnreadableRequirement(NSNumber(value: 1.5))) + for known: Any? in [nil, NSNull(), NSNumber(value: 0), NSNumber(value: 1), NSNumber(value: 2)] { + XCTAssertFalse(AppConnect.isUnreadableRequirement(known)) + } + } + + /// Platform never takes a current-key reference away and never gives a + /// disabled key back: a read that does is behind. + func testALaterReadThatLosesAKeyIsBehind() { + let live = Self.current(9, data: Self.derivedPoint) + let disabled = Self.current(9, data: Self.derivedPoint, disabled: true) + let other = Self.current(12, data: Data(repeating: 0x66, count: 33)) + XCTAssertEqual(AppConnect.compare(earlier: [.encryption: live], later: [.encryption: live]), .same) + XCTAssertEqual(AppConnect.compare(earlier: [.encryption: live], later: [:]), .behind) + XCTAssertEqual(AppConnect.compare(earlier: [.encryption: disabled], later: [.encryption: live]), .behind) + XCTAssertEqual(AppConnect.compare(earlier: [:], later: [.encryption: live]), .newer([.encryption: live])) + XCTAssertEqual(AppConnect.compare(earlier: [.encryption: live], later: [.encryption: disabled]), .newer([.encryption: disabled])) + XCTAssertEqual(AppConnect.compare(earlier: [.encryption: live], later: [.encryption: other]), .newer([.encryption: other])) + // Behind for one purpose, newer for another: the earlier key stays. + XCTAssertEqual( + AppConnect.compare(earlier: [.encryption: live], later: [.decryption: other]), + .newer([.encryption: live, .decryption: other])) + } + + func testAStateThatWaitsSettlesOnlyOnAReadThatSaysTheSame() async throws { + let theirs = Self.encryptionKey(5, data: Data(repeating: 0x66, count: 33)) + let disabledCurrent = Self.encryptionKey(9, data: Data(repeating: 0x77, count: 33), disabled: true) + let current = Self.current(9, data: disabledCurrent.data, disabled: true) + func states(_ keys: [KeyPurpose: AppConnect.CurrentContractKey]) -> [AppConnect.EncryptionKeyState] { + [encryptionState([theirs, disabledCurrent], current: keys[.encryption], bindings: [])] + } + func settle(_ reads: [[KeyPurpose: AppConnect.CurrentContractKey]]) async throws -> [AppConnect.EncryptionKeyState] { + var reads = reads + var pauses = 0 + let result = try await AppConnect.settle( + currentKeys: [.encryption: current], states: states, + reread: { reads.removeFirst() }, pause: { pauses += 1 }) + XCTAssertLessThanOrEqual(pauses, 3) + return result.states + } + let agreed = try await settle([[.encryption: current]]) + XCTAssertEqual(agreed, [.notThisWallets]) + // A lagging node that has lost the disabled key does not turn + // "leave it alone" into a registration. + let lagging = try await settle([[:], [:], [:]]) + XCTAssertEqual(lagging, [.outOfDate]) + let caughtUp = try await settle([[:], [.encryption: current]]) + XCTAssertEqual(caughtUp, [.notThisWallets]) + // Reads that never agree end out of date. + let unknown = Self.current(11, data: Data(repeating: 0x88, count: 33)) + let changing = try await settle([[.encryption: unknown], [.encryption: current], [.encryption: unknown]]) + XCTAssertEqual(changing, [.outOfDate]) + } + func testOnlyARequirementThatKeepsACurrentKeyTakesALogin() { XCTAssertEqual(AppConnect.currentKeyRule(NSNumber(value: 0)), .unique) XCTAssertEqual(AppConnect.currentKeyRule(NSNumber(value: 2)), .latest) From 09d8d6cb9cdb3251a3bab52e43b0c29c0d7514c4 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 19 Oct 2026 18:28:51 +0300 Subject: [PATCH 047/108] fix(dashconnect): confirm every answer about the app's current key on a second read Two reads that name different keys cannot be ordered, key ids saying nothing of order, so they no longer count as one being newer: the answer stays unconfirmed. An answer a newer read gives now needs a later read that agrees, like one that waits on a later read; only an answer from the first read is taken as it is. The check after the update for a key passed over by another wallet's registration is gone: telling a passed-over key from a lagging read needs the same guesswork, and a slot it gets wrong blocks every retry. A key passed over that way is refused by the app's verifier, and the next sign-in sends the key that is current then. The requirement value is read once, into one answer. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 103 +++++++++--------- .../PlatformDashConnectDataSource.swift | 48 ++------ .../DashConnect/AppConnectV2LoginTests.swift | 70 ++++++------ 3 files changed, 97 insertions(+), 124 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 1de1f5dc79..60e35dfb0a 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -406,37 +406,54 @@ extension AppConnect { case latest } - /// The rule a contract's `requiresIdentity…BoundedKey` value names, or - /// nil for `Multiple` (1), none, or a value this build cannot read. - static func currentKeyRule(_ requirement: Any?) -> CurrentKeyRule? { - switch exactInteger(requirement) as UInt8? { - case 0: return .unique - case 2: return .latest - default: return nil + /// What a contract's `requiresIdentity…BoundedKey` value says about the + /// current key a login sends. + enum KeyRequirement: Equatable { + /// It keeps one, under this rule. + case currentKey(CurrentKeyRule) + /// None, or `Multiple` (1): it keeps no current key. + case noCurrentKey + /// A value this build cannot read. + case unreadable + } + + static func keyRequirement(_ value: Any?) -> KeyRequirement { + guard let value, !(value is NSNull) else { return .noCurrentKey } + switch exactInteger(value) as UInt8? { + case 0: return .currentKey(.unique) + case 1: return .noCurrentKey + case 2: return .currentKey(.latest) + default: return .unreadable } } - /// Whether a `requiresIdentity…BoundedKey` value is one this build - /// cannot read, rather than none or one it knows. - static func isUnreadableRequirement(_ requirement: Any?) -> Bool { - guard let requirement, !(requirement is NSNull) else { return false } - guard let value = exactInteger(requirement) as UInt8? else { return true } - return value > 2 + /// A JSON number read only when it is an exact integer that fits, so a + /// value out of range is unreadable rather than wrapped. + static func exactInteger(_ value: Any?) -> Value? { + guard let number = value as? NSNumber, CFGetTypeID(number) != CFBooleanGetTypeID() else { return nil } + let whole = number.int64Value + guard Double(whole) == number.doubleValue else { return nil } + return Value(exactly: whole) } /// How a later read of the current keys compares with an earlier one. /// Platform never takes a current-key reference away and never gives a /// disabled key back, so a read that lacks a key an earlier one named, - /// or shows it live again, comes from a node that is behind. + /// or shows it live again, comes from a node that is behind. Key ids say + /// nothing of order, so two reads that name different keys cannot be + /// ordered at all. enum CurrentKeysRead: Equatable { /// It names the same keys. case same /// It is behind the earlier read for some purpose, and newer for /// none. case behind - /// It is newer for some purpose: these are the keys to go on with, - /// the earlier read's kept wherever the later one is behind. + /// It is newer for some purpose and behind or the same for the rest: + /// these are the keys to go on with, the earlier read's kept wherever + /// the later one is behind. case newer([KeyPurpose: CurrentContractKey]) + /// The two name different keys for some purpose. + case conflict } static func compare( @@ -452,9 +469,8 @@ extension AppConnect { guard before != after else { continue } if let before { guard let after else { continue } - if after.keyId == before.keyId && after.data == before.data && before.isDisabled && !after.isDisabled { - continue - } + guard after.keyId == before.keyId && after.data == before.data else { return .conflict } + if before.isDisabled { continue } } merged[purpose] = after isNewer = true @@ -462,45 +478,39 @@ extension AppConnect { return isNewer ? .newer(merged) : .behind } - /// Reads Platform's current keys again while `states` holds a state that - /// waits on a later read, or one that is out of date, at most - /// `maxRereads` times with `pause` before each. A state that waits - /// settles once a read names the same keys; a read that is behind is - /// set aside; a newer one is taken and the states are worked out again. - /// What still waits at the end is out of date. + /// Reads Platform's current keys again, at most `maxRereads` times with + /// `pause` before each, until an answer is confirmed: one from the first + /// read is taken as it is unless it waits on a later read or is out of + /// date; any other needs a later read that names the same keys. A read + /// that is behind is set aside, a newer one is taken and has to be + /// confirmed in turn, and one that conflicts leaves the answer + /// unconfirmed. An answer still unconfirmed at the end is out of date. static func settle( currentKeys: [KeyPurpose: CurrentContractKey], maxRereads: Int = 3, states: ([KeyPurpose: CurrentContractKey]) throws -> [EncryptionKeyState], reread: () async throws -> [KeyPurpose: CurrentContractKey], pause: () async -> Void - ) async throws -> (states: [EncryptionKeyState], currentKeys: [KeyPurpose: CurrentContractKey]) { + ) async throws -> [EncryptionKeyState] { var keys = currentKeys var result = try states(keys) + var confirmed = !result.contains(where: { $0.needsSettling || $0 == .outOfDate }) var rereads = 0 - while rereads < maxRereads, result.contains(where: { $0.needsSettling || $0 == .outOfDate }) { + while !confirmed && rereads < maxRereads { rereads += 1 await pause() switch compare(earlier: keys, later: try await reread()) { case .same: result = result.map(\.settled) - case .behind: + confirmed = !result.contains(.outOfDate) + case .behind, .conflict: continue case .newer(let merged): keys = merged result = try states(keys) } } - return (result.map { $0.needsSettling ? .outOfDate : $0 }, keys) - } - - /// A JSON number read only when it is an exact integer that fits, so a - /// value out of range is unreadable rather than wrapped. - static func exactInteger(_ value: Any?) -> Value? { - guard let number = value as? NSNumber, CFGetTypeID(number) != CFBooleanGetTypeID() else { return nil } - let whole = number.int64Value - guard Double(whole) == number.doubleValue else { return nil } - return Value(exactly: whole) + return confirmed ? result : result.map { _ in .outOfDate } } /// The key Platform names as the identity's current one for a contract @@ -562,7 +572,8 @@ extension AppConnect { /// key, a live key the app may hold was registered before it, or after /// it with Platform's read behind; it is left alone once a later read /// agrees, so a key of unknown origin is never shadowed by a second - /// one. Under `unique` nothing can be added at all. + /// one; under `unique`, nothing can be added behind a disabled current + /// key at all. static func encryptionKeyState( derivedPublicKey: Data, purpose: KeyPurpose, @@ -613,20 +624,6 @@ extension AppConnect { return holdsTheDerivedKey ? .notThisWallets : .absent } - /// The encryption slots this login registered whose key another one, - /// registered later, has replaced as current: `after` names a key that - /// is neither the slot's nor the one current before the login. - static func passedOverSlots( - registered: [(slot: Int, purpose: KeyPurpose, keyId: UInt32)], - before: [KeyPurpose: CurrentContractKey], - after: [KeyPurpose: CurrentContractKey] - ) -> Set { - Set(registered.filter { entry in - guard let current = after[entry.purpose] else { return false } - return current.keyId != entry.keyId && current.keyId != before[entry.purpose]?.keyId - }.map(\.slot)) - } - /// Wallet rule 8: the live auth keys of this wallet's earlier grants to /// the app on the same connection, which the new grant replaces in the /// same identity update. None without a connection id. `keeping` holds diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index faa9c62091..4cae139aa7 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -802,14 +802,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } let config = app["config"] as? [String: Any] ?? [:] var currentKeyRules: [KeyPurpose: AppConnect.CurrentKeyRule] = [:] - currentKeyRules[.encryption] = AppConnect.currentKeyRule(config["requiresIdentityEncryptionBoundedKey"]) - currentKeyRules[.decryption] = AppConnect.currentKeyRule(config["requiresIdentityDecryptionBoundedKey"]) var unreadableKeyPurposes: Set = [] - if AppConnect.isUnreadableRequirement(config["requiresIdentityEncryptionBoundedKey"]) { - unreadableKeyPurposes.insert(.encryption) - } - if AppConnect.isUnreadableRequirement(config["requiresIdentityDecryptionBoundedKey"]) { - unreadableKeyPurposes.insert(.decryption) + for (purpose, field) in [ + (KeyPurpose.encryption, "requiresIdentityEncryptionBoundedKey"), + (.decryption, "requiresIdentityDecryptionBoundedKey"), + ] { + switch AppConnect.keyRequirement(config[field]) { + case .currentKey(let rule): currentKeyRules[purpose] = rule + case .noCurrentKey: break + case .unreadable: unreadableKeyPurposes.insert(purpose) + } } let refusal = AppConnect.ownershipRefusal( for: plan, @@ -1491,7 +1493,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if let sdkError = error as? SDKError, case .serializationError = sdkError { return .appConnectKeysUnsupported } return .appConnectKeysUnreadable } - var currentKeys: [KeyPurpose: AppConnect.CurrentContractKey] + let currentKeys: [KeyPurpose: AppConnect.CurrentContractKey] do { currentKeys = try await firstCurrentKeysRead.value } catch { @@ -1517,7 +1519,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // of date may be Platform's read catching up. let keyStates: [AppConnect.EncryptionKeyState] do { - (keyStates, currentKeys) = try await AppConnect.settle( + keyStates = try await AppConnect.settle( currentKeys: currentKeys, states: states, reread: readCurrentKeys, @@ -1646,34 +1648,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: identity updated") } - // Another wallet of the identity can register the app's key while - // this login runs, and the key registered later is current: a slot - // whose key has been passed over that way is left out of the - // response, whether this login registered it or sends it again. A - // read that still names the key that was current before is behind, - // and keeps the slot; so does a read that fails. A node may also be - // behind this login's key but not the other one, so the slot goes - // only when a read a few seconds later names the same key. - let sent = encryptionSlots.enumerated().compactMap { slot, entry in - entry.keyId.map { (slot: slot, purpose: plan.encryption[entry.keyIndex].keyPurpose, keyId: $0) } - } - if !sent.isEmpty, let after = try? await readCurrentKeys() { - let candidates = AppConnect.passedOverSlots(registered: sent, before: currentKeys, after: after) - if !candidates.isEmpty { - try? await Task.sleep(nanoseconds: 3_000_000_000) - if let confirming = try? await readCurrentKeys() { - let passedOver = candidates.filter { slot in - let purpose = plan.encryption[encryptionSlots[slot].keyIndex].keyPurpose - return after[purpose] == confirming[purpose] - } - if !passedOver.isEmpty { - Self.logger.info("🔗 DASHCONNECT :: another key became the app's current encryption key; slot left out") - encryptionSlots = encryptionSlots.enumerated().filter { !passedOver.contains($0.offset) }.map(\.element) - } - } - } - } - // Slots: the auth keys in request order, then the encryption keys // that are sent. var slots = authKeys.map(\.privateKey) + encryptionSlots.map { encryptionKeys[$0.keyIndex].privateKey } diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 9e1c29d9ac..25a6213ea2 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -696,29 +696,9 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertTrue(AppConnect.EncryptionKeyState.absentIfSettled.needsSettling) } - /// A key this login registered is passed over when Platform names a key - /// that is neither it nor the one current before the login. - func testARegisteredKeyIsPassedOverOnlyByAThirdKey() { - let registered: [(slot: Int, purpose: KeyPurpose, keyId: UInt32)] = [ - (slot: 0, purpose: .encryption, keyId: 12), (slot: 1, purpose: .decryption, keyId: 13), - ] - let before = [KeyPurpose.encryption: Self.current(4, data: Data(repeating: 0x44, count: 33), disabled: true)] - func passedOver(_ after: [KeyPurpose: AppConnect.CurrentContractKey]) -> Set { - AppConnect.passedOverSlots(registered: registered, before: before, after: after) - } - let other = Self.current(20, data: Data(repeating: 0x66, count: 33)) - XCTAssertEqual(passedOver([.encryption: other, .decryption: other]), [0, 1]) - XCTAssertEqual(passedOver([.encryption: Self.current(12, data: Self.derivedPoint)]), [], "this login's key") - XCTAssertEqual(passedOver([.encryption: before[.encryption]!]), [], "a read from before the login") - XCTAssertEqual(passedOver([:]), [], "no current key yet: behind") - } - func testARequirementThisBuildCannotReadIsToldApart() { - XCTAssertTrue(AppConnect.isUnreadableRequirement(NSNumber(value: 3))) - XCTAssertTrue(AppConnect.isUnreadableRequirement("2")) - XCTAssertTrue(AppConnect.isUnreadableRequirement(NSNumber(value: 1.5))) - for known: Any? in [nil, NSNull(), NSNumber(value: 0), NSNumber(value: 1), NSNumber(value: 2)] { - XCTAssertFalse(AppConnect.isUnreadableRequirement(known)) + for unreadable: Any in [NSNumber(value: 3), "2", NSNumber(value: 1.5), NSNumber(value: true)] { + XCTAssertEqual(AppConnect.keyRequirement(unreadable), .unreadable, "\(unreadable)") } } @@ -733,7 +713,8 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertEqual(AppConnect.compare(earlier: [.encryption: disabled], later: [.encryption: live]), .behind) XCTAssertEqual(AppConnect.compare(earlier: [:], later: [.encryption: live]), .newer([.encryption: live])) XCTAssertEqual(AppConnect.compare(earlier: [.encryption: live], later: [.encryption: disabled]), .newer([.encryption: disabled])) - XCTAssertEqual(AppConnect.compare(earlier: [.encryption: live], later: [.encryption: other]), .newer([.encryption: other])) + // Key ids say nothing of order. + XCTAssertEqual(AppConnect.compare(earlier: [.encryption: live], later: [.encryption: other]), .conflict) // Behind for one purpose, newer for another: the earlier key stays. XCTAssertEqual( AppConnect.compare(earlier: [.encryption: live], later: [.decryption: other]), @@ -754,7 +735,7 @@ final class AppConnectV2LoginTests: XCTestCase { currentKeys: [.encryption: current], states: states, reread: { reads.removeFirst() }, pause: { pauses += 1 }) XCTAssertLessThanOrEqual(pauses, 3) - return result.states + return result } let agreed = try await settle([[.encryption: current]]) XCTAssertEqual(agreed, [.notThisWallets]) @@ -764,21 +745,42 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertEqual(lagging, [.outOfDate]) let caughtUp = try await settle([[:], [.encryption: current]]) XCTAssertEqual(caughtUp, [.notThisWallets]) - // Reads that never agree end out of date. + // Reads that conflict never confirm an answer. let unknown = Self.current(11, data: Data(repeating: 0x88, count: 33)) - let changing = try await settle([[.encryption: unknown], [.encryption: current], [.encryption: unknown]]) + let changing = try await settle([[.encryption: unknown], [.encryption: unknown], [.encryption: unknown]]) XCTAssertEqual(changing, [.outOfDate]) } + /// An answer a newer read gives has to be confirmed by a later one. + func testAnAnswerFromANewerReadNeedsASecondRead() async throws { + let mine = Self.encryptionKey(5, data: Self.derivedPoint) + let mineBinding = AppConnect.KeyBinding(keyId: 5, data: Self.derivedPoint, singleContractId: Self.appId) + let current = Self.current(5, data: Self.derivedPoint) + func states(_ keys: [KeyPurpose: AppConnect.CurrentContractKey]) -> [AppConnect.EncryptionKeyState] { + [encryptionState([mine], current: keys[.encryption], bindings: [mineBinding])] + } + func settle(_ reads: [[KeyPurpose: AppConnect.CurrentContractKey]]) async throws -> [AppConnect.EncryptionKeyState] { + var reads = reads + return try await AppConnect.settle( + currentKeys: [:], states: states, reread: { reads.removeFirst() }, pause: {}) + } + // The first read is behind this wallet's registration. + let confirmed = try await settle([[.encryption: current], [.encryption: current]]) + XCTAssertEqual(confirmed, [.current(keyId: 5)]) + let unconfirmed = try await settle([[.encryption: current], [:], [:]]) + XCTAssertEqual(unconfirmed, [.outOfDate]) + // An answer the first read gives is taken as it is. + let taken = try await AppConnect.settle( + currentKeys: [.encryption: current], states: states, reread: { XCTFail("no reread"); return [:] }, pause: {}) + XCTAssertEqual(taken, [.current(keyId: 5)]) + } + func testOnlyARequirementThatKeepsACurrentKeyTakesALogin() { - XCTAssertEqual(AppConnect.currentKeyRule(NSNumber(value: 0)), .unique) - XCTAssertEqual(AppConnect.currentKeyRule(NSNumber(value: 2)), .latest) - XCTAssertNil(AppConnect.currentKeyRule(NSNumber(value: 1)), "Multiple") - XCTAssertNil(AppConnect.currentKeyRule(NSNull())) - XCTAssertNil(AppConnect.currentKeyRule(nil)) - XCTAssertNil(AppConnect.currentKeyRule(NSNumber(value: true))) - XCTAssertNil(AppConnect.currentKeyRule(NSNumber(value: 2.5))) - XCTAssertNil(AppConnect.currentKeyRule("2")) + XCTAssertEqual(AppConnect.keyRequirement(NSNumber(value: 0)), .currentKey(.unique)) + XCTAssertEqual(AppConnect.keyRequirement(NSNumber(value: 2)), .currentKey(.latest)) + XCTAssertEqual(AppConnect.keyRequirement(NSNumber(value: 1)), .noCurrentKey, "Multiple") + XCTAssertEqual(AppConnect.keyRequirement(NSNull()), .noCurrentKey) + XCTAssertEqual(AppConnect.keyRequirement(nil), .noCurrentKey) } /// Under `Unique` the first key registered stays current for good, and From 6ec3819b10be21bd93166014d22b7d8a629d0fb3 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 19 Oct 2026 18:56:06 +0300 Subject: [PATCH 048/108] fix(dashconnect): wait on a second read beside any other live key of the app's Under MultipleReferenceToLatest a live current key beside another live key of the app's may come from a read taken before that key was registered, so the answer, sending this wallet's key or leaving the slot out, now waits on a later read too. A read that conflicts with an earlier one ends the login as out of date, since there is no telling which of the two is behind; a read that fails is set aside like one that is behind. The first re-read comes after a second, the later ones after three. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 66 +++++++++++-------- .../PlatformDashConnectDataSource.swift | 6 +- .../DashConnect/AppConnectV2LoginTests.swift | 57 +++++++++++++--- 3 files changed, 90 insertions(+), 39 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 60e35dfb0a..84a5179d3f 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -377,9 +377,11 @@ extension AppConnect { /// cannot place: it holds only once a later read says the same. case absentIfSettled /// `notThisWallets`, unless Platform's read is behind a live key - /// bound to the app that was registered after the disabled current - /// one: it holds only once a later read says the same. + /// bound to the app that was registered after the current one: it + /// holds only once a later read says the same. case notThisWalletsIfSettled + /// `current`, on the same terms. + case currentIfSettled(keyId: UInt32) /// What the state comes to once a later read of Platform's current /// key has said the same. @@ -387,6 +389,7 @@ extension AppConnect { switch self { case .absentIfSettled: return .absent case .notThisWalletsIfSettled: return .notThisWallets + case .currentIfSettled(let keyId): return .current(keyId: keyId) default: return self } } @@ -482,15 +485,16 @@ extension AppConnect { /// `pause` before each, until an answer is confirmed: one from the first /// read is taken as it is unless it waits on a later read or is out of /// date; any other needs a later read that names the same keys. A read - /// that is behind is set aside, a newer one is taken and has to be - /// confirmed in turn, and one that conflicts leaves the answer - /// unconfirmed. An answer still unconfirmed at the end is out of date. + /// that is behind, or fails, is set aside; a newer one is taken and has + /// to be confirmed in turn; one that conflicts makes the answer out of + /// date, there being no telling which of the two is behind. An answer + /// still unconfirmed at the end is out of date. static func settle( currentKeys: [KeyPurpose: CurrentContractKey], maxRereads: Int = 3, states: ([KeyPurpose: CurrentContractKey]) throws -> [EncryptionKeyState], reread: () async throws -> [KeyPurpose: CurrentContractKey], - pause: () async -> Void + pause: (_ attempt: Int) async -> Void ) async throws -> [EncryptionKeyState] { var keys = currentKeys var result = try states(keys) @@ -498,13 +502,17 @@ extension AppConnect { var rereads = 0 while !confirmed && rereads < maxRereads { rereads += 1 - await pause() - switch compare(earlier: keys, later: try await reread()) { + await pause(rereads) + // A read that fails says nothing, like one that is behind. + guard let later = try? await reread() else { continue } + switch compare(earlier: keys, later: later) { case .same: result = result.map(\.settled) confirmed = !result.contains(.outOfDate) - case .behind, .conflict: + case .behind: continue + case .conflict: + return result.map { _ in .outOfDate } case .newer(let merged): keys = merged result = try states(keys) @@ -583,24 +591,12 @@ extension AppConnect { currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], bindings: [KeyBinding] ) -> EncryptionKeyState { - if let currentKey { - guard let fetched = currentIdentityPublicKeys.first(where: { UInt32(bitPattern: $0.keyId) == currentKey.keyId }), - fetched.purpose == purpose, fetched.data == currentKey.data, - (fetched.disabledAt != nil) == currentKey.isDisabled else { - return .outOfDate - } - if !currentKey.isDisabled { - guard fetched.keyType == .ecdsaSecp256k1, currentKey.keyType == .ecdsaSecp256k1, - currentKey.data == derivedPublicKey else { - return .notThisWallets - } - return .current(keyId: currentKey.keyId) - } - if rule == .unique { return .notThisWallets } - } + // The live keys of the purpose besides the current one: placed on + // the app by the store, or not placed at all. var placedOnTheApp = false var unplaced = false - for key in currentIdentityPublicKeys where key.purpose == purpose && key.disabledAt == nil { + for key in currentIdentityPublicKeys where key.purpose == purpose && key.disabledAt == nil + && UInt32(bitPattern: key.keyId) != currentKey?.keyId { let keyId = UInt32(bitPattern: key.keyId) if let stored = bindings.first(where: { $0.keyId == keyId && $0.data == key.data }), !stored.hasUnreadableBound { @@ -610,7 +606,7 @@ extension AppConnect { } } let holdsTheDerivedKey = currentIdentityPublicKeys.contains(where: { $0.data == derivedPublicKey }) - guard currentKey != nil else { + guard let currentKey else { // Registering a key bound to the app makes it current, so a live // one with no current key at all, or this wallet's key in any // state (it is derived for the app's contract), is a read from @@ -618,9 +614,23 @@ extension AppConnect { if placedOnTheApp || holdsTheDerivedKey { return .outOfDate } return unplaced ? .absentIfSettled : .absent } - // The current key is disabled. A live key of the app's beside it was + guard let fetched = currentIdentityPublicKeys.first(where: { UInt32(bitPattern: $0.keyId) == currentKey.keyId }), + fetched.purpose == purpose, fetched.data == currentKey.data, + (fetched.disabledAt != nil) == currentKey.isDisabled else { + return .outOfDate + } + // Under `latest`, a live key of the app's beside the current one was // registered before it, or after it and Platform's read is behind. - if placedOnTheApp || unplaced { return .notThisWalletsIfSettled } + let mayBeBehind = rule == .latest && (placedOnTheApp || unplaced) + if !currentKey.isDisabled { + guard fetched.keyType == .ecdsaSecp256k1, currentKey.keyType == .ecdsaSecp256k1, + currentKey.data == derivedPublicKey else { + return mayBeBehind ? .notThisWalletsIfSettled : .notThisWallets + } + return mayBeBehind ? .currentIfSettled(keyId: currentKey.keyId) : .current(keyId: currentKey.keyId) + } + if rule == .unique { return .notThisWallets } + if mayBeBehind { return .notThisWalletsIfSettled } return holdsTheDerivedKey ? .notThisWallets : .absent } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 4cae139aa7..c7ad5bc015 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1523,7 +1523,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { currentKeys: currentKeys, states: states, reread: readCurrentKeys, - pause: { try? await Task.sleep(nanoseconds: 3_000_000_000) }) + // A node one block behind has usually caught up within a + // second; one that has not gets longer. + pause: { attempt in try? await Task.sleep(nanoseconds: attempt == 1 ? 1_000_000_000 : 3_000_000_000) }) } catch let error as DashConnectPlatformError { throw error } catch { @@ -1538,7 +1540,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { encryptionSlots.append((index, nil)) case .notThisWallets: Self.logger.info("🔗 DASHCONNECT :: the app's encryption key on this identity is not this wallet's; slot left out") - case .outOfDate, .absentIfSettled, .notThisWalletsIfSettled: + case .outOfDate, .absentIfSettled, .notThisWalletsIfSettled, .currentIfSettled: Self.logger.error("🔗 DASHCONNECT :: the identity's keys and Platform's current encryption key disagree") throw DashConnectPlatformError.appConnectKeysOutOfDate } diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 25a6213ea2..6a852188e6 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -252,6 +252,13 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertEqual(refusal(groupOwner: stranger)?.status, .invalid) XCTAssertEqual(refusal(groupOwner: nil)?.status, .invalid, "a group that does not exist") XCTAssertEqual(refusal(purposes: [])?.status, .invalid, "the app does not take bound encryption keys") + // A requirement this build cannot read asks for an update, whatever + // else the contract says. + let unreadable = AppConnect.ownershipRefusal( + for: plan, appOwnerId: Self.appOwner, groupOwners: [Self.groupId: Self.appOwner], + contractOwners: [Self.appId: Self.appOwner], appBoundedKeyPurposes: [], + appUnreadableKeyPurposes: [.encryption]) + XCTAssertEqual(unreadable?.status, .unsupported) } func testOnlyDashPayProfileIsAllowedOnAContractTheAppDoesNotOwn() throws { @@ -609,7 +616,7 @@ final class AppConnectV2LoginTests: XCTestCase { .init(keyId: 5, data: Self.derivedPoint, singleContractId: Self.appId), .init(keyId: 9, data: newer.data, singleContractId: Self.appId), ]), - .notThisWallets) + .notThisWalletsIfSettled, "or Platform's read is behind this wallet's key") } /// Platform keeps naming the last key registered after it is disabled. @@ -627,6 +634,27 @@ final class AppConnectV2LoginTests: XCTestCase { .notThisWalletsIfSettled, "registered before the disabled key, or after it with Platform's read behind") } + /// A live current key beside another live key of the app's may be a + /// read from before that one was registered. + func testALiveCurrentKeyBesideAnotherKeyOfTheAppsWaitsOnALaterRead() { + let mine = Self.encryptionKey(5, data: Self.derivedPoint) + let other = Self.encryptionKey(9, data: Data(repeating: 0x66, count: 33)) + let bindings: [AppConnect.KeyBinding] = [ + .init(keyId: 5, data: Self.derivedPoint, singleContractId: Self.appId), + .init(keyId: 9, data: other.data, singleContractId: Self.appId), + ] + XCTAssertEqual( + encryptionState([mine, other], current: Self.current(5, data: Self.derivedPoint), bindings: bindings), + .currentIfSettled(keyId: 5)) + XCTAssertEqual( + encryptionState([mine, other], current: Self.current(9, data: other.data), bindings: bindings), + .notThisWalletsIfSettled) + // Under `unique` there is no second key of the app's to wait on. + XCTAssertEqual( + encryptionState([mine, other], rule: .unique, current: Self.current(5, data: Self.derivedPoint), bindings: bindings), + .current(keyId: 5)) + } + /// The current key is the one registered last, not the one with the /// highest id. func testTheCurrentKeyIsTheLastRegisteredNotTheHighestId() { @@ -638,7 +666,7 @@ final class AppConnectV2LoginTests: XCTestCase { ] XCTAssertEqual( encryptionState([theirs, mineLower], current: Self.current(3, data: Self.derivedPoint), bindings: bindings), - .current(keyId: 3)) + .currentIfSettled(keyId: 3), "the higher id need not be the later key; a later read confirms") let mineHigher = Self.encryptionKey(9, data: Self.derivedPoint) let theirsLower = Self.encryptionKey(3, data: Data(repeating: 0x66, count: 33)) XCTAssertEqual( @@ -648,7 +676,7 @@ final class AppConnectV2LoginTests: XCTestCase { .init(keyId: 9, data: Self.derivedPoint, singleContractId: Self.appId), .init(keyId: 3, data: theirsLower.data, singleContractId: Self.appId), ]), - .notThisWallets) + .notThisWalletsIfSettled) } /// The fetched keys and Platform's current key are two reads, and either @@ -733,7 +761,7 @@ final class AppConnectV2LoginTests: XCTestCase { var pauses = 0 let result = try await AppConnect.settle( currentKeys: [.encryption: current], states: states, - reread: { reads.removeFirst() }, pause: { pauses += 1 }) + reread: { reads.removeFirst() }, pause: { _ in pauses += 1 }) XCTAssertLessThanOrEqual(pauses, 3) return result } @@ -745,10 +773,21 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertEqual(lagging, [.outOfDate]) let caughtUp = try await settle([[:], [.encryption: current]]) XCTAssertEqual(caughtUp, [.notThisWallets]) - // Reads that conflict never confirm an answer. + // A read that conflicts makes the answer out of date, even if a + // later one agrees with the first. let unknown = Self.current(11, data: Data(repeating: 0x88, count: 33)) - let changing = try await settle([[.encryption: unknown], [.encryption: unknown], [.encryption: unknown]]) - XCTAssertEqual(changing, [.outOfDate]) + let conflicting = try await settle([[.encryption: unknown], [.encryption: current]]) + XCTAssertEqual(conflicting, [.outOfDate]) + // A read that fails is set aside. + var reads: [[KeyPurpose: AppConnect.CurrentContractKey]?] = [nil, [.encryption: current]] + let afterAFailedRead = try await AppConnect.settle( + currentKeys: [.encryption: current], states: states, + reread: { + guard let read = reads.removeFirst() else { throw SDKError.timeout("read") } + return read + }, + pause: { _ in }) + XCTAssertEqual(afterAFailedRead, [.notThisWallets]) } /// An answer a newer read gives has to be confirmed by a later one. @@ -762,7 +801,7 @@ final class AppConnectV2LoginTests: XCTestCase { func settle(_ reads: [[KeyPurpose: AppConnect.CurrentContractKey]]) async throws -> [AppConnect.EncryptionKeyState] { var reads = reads return try await AppConnect.settle( - currentKeys: [:], states: states, reread: { reads.removeFirst() }, pause: {}) + currentKeys: [:], states: states, reread: { reads.removeFirst() }, pause: { _ in }) } // The first read is behind this wallet's registration. let confirmed = try await settle([[.encryption: current], [.encryption: current]]) @@ -771,7 +810,7 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertEqual(unconfirmed, [.outOfDate]) // An answer the first read gives is taken as it is. let taken = try await AppConnect.settle( - currentKeys: [.encryption: current], states: states, reread: { XCTFail("no reread"); return [:] }, pause: {}) + currentKeys: [.encryption: current], states: states, reread: { XCTFail("no reread"); return [:] }, pause: { _ in }) XCTAssertEqual(taken, [.current(keyId: 5)]) } From 29f08ca629f279efad1fb077f89f2eca72b1d3b1 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 19 Oct 2026 19:06:13 +0300 Subject: [PATCH 049/108] fix(dashconnect): treat a disabled key of the app's as proof of a current key With no current key reported, a disabled key the store places on the app's contract also means Platform's read is behind: the key made itself current when it was registered. Under Unique a login would otherwise add a second key that Platform refuses. A first read of the current keys that fails is tried again like a later one, and when no read answers at all the login reports that the keys could not be read rather than that the network is catching up. The reads run on a concurrent queue, so one a failed login left behind does not hold up the next. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 32 +++++++++++++++---- .../PlatformDashConnectDataSource.swift | 24 +++++++++++--- .../DashConnect/AppConnectV2LoginTests.swift | 15 +++++++++ 3 files changed, 60 insertions(+), 11 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 84a5179d3f..9eba4677fe 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -488,7 +488,8 @@ extension AppConnect { /// that is behind, or fails, is set aside; a newer one is taken and has /// to be confirmed in turn; one that conflicts makes the answer out of /// date, there being no telling which of the two is behind. An answer - /// still unconfirmed at the end is out of date. + /// still unconfirmed at the end is out of date, unless no read answered + /// at all: then the last failure is thrown. static func settle( currentKeys: [KeyPurpose: CurrentContractKey], maxRereads: Int = 3, @@ -500,11 +501,20 @@ extension AppConnect { var result = try states(keys) var confirmed = !result.contains(where: { $0.needsSettling || $0 == .outOfDate }) var rereads = 0 + var readFailure: Error? + var anyReadAnswered = false while !confirmed && rereads < maxRereads { rereads += 1 await pause(rereads) // A read that fails says nothing, like one that is behind. - guard let later = try? await reread() else { continue } + let later: [KeyPurpose: CurrentContractKey] + do { + later = try await reread() + } catch { + readFailure = error + continue + } + anyReadAnswered = true switch compare(earlier: keys, later: later) { case .same: result = result.map(\.settled) @@ -518,6 +528,8 @@ extension AppConnect { result = try states(keys) } } + // When no read answered at all, the failure is what there is to say. + if !confirmed, !anyReadAnswered, let readFailure { throw readFailure } return confirmed ? result : result.map { _ in .outOfDate } } @@ -607,11 +619,17 @@ extension AppConnect { } let holdsTheDerivedKey = currentIdentityPublicKeys.contains(where: { $0.data == derivedPublicKey }) guard let currentKey else { - // Registering a key bound to the app makes it current, so a live - // one with no current key at all, or this wallet's key in any - // state (it is derived for the app's contract), is a read from - // before it landed. - if placedOnTheApp || holdsTheDerivedKey { return .outOfDate } + // Registering a key bound to the app makes it current, so a key + // the store places on the app with no current key at all, live or + // disabled, or this wallet's key in any state (it is derived for + // the app's contract), is a read from before it landed. + let placedInAnyState = currentIdentityPublicKeys.contains { key in + key.purpose == purpose && bindings.contains { + $0.keyId == UInt32(bitPattern: key.keyId) && $0.data == key.data + && !$0.hasUnreadableBound && $0.singleContractId == contractId + } + } + if placedInAnyState || holdsTheDerivedKey { return .outOfDate } return unplaced ? .absentIfSettled : .absent } guard let fetched = currentIdentityPublicKeys.first(where: { UInt32(bitPattern: $0.keyId) == currentKey.keyId }), diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index c7ad5bc015..ad16473a1d 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1493,11 +1493,24 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if let sdkError = error as? SDKError, case .serializationError = sdkError { return .appConnectKeysUnsupported } return .appConnectKeysUnreadable } - let currentKeys: [KeyPurpose: AppConnect.CurrentContractKey] + // A first read that fails is tried again, as a later one would be. + var firstRead: [KeyPurpose: AppConnect.CurrentContractKey]? + var firstReadFailure: Error? do { - currentKeys = try await firstCurrentKeysRead.value + firstRead = try await firstCurrentKeysRead.value } catch { - throw failedRead(error) + firstReadFailure = error + } + for attempt in 1 ... 2 where firstRead == nil { + try? await Task.sleep(nanoseconds: attempt == 1 ? 1_000_000_000 : 3_000_000_000) + do { + firstRead = try await readCurrentKeys() + } catch { + firstReadFailure = error + } + } + guard let currentKeys = firstRead else { + throw failedRead(firstReadFailure ?? DashConnectPlatformError.appConnectKeysUnreadable) } func states(_ currentKeys: [KeyPurpose: AppConnect.CurrentContractKey]) throws -> [AppConnect.EncryptionKeyState] { try plan.encryption.enumerated().map { index, grant in @@ -3742,7 +3755,10 @@ enum DashConnectPlatformQueries { /// back the protocol-version read a sheet waits for. private static let epochQueue = DispatchQueue(label: "org.dashfoundation.dash.dashconnect.epoch-query") private static let documentQueue = DispatchQueue(label: "org.dashfoundation.dash.dashconnect.document-query") - private static let contractKeysQueue = DispatchQueue(label: "org.dashfoundation.dash.dashconnect.contract-keys-query") + /// Concurrent: a read a failed login no longer waits for cannot be + /// stopped, and must not hold back the next login's read. + private static let contractKeysQueue = DispatchQueue( + label: "org.dashfoundation.dash.dashconnect.contract-keys-query", attributes: .concurrent) /// The protocol version the network runs, from a proved read of the /// current epoch. It throws when that read fails: there is no fallback diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 6a852188e6..d30387d06d 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -705,6 +705,13 @@ final class AppConnectV2LoginTests: XCTestCase { // This wallet's key on the identity with no current key at all: it // is derived for the app's contract, so Platform's read is behind. XCTAssertEqual(encryptionState([mine], current: nil, bindings: []), .outOfDate) + // So is a disabled key the store places on the app. + let disabledTheirs = Self.encryptionKey(9, data: Data(repeating: 0x66, count: 33), disabled: true) + XCTAssertEqual( + encryptionState( + [disabledTheirs], rule: .unique, current: nil, + bindings: [.init(keyId: 9, data: disabledTheirs.data, singleContractId: Self.appId)]), + .outOfDate) // This wallet's key, current and disabled, before the fetched keys // show it: never registered again. XCTAssertEqual( @@ -788,6 +795,14 @@ final class AppConnectV2LoginTests: XCTestCase { }, pause: { _ in }) XCTAssertEqual(afterAFailedRead, [.notThisWallets]) + // When no read answers, the failure is thrown. + do { + _ = try await AppConnect.settle( + currentKeys: [.encryption: current], states: states, + reread: { throw SDKError.timeout("read") }, pause: { _ in }) + XCTFail("expected the read failure") + } catch SDKError.timeout { + } } /// An answer a newer read gives has to be confirmed by a later one. From b62296c219d27c9e8ccce5017733a789b118bc5a Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 19 Oct 2026 19:17:06 +0300 Subject: [PATCH 050/108] fix(dashconnect): register the app's key behind a confirmed disabled current one Once a later read confirms that a disabled key is still the app's current one, a live key registered before it is no longer current either, and this wallet's key shadows nothing: it is registered instead of the slot being left out, unless this wallet's own key is already on the identity. An answer this build cannot read ends the reads at once, a contract whose config cannot be read counts as one whose key requirements are unknown, and an approval cancelled during the reads registers nothing. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 26 +++++++++------ .../PlatformDashConnectDataSource.swift | 33 ++++++++++++++----- .../DashConnect/AppConnectV2LoginTests.swift | 28 +++++++++++----- 3 files changed, 61 insertions(+), 26 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 9eba4677fe..0f4ab6d3c3 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -489,13 +489,15 @@ extension AppConnect { /// to be confirmed in turn; one that conflicts makes the answer out of /// date, there being no telling which of the two is behind. An answer /// still unconfirmed at the end is out of date, unless no read answered - /// at all: then the last failure is thrown. + /// at all: then the last failure is thrown. A failure `isFinal` calls so + /// is thrown at once. static func settle( currentKeys: [KeyPurpose: CurrentContractKey], maxRereads: Int = 3, states: ([KeyPurpose: CurrentContractKey]) throws -> [EncryptionKeyState], reread: () async throws -> [KeyPurpose: CurrentContractKey], - pause: (_ attempt: Int) async -> Void + pause: (_ attempt: Int) async -> Void, + isFinal: (Error) -> Bool = { _ in false } ) async throws -> [EncryptionKeyState] { var keys = currentKeys var result = try states(keys) @@ -511,6 +513,7 @@ extension AppConnect { do { later = try await reread() } catch { + if isFinal(error) { throw error } readFailure = error continue } @@ -588,12 +591,12 @@ extension AppConnect { /// Every key bound to the app becomes current when it is registered, so /// with no current key at all a live key the store places on the app /// means Platform's read is behind, and a live key it cannot place is - /// bound elsewhere once a later read agrees. Behind a disabled current - /// key, a live key the app may hold was registered before it, or after - /// it with Platform's read behind; it is left alone once a later read - /// agrees, so a key of unknown origin is never shadowed by a second - /// one; under `unique`, nothing can be added behind a disabled current - /// key at all. + /// bound elsewhere once a later read agrees. Beside a current key, a + /// live key the app may hold was registered before it, or after it with + /// Platform's read behind, so the answer waits on a later read. Behind + /// a disabled current key that a later read confirms, a key registered + /// before it is no longer current, and a new one shadows nothing; under + /// `unique`, nothing can be added behind a disabled current key at all. static func encryptionKeyState( derivedPublicKey: Data, purpose: KeyPurpose, @@ -648,8 +651,11 @@ extension AppConnect { return mayBeBehind ? .currentIfSettled(keyId: currentKey.keyId) : .current(keyId: currentKey.keyId) } if rule == .unique { return .notThisWallets } - if mayBeBehind { return .notThisWalletsIfSettled } - return holdsTheDerivedKey ? .notThisWallets : .absent + // Behind a disabled current key, a key of the app's registered + // before it is no longer current either, so a new key shadows + // nothing; this wallet's own key cannot be added a second time. + if holdsTheDerivedKey { return mayBeBehind ? .notThisWalletsIfSettled : .notThisWallets } + return mayBeBehind ? .absentIfSettled : .absent } /// Wallet rule 8: the live auth keys of this wallet's earlier grants to diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index ad16473a1d..781234c209 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -800,13 +800,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { contractOwners[id] = ownerId(of: try await sdk.dataContractGetOffMain(id: id.toBase58String())) } } - let config = app["config"] as? [String: Any] ?? [:] + // A contract whose config this build cannot read says nothing of its + // key requirements, which is not the same as having none. + let config = app["config"] as? [String: Any] var currentKeyRules: [KeyPurpose: AppConnect.CurrentKeyRule] = [:] var unreadableKeyPurposes: Set = [] for (purpose, field) in [ (KeyPurpose.encryption, "requiresIdentityEncryptionBoundedKey"), (.decryption, "requiresIdentityDecryptionBoundedKey"), ] { + guard let config else { + unreadableKeyPurposes.insert(purpose) + continue + } switch AppConnect.keyRequirement(config[field]) { case .currentKey(let rule): currentKeyRules[purpose] = rule case .noCurrentKey: break @@ -1488,10 +1494,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // wallet made it, register it when there is none, leave it out when // another wallet made it. Which key is current is Platform's to say: // the app's verifier checks the slot against the same proved read. + // An answer this build cannot read reads the same on every try. + func isUnreadableAnswer(_ error: Error) -> Bool { + if let sdkError = error as? SDKError, case .serializationError = sdkError { return true } + return false + } func failedRead(_ error: Error) -> DashConnectPlatformError { Self.logger.error("🔗 DASHCONNECT :: the app's current encryption keys could not be read — \(error.localizedDescription, privacy: .public)") - if let sdkError = error as? SDKError, case .serializationError = sdkError { return .appConnectKeysUnsupported } - return .appConnectKeysUnreadable + return isUnreadableAnswer(error) ? .appConnectKeysUnsupported : .appConnectKeysUnreadable + } + // A node one block behind has usually caught up within a second; + // one that has not gets longer. + func pause(_ attempt: Int) async { + try? await Task.sleep(nanoseconds: attempt == 1 ? 1_000_000_000 : 3_000_000_000) } // A first read that fails is tried again, as a later one would be. var firstRead: [KeyPurpose: AppConnect.CurrentContractKey]? @@ -1501,8 +1516,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } catch { firstReadFailure = error } - for attempt in 1 ... 2 where firstRead == nil { - try? await Task.sleep(nanoseconds: attempt == 1 ? 1_000_000_000 : 3_000_000_000) + for attempt in 1 ... 2 where firstRead == nil && !(firstReadFailure.map(isUnreadableAnswer) ?? false) { + await pause(attempt) do { firstRead = try await readCurrentKeys() } catch { @@ -1536,9 +1551,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { currentKeys: currentKeys, states: states, reread: readCurrentKeys, - // A node one block behind has usually caught up within a - // second; one that has not gets longer. - pause: { attempt in try? await Task.sleep(nanoseconds: attempt == 1 ? 1_000_000_000 : 3_000_000_000) }) + pause: pause, + isFinal: isUnreadableAnswer) } catch let error as DashConnectPlatformError { throw error } catch { @@ -1623,6 +1637,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if !add.isEmpty || !disable.isEmpty { Self.logger.info( "🔗 DASHCONNECT :: registering \(add.count, privacy: .public) key(s), disabling \(disable.count, privacy: .public)") + // The reads above can take seconds: an approval cancelled in the + // meantime registers nothing. + try Task.checkCancellation() do { try await signer.withAdditionalSigningKeys(signingKeys) { try await context.wallet.updateIdentity( diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index d30387d06d..bc666e636b 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -586,14 +586,15 @@ final class AppConnectV2LoginTests: XCTestCase { .notThisWallets) // One the fetched keys do not show yet stops the login. XCTAssertEqual(encryptionState([], current: Self.current(5, data: theirs.data), bindings: []), .outOfDate) - // Nor one whose bound the store cannot place, behind a disabled - // current key. + // One whose bound the store cannot place, behind a disabled current + // key, is no longer current either: a new key shadows nothing, once + // a later read confirms the disabled key is current. let disabledCurrent = Self.encryptionKey(9, data: Data(repeating: 0x77, count: 33), disabled: true) XCTAssertEqual( encryptionState( [theirs, disabledCurrent], current: Self.current(9, data: disabledCurrent.data, disabled: true), bindings: []), - .notThisWalletsIfSettled) + .absentIfSettled) // With no current key at all, a key bound to the app would be it: a // key the store cannot place is bound elsewhere, once a later read // agrees. @@ -773,13 +774,13 @@ final class AppConnectV2LoginTests: XCTestCase { return result } let agreed = try await settle([[.encryption: current]]) - XCTAssertEqual(agreed, [.notThisWallets]) - // A lagging node that has lost the disabled key does not turn - // "leave it alone" into a registration. + XCTAssertEqual(agreed, [.absent]) + // A lagging node that has lost the disabled key does not settle the + // answer. let lagging = try await settle([[:], [:], [:]]) XCTAssertEqual(lagging, [.outOfDate]) let caughtUp = try await settle([[:], [.encryption: current]]) - XCTAssertEqual(caughtUp, [.notThisWallets]) + XCTAssertEqual(caughtUp, [.absent]) // A read that conflicts makes the answer out of date, even if a // later one agrees with the first. let unknown = Self.current(11, data: Data(repeating: 0x88, count: 33)) @@ -794,7 +795,7 @@ final class AppConnectV2LoginTests: XCTestCase { return read }, pause: { _ in }) - XCTAssertEqual(afterAFailedRead, [.notThisWallets]) + XCTAssertEqual(afterAFailedRead, [.absent]) // When no read answers, the failure is thrown. do { _ = try await AppConnect.settle( @@ -803,6 +804,17 @@ final class AppConnectV2LoginTests: XCTestCase { XCTFail("expected the read failure") } catch SDKError.timeout { } + // A failure called final is thrown at once. + var finalReads = 0 + do { + _ = try await AppConnect.settle( + currentKeys: [.encryption: current], states: states, + reread: { finalReads += 1; throw SDKError.serializationError("unreadable") }, pause: { _ in }, + isFinal: { _ in true }) + XCTFail("expected the final failure") + } catch SDKError.serializationError { + } + XCTAssertEqual(finalReads, 1) } /// An answer a newer read gives has to be confirmed by a later one. From 1ebc6d52a205bb8954ec0cb2bb1c6ca7bfc6d5a1 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 19 Oct 2026 19:29:59 +0300 Subject: [PATCH 051/108] fix(dashconnect): count disabled keys of the app's beside a live current key A disabled key the store places on the app may be the key registered last, so beside a live current key it makes the answer wait on a later read, as a live one does. An answer this build cannot read is now a refusal the app hears as unsupported, like a contract it cannot read, and the cancellation check before the identity update is gone: nothing cancels an approval in progress. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 25 ++++++++----------- .../PlatformDashConnectDataSource.swift | 19 +++++++------- .../DashConnect/AppConnectV2LoginTests.swift | 5 ++++ 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 0f4ab6d3c3..84485cb53e 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -606,17 +606,17 @@ extension AppConnect { currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], bindings: [KeyBinding] ) -> EncryptionKeyState { - // The live keys of the purpose besides the current one: placed on - // the app by the store, or not placed at all. - var placedOnTheApp = false + // The keys of the purpose besides the current one: placed on the app + // by the store, in any state, or live and not placed at all. + var placedInAnyState = false var unplaced = false - for key in currentIdentityPublicKeys where key.purpose == purpose && key.disabledAt == nil + for key in currentIdentityPublicKeys where key.purpose == purpose && UInt32(bitPattern: key.keyId) != currentKey?.keyId { let keyId = UInt32(bitPattern: key.keyId) if let stored = bindings.first(where: { $0.keyId == keyId && $0.data == key.data }), !stored.hasUnreadableBound { - if stored.singleContractId == contractId { placedOnTheApp = true } - } else { + if stored.singleContractId == contractId { placedInAnyState = true } + } else if key.disabledAt == nil { unplaced = true } } @@ -626,12 +626,6 @@ extension AppConnect { // the store places on the app with no current key at all, live or // disabled, or this wallet's key in any state (it is derived for // the app's contract), is a read from before it landed. - let placedInAnyState = currentIdentityPublicKeys.contains { key in - key.purpose == purpose && bindings.contains { - $0.keyId == UInt32(bitPattern: key.keyId) && $0.data == key.data - && !$0.hasUnreadableBound && $0.singleContractId == contractId - } - } if placedInAnyState || holdsTheDerivedKey { return .outOfDate } return unplaced ? .absentIfSettled : .absent } @@ -640,9 +634,10 @@ extension AppConnect { (fetched.disabledAt != nil) == currentKey.isDisabled else { return .outOfDate } - // Under `latest`, a live key of the app's beside the current one was - // registered before it, or after it and Platform's read is behind. - let mayBeBehind = rule == .latest && (placedOnTheApp || unplaced) + // Under `latest`, a key of the app's beside the current one, live or + // disabled, was registered before it, or after it and Platform's read + // is behind. + let mayBeBehind = rule == .latest && (placedInAnyState || unplaced) if !currentKey.isDisabled { guard fetched.keyType == .ecdsaSecp256k1, currentKey.keyType == .ecdsaSecp256k1, currentKey.data == derivedPublicKey else { diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 781234c209..2920b14990 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -89,7 +89,6 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case appConnectEncryptionKeyChanged case appConnectKeysOutOfDate case appConnectKeysUnreadable - case appConnectKeysUnsupported case registrationPendingOnAnotherIdentity case walletChanged case ephemeralKeyGenerationFailed @@ -175,10 +174,6 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "The wallet could not read your identity's encryption key for this app from the network. Try again.", comment: "DashConnect App Connect v2") - case .appConnectKeysUnsupported: - return NSLocalizedString( - "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet.", - comment: "DashConnect App Connect v2") case .appConnectEncryptionKeyChanged: return NSLocalizedString( "The app's encryption key on this identity changed after this sign-in was first approved. Ask the app to sign in again.", @@ -1499,9 +1494,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if let sdkError = error as? SDKError, case .serializationError = sdkError { return true } return false } - func failedRead(_ error: Error) -> DashConnectPlatformError { + // An answer this build cannot read is a refusal the app hears as + // `unsupported`, like a contract it cannot read. + func failedRead(_ error: Error) -> Error { Self.logger.error("🔗 DASHCONNECT :: the app's current encryption keys could not be read — \(error.localizedDescription, privacy: .public)") - return isUnreadableAnswer(error) ? .appConnectKeysUnsupported : .appConnectKeysUnreadable + guard isUnreadableAnswer(error) else { return DashConnectPlatformError.appConnectKeysUnreadable } + return AppConnect.Refusal(.unsupported, NSLocalizedString( + "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet.", + comment: "DashConnect App Connect v2")) } // A node one block behind has usually caught up within a second; // one that has not gets longer. @@ -1555,6 +1555,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { isFinal: isUnreadableAnswer) } catch let error as DashConnectPlatformError { throw error + } catch let refusal as AppConnect.Refusal { + throw refusal } catch { throw failedRead(error) } @@ -1637,9 +1639,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if !add.isEmpty || !disable.isEmpty { Self.logger.info( "🔗 DASHCONNECT :: registering \(add.count, privacy: .public) key(s), disabling \(disable.count, privacy: .public)") - // The reads above can take seconds: an approval cancelled in the - // meantime registers nothing. - try Task.checkCancellation() do { try await signer.withAdditionalSigningKeys(signingKeys) { try await context.wallet.updateIdentity( diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index bc666e636b..4ba5177f05 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -650,6 +650,11 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertEqual( encryptionState([mine, other], current: Self.current(9, data: other.data), bindings: bindings), .notThisWalletsIfSettled) + // So does a disabled one: it may be the key registered last. + let disabledOther = Self.encryptionKey(9, data: other.data, disabled: true) + XCTAssertEqual( + encryptionState([mine, disabledOther], current: Self.current(5, data: Self.derivedPoint), bindings: bindings), + .currentIfSettled(keyId: 5)) // Under `unique` there is no second key of the app's to wait on. XCTAssertEqual( encryptionState([mine, other], rule: .unique, current: Self.current(5, data: Self.derivedPoint), bindings: bindings), From 58ed8d749db938b03b1a92fe4e201f1492d24a56 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 19 Oct 2026 19:40:53 +0300 Subject: [PATCH 052/108] fix(dashconnect): weigh a disabled key the store cannot place, and show a refusal as the answer A key of the purpose the store cannot place now makes the answer wait on a later read in any state, not only while live. A refusal thrown by an approval turns the sheet into that refusal instead of keeping Approve on offer for a request that fails the same way every time. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectV2Login.swift | 14 +++++++------- .../UI/DashConnect/ConnectionsViewModel.swift | 8 +++++++- .../DashConnect/AppConnectV2LoginTests.swift | 3 +++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 84485cb53e..6a7186871d 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -488,9 +488,9 @@ extension AppConnect { /// that is behind, or fails, is set aside; a newer one is taken and has /// to be confirmed in turn; one that conflicts makes the answer out of /// date, there being no telling which of the two is behind. An answer - /// still unconfirmed at the end is out of date, unless no read answered - /// at all: then the last failure is thrown. A failure `isFinal` calls so - /// is thrown at once. + /// still unconfirmed at the end is out of date, unless none of the later + /// reads answered: then the last failure is thrown. A failure `isFinal` + /// calls so is thrown at once. static func settle( currentKeys: [KeyPurpose: CurrentContractKey], maxRereads: Int = 3, @@ -590,7 +590,7 @@ extension AppConnect { /// /// Every key bound to the app becomes current when it is registered, so /// with no current key at all a live key the store places on the app - /// means Platform's read is behind, and a live key it cannot place is + /// means Platform's read is behind, and a key it cannot place is /// bound elsewhere once a later read agrees. Beside a current key, a /// live key the app may hold was registered before it, or after it with /// Platform's read behind, so the answer waits on a later read. Behind @@ -606,8 +606,8 @@ extension AppConnect { currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], bindings: [KeyBinding] ) -> EncryptionKeyState { - // The keys of the purpose besides the current one: placed on the app - // by the store, in any state, or live and not placed at all. + // The keys of the purpose besides the current one, in any state: + // placed on the app by the store, or not placed at all. var placedInAnyState = false var unplaced = false for key in currentIdentityPublicKeys where key.purpose == purpose @@ -616,7 +616,7 @@ extension AppConnect { if let stored = bindings.first(where: { $0.keyId == keyId && $0.data == key.data }), !stored.hasUnreadableBound { if stored.singleContractId == contractId { placedInAnyState = true } - } else if key.disabledAt == nil { + } else { unplaced = true } } diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 47ff22ad1e..4c902b1e8f 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -256,13 +256,19 @@ final class ConnectionsViewModel: ObservableObject { self.pendingRequest = rebuilt self.approveError = rebuilt.login == .unresolved ? nil : DashConnectPlatformError.loginUnresolved.localizedDescription + } catch let refusal as AppConnect.Refusal { + // A refusal fails the same way on every try: the sheet shows + // it as the request's answer, and offers no Approve. + self.pendingFailureStatus = refusal.status + self.pendingRequest?.login = .refused(refusal) + self.approveError = nil } catch { // Keep the sheet up so the user can retry without rescanning the QR. // A cancelled PIN prompt is the user declining, not a failure, // whatever an earlier attempt ended in. self.pendingFailureStatus = error as? DashConnectPlatformError == .authorizationCancelled ? nil - : (error as? AppConnect.Refusal)?.status ?? .failed + : .failed self.approveError = String( format: NSLocalizedString("Could not complete the DashConnect request: %@", comment: "DashConnect"), error.localizedDescription diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 4ba5177f05..6e100be33d 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -599,6 +599,9 @@ final class AppConnectV2LoginTests: XCTestCase { // key the store cannot place is bound elsewhere, once a later read // agrees. XCTAssertEqual(encryptionState([theirs], current: nil, bindings: []), .absentIfSettled) + // A disabled one the store cannot place is weighed the same way. + let disabledUnplaced = Self.encryptionKey(7, data: Data(repeating: 0x99, count: 33), disabled: true) + XCTAssertEqual(encryptionState([disabledUnplaced], rule: .unique, current: nil, bindings: []), .absentIfSettled) // Rotating is never part of a login: a disabled key of this wallet's // cannot be added again, and is not replaced either. let disabledMine = Self.encryptionKey(6, data: Self.derivedPoint, disabled: true) From d2555f7ab591d34ed835fb68f781e116dc6da3b1 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sun, 25 Oct 2026 02:58:26 +0300 Subject: [PATCH 053/108] build: pin the platform SDK to v5.1-dev with platform#5491 The current-key reads resolve the encryption and decryption slots through `identityContractKeys`. At a9336f9486 the FFI ran the proved query and then returned an empty map, so every encryption-bearing v2 approval failed before the identity update. 063589bf0a returns the proved result. `startSpv` is async at that revision, so the coordinator awaits it, as develop already does. Co-Authored-By: Claude Opus 5.5 --- .platform-ref | 2 +- .../SwiftDashSDK/SwiftDashSDKSPVCoordinator.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.platform-ref b/.platform-ref index 843357bc60..8ca7cef954 100644 --- a/.platform-ref +++ b/.platform-ref @@ -1 +1 @@ -a9336f9486e5f0c79ce0940638037783b883c725 +063589bf0adbe1a8823a943cee95385b423b0e3f diff --git a/DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKSPVCoordinator.swift b/DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKSPVCoordinator.swift index 18f5049679..c2d8d79de8 100644 --- a/DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKSPVCoordinator.swift +++ b/DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKSPVCoordinator.swift @@ -658,7 +658,7 @@ public final class SwiftDashSDKSPVCoordinator: NSObject, ObservableObject { switchPreparation.consume() do { - try manager.startSpv(config: config) + try await manager.startSpv(config: config) } catch { Self.logger.error("🛰️ SPVCOORD :: startSpv failed: \(String(describing: error), privacy: .public)") return .failure(StartError.spvClient(error)) From 785160632448f04291290afbea417bfd1016cc1e Mon Sep 17 00:00:00 2001 From: pasta Date: Wed, 28 Oct 2026 17:36:00 -0500 Subject: [PATCH 054/108] feat(dashpay): accept App Connect requests on dashpay://connect DIP #181 never allows the dash-key: carrier on mainnet, and dashpay:// is the scheme invitations already use, so apps will move to dashpay://connect?v=2&n=&r=[&cb=]. The wallet sent such a link to the "Not a Dash URL" alert and the scanner did not know it. The request body is the one a dash-key: v2 URI carries and is decoded and processed identically; only the wrapper differs. - DashConnectUri.parseConnectRequest applies the DIP's URI rules: scheme and host case-insensitive, empty or "/" path, no userinfo, port or fragment, form-decoded query, a repeated v/n/r/cb is invalid, unknown parameters are ignored, v must be 2, r is required, the whole URI is at most 4,096 bytes and r at most 1,366 characters, both checked before decoding. cb keeps its rules. - DashConnectUri.base64URLDecode is a strict RFC 4648 section 5 decoder with no padding: it refuses =, +, /, other characters, a length of 1 mod 4 and non-zero trailing bits. - The dash-key: v2 parser shares its query and finishing steps with the new one; its behaviour is unchanged. - DashConnectDeepLink.uri(from:) recognises the link, which routes the OS link (DWURLParser), Home scan and the in-app scanner (parseQR) through the existing path, including the network check before any read. - An unknown dashpay:// verb such as sign says the link needs a newer version of the wallet. dashpay://invite and dashpay://user are left alone. - The Testnet configuration of the dashpay target used a separate Info.plist without the dashpay scheme; it is registered there too. The mainnet gate and the dash-key:/dash-st: carriers are unchanged. Co-Authored-By: Claude Opus 5.5 --- DashPay/dashpay-info.plist | 10 + DashWallet/AppDelegate.m | 9 +- .../DashConnect/DashConnectDataSource.swift | 3 + .../DashConnect/DashConnectDeepLink.swift | 20 +- .../PlatformDashConnectDataSource.swift | 13 +- .../DashConnect/Protocol/DashConnectUri.swift | 174 +++++++++++- DashWallet/en.lproj/Localizable.strings | 3 + .../DashConnect/DashConnectUriTests.swift | 259 ++++++++++++++++++ 8 files changed, 470 insertions(+), 21 deletions(-) diff --git a/DashPay/dashpay-info.plist b/DashPay/dashpay-info.plist index d935da3cf0..9b20f4137a 100644 --- a/DashPay/dashpay-info.plist +++ b/DashPay/dashpay-info.plist @@ -107,6 +107,16 @@ dashid + + CFBundleTypeRole + Editor + CFBundleURLName + dashpay + CFBundleURLSchemes + + dashpay + + CFBundleTypeRole Editor diff --git a/DashWallet/AppDelegate.m b/DashWallet/AppDelegate.m index 771c3da7c2..78e3c09cf3 100644 --- a/DashWallet/AppDelegate.m +++ b/DashWallet/AppDelegate.m @@ -287,9 +287,14 @@ - (void)handleOpenURL:(NSURL *)url { } if (![DWURLParser canHandleURL:url]) { + // A dashpay:// verb this version does not know (e.g. sign) is a link from + // a newer app, not a malformed one. + BOOL needsNewerWallet = [DWDashConnectDeepLink isUnsupportedDashpayVerbURL:url]; UIAlertController * alert = [UIAlertController - alertControllerWithTitle:NSLocalizedString(@"Not a Dash URL", nil) - message:url.absoluteString + alertControllerWithTitle:needsNewerWallet + ? NSLocalizedString(@"This link needs a newer version of the wallet.", nil) + : NSLocalizedString(@"Not a Dash URL", nil) + message:needsNewerWallet ? nil : url.absoluteString preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction* okAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil) diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index 06083fed35..fe502481a8 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -89,6 +89,7 @@ enum DashConnectMockError: LocalizedError, Equatable { case parseFailed case approveFailed case notDashConnectQrCode + case needsNewerWallet case unsupportedNetwork(expected: DashConnectNetwork, actual: DashConnectNetwork) case stateTransitionNotSupported @@ -100,6 +101,8 @@ enum DashConnectMockError: LocalizedError, Equatable { return "Approval failed" case .notDashConnectQrCode: return "This QR code is not a DashConnect QR code." + case .needsNewerWallet: + return "This link needs a newer version of the wallet." case let .unsupportedNetwork(expected, actual): return "This DashConnect QR is for \(Self.displayName(for: actual)), but this wallet currently supports \(Self.displayName(for: expected)) only." case .stateTransitionNotSupported: diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDeepLink.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDeepLink.swift index 6ade248014..abe4493a0a 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDeepLink.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDeepLink.swift @@ -23,7 +23,8 @@ import Foundation /// /// An app running on the same phone as the wallet cannot present a QR code for /// the wallet to scan, so it opens the identical `dash-key:` / `dash-st:` -/// payload as a link instead. Both carriers hand the same string to +/// payload as a link instead. A `dashpay://connect` link carries an App Connect +/// request the same way. Every carrier hands the same string to /// `ConnectionsViewModel`. /// /// ## What this carrier does not establish @@ -47,14 +48,16 @@ import Foundation final class DashConnectDeepLink: NSObject { /// The DashConnect URI `url` carries, or `nil` when it is not one. /// - /// The payload lives in the URI's opaque part and is Base58 followed by an - /// ASCII query, neither of which `URL` percent-encodes, so + /// The payload is Base58 in the opaque part of a `dash-key:` / `dash-st:` + /// URI, or base64url in the query of a `dashpay://connect` URI, with the + /// `cb` link already percent-encoded. `URL` does not re-encode either, so /// `absoluteString` returns what the app emitted. @objc(uriFromURL:) static func uri(from url: URL) -> String? { let candidate = url.absoluteString.trimmingCharacters(in: .whitespacesAndNewlines) - guard DashConnectUri.isKeyUri(candidate) || DashConnectUri.isStUri(candidate) else { + guard DashConnectUri.isKeyUri(candidate) || DashConnectUri.isStUri(candidate) + || DashConnectUri.isConnectUri(candidate) else { return nil } @@ -65,4 +68,13 @@ final class DashConnectDeepLink: NSObject { static func canHandle(_ url: URL) -> Bool { uri(from: url) != nil } + + /// Whether `url` is a `dashpay://` link whose verb this wallet does not + /// know, such as `sign`. The caller says the link needs a newer wallet + /// rather than that it is not a Dash URL. Invitations and `connect` are + /// not unsupported. + @objc(isUnsupportedDashpayVerbURL:) + static func isUnsupportedDashpayVerb(_ url: URL) -> Bool { + DashConnectUri.isUnsupportedDashpayVerb(url.absoluteString.trimmingCharacters(in: .whitespacesAndNewlines)) + } } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 2920b14990..0f5556278a 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -556,10 +556,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func parseQR(_ content: String) async throws -> DashConnectQr { let trimmed = content.trimmingCharacters(in: .whitespacesAndNewlines) - if DashConnectUri.isAppConnectUri(trimmed) { + // `dashpay://connect` and a `dash-key:` version 2 URI carry the same + // request body and are processed identically. + let isConnectUri = DashConnectUri.isConnectUri(trimmed) + if isConnectUri || DashConnectUri.isAppConnectUri(trimmed) { let uri: AppConnectUri do { - uri = try DashConnectUri.parseAppConnectRequest(trimmed) + uri = try isConnectUri + ? DashConnectUri.parseConnectRequest(trimmed) + : DashConnectUri.parseAppConnectRequest(trimmed) } catch let error as AppConnectRequestError { throw AppConnect.Refusal(error) } @@ -584,6 +589,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return .stateTransition(request) } + if DashConnectUri.isUnsupportedDashpayVerb(trimmed) { + throw DashConnectMockError.needsNewerWallet + } + throw DashConnectMockError.notDashConnectQrCode } diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift index 00264dc4d4..ba709cb496 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift @@ -218,21 +218,176 @@ enum DashConnectUri { } let body = String(remainder[.. = ["invite", "user"] + /// The whole URI, checked on the raw string before anything is decoded. + private static let maxConnectUriBytes = 4096 + /// 1,024 bytes of body in unpadded base64url. + private static let maxConnectBodyCharacters = 1366 + + /// The lowercased host of a `dashpay://` URI, which names its verb, or nil + /// for any other string. Scheme and host compare case-insensitively. A + /// userinfo or port is dropped here so that `dashpay://connect:80` is + /// still read as `connect` and refused by the parser, not as another + /// link. + private static func dashpayHost(of uri: String) -> String? { + let scalars = uri.unicodeScalars + let head = Array(scalars.prefix(dashpayUrlPrefix.count)) + guard head.count == dashpayUrlPrefix.count, + zip(head, dashpayUrlPrefix).allSatisfy({ asciiLowercased($0) == $1 }) else { return nil } + let authority = Array(scalars.dropFirst(dashpayUrlPrefix.count).prefix { $0 != "/" && $0 != "?" && $0 != "#" }) + let afterUserinfo = authority.split(separator: "@", omittingEmptySubsequences: false).last ?? [] + let host = afterUserinfo.prefix { $0 != ":" } + var result = String.UnicodeScalarView() + result.append(contentsOf: host.map(asciiLowercased)) + return String(result) + } + + private static func asciiLowercased(_ scalar: Unicode.Scalar) -> Unicode.Scalar { + ("A" ... "Z").contains(scalar) ? Unicode.Scalar(scalar.value + 0x20)! : scalar + } + + /// Whether `uri` is a `dashpay://connect` link. Only the verb is read; + /// `parseConnectRequest` decides whether the rest is valid. + static func isConnectUri(_ uri: String) -> Bool { + dashpayHost(of: uri) == connectHost + } + + /// Whether `uri` is a `dashpay://` link whose verb this wallet does not + /// know (the DIP's `sign`, or one a later DIP adds). The user should be + /// told the link needs a newer wallet, not that it is not a Dash link. + static func isUnsupportedDashpayVerb(_ uri: String) -> Bool { + guard let host = dashpayHost(of: uri), !host.isEmpty else { return false } + return host != connectHost && !otherKnownDashpayHosts.contains(host) + } + + /// Parses `dashpay://connect?v=2&n=&r=[&cb=]` + /// (DIP App Connect, "connect URI"). The body is the one a `dash-key:` + /// version 2 URI carries and is processed identically. + static func parseConnectRequest(_ uri: String) throws -> AppConnectUri { + // The raw string, before anything is decoded or split. + guard uri.utf8.count <= maxConnectUriBytes else { + throw AppConnectRequestError.invalid("URI is too long") + } + guard dashpayHost(of: uri) == connectHost else { + throw AppConnectRequestError.invalid("not a dashpay://connect URI") + } + let rest = uri.unicodeScalars.dropFirst(dashpayUrlPrefix.count) + guard !rest.contains("#") else { + throw AppConnectRequestError.invalid("URI has a fragment") + } + let authority = rest.prefix { !["/", "?"].contains($0) } + guard authority.count == connectHost.unicodeScalars.count else { + throw AppConnectRequestError.invalid("URI has userinfo or a port") + } + // The path is empty, or a single `/` that is ignored. + let afterAuthority = rest.dropFirst(authority.count) + let path = afterAuthority.prefix { $0 != "?" } + guard path.isEmpty || String(path) == "/" else { + throw AppConnectRequestError.invalid("URI has a path") + } + let query = afterAuthority.dropFirst(path.count) + guard query.first == "?" else { + throw AppConnectRequestError.invalid("URI has no query") + } + let parameters = try appConnectParameters(query.dropFirst(), known: ["n", "v", "r", "cb"]) + + return try finishAppConnectRequest(parameters) { + guard let encoded = parameters["r"], !encoded.isEmpty else { + throw AppConnectRequestError.invalid("request is missing") + } + // Before the decode, as everywhere. + guard encoded.utf8.count <= maxConnectBodyCharacters else { + throw AppConnectRequestError.invalid("request is too long") + } + // 1,366 characters decode to at most 1,024 bytes, the ceiling checked after. + guard let payload = base64URLDecode(encoded) else { + throw AppConnectRequestError.invalid("request is not canonical base64url") + } + return payload + } + } + + /// Canonical base64url (RFC 4648 section 5, no padding), or nil. Refused: + /// `=`, `+`, `/`, anything outside the alphabet, a length of 1 mod 4, and + /// non-zero bits in the last character, so each value has one encoding. + static func base64URLDecode(_ string: String) -> Data? { + let input = Array(string.utf8) + guard input.count % 4 != 1 else { return nil } + + var output = Data() + output.reserveCapacity(input.count * 3 / 4) + var accumulator: UInt32 = 0 + var bits = 0 + for byte in input { + let value: UInt32 + switch byte { + case UInt8(ascii: "A") ... UInt8(ascii: "Z"): value = UInt32(byte - UInt8(ascii: "A")) + case UInt8(ascii: "a") ... UInt8(ascii: "z"): value = UInt32(byte - UInt8(ascii: "a")) + 26 + case UInt8(ascii: "0") ... UInt8(ascii: "9"): value = UInt32(byte - UInt8(ascii: "0")) + 52 + case UInt8(ascii: "-"): value = 62 + case UInt8(ascii: "_"): value = 63 + default: return nil + } + accumulator = accumulator << 6 | value + bits += 6 + if bits >= 8 { + bits -= 8 + output.append(UInt8(truncatingIfNeeded: accumulator >> UInt32(bits))) + accumulator &= (1 << UInt32(bits)) - 1 + } + } + // What is left are the padding bits of the last character. + guard accumulator == 0 else { return nil } + return output + } + + // MARK: - Shared by the App Connect carriers + + /// Splits a query on `&` and keeps the `known` parameters. Names and + /// values are form-decoded before they are compared, as the app's + /// `URLSearchParams` does; a repeated known parameter is invalid and + /// unknown ones are ignored. + private static func appConnectParameters(_ query: Substring.UnicodeScalarView, known: Set) throws -> [String: String] { var parameters: [String: String] = [:] for item in query.split(separator: "&") { let parts = item.split(separator: "=", maxSplits: 1, omittingEmptySubsequences: false) let name = formDecoded(parts[0]) - guard ["n", "v", "cb"].contains(name) else { continue } + guard known.contains(name) else { continue } guard parameters[name] == nil else { throw AppConnectRequestError.invalid("query parameter \(name) is repeated") } parameters[name] = parts.count == 2 ? formDecoded(parts[1]) : "" } + return parameters + } + /// The part both carriers share: `v`, then `n`, then the body bytes the + /// carrier produces, then `cb`, then the body decoder. + private static func finishAppConnectRequest(_ parameters: [String: String], + payload: () throws -> Data) throws -> AppConnectUri { guard parameters["v"] == appConnectVersion else { // The value is untrusted and unbounded: only a short number is echoed. let version = parameters["v"].map { (1 ... 3).contains($0.utf8.count) && $0.utf8.allSatisfy { (0x30 ... 0x39).contains($0) } ? $0 : "(unreadable)" } @@ -241,20 +396,13 @@ enum DashConnectUri { guard let network = parameters["n"].flatMap(DashConnectNetwork.init(rawValue:)) else { throw AppConnectRequestError.invalid("unknown network") } - // Before the decode, as for the other two formats: its cost is - // quadratic in the encoded length. - guard body.utf8.count <= maxEncodedLength(forPayloadBytes: maxAppConnectPayloadLength) else { - throw AppConnectRequestError.invalid("request is too long") - } - guard let payload = base58Decode(body) else { - throw AppConnectRequestError.invalid("request is not base58") - } - guard payload.count <= maxAppConnectPayloadLength else { + let body = try payload() + guard body.count <= maxAppConnectPayloadLength else { throw AppConnectRequestError.invalid("request is too long") } let callback = try parameters["cb"].map(parseCallback) - return AppConnectUri(request: try AppConnectRequest.decode(payload), network: network, callback: callback) + return AppConnectUri(request: try AppConnectRequest.decode(body), network: network, callback: callback) } /// `+` is a space and each well-formed `%XX` a byte; a `%` that is not diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 81fb0f09ef..de10a2346c 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -2932,6 +2932,9 @@ /* DashPay Contacts: scanned QR is a payment/invitation/foreign code */ "This isn't a DashPay user QR code." = "This isn't a DashPay user QR code."; +/* No comment provided by engineer. */ +"This link needs a newer version of the wallet." = "This link needs a newer version of the wallet."; + /* SDK identity profile sheet — explains the identity credit balance */ "This balance pays Dash Platform network fees — usernames, contact requests, profile updates. It belongs to your identity, not your wallet: unlike your Transparent, Platform, and Shielded balances it can't be spent as regular Dash. Topping up converts Dash from a balance you choose — Shielded by default — into identity credits." = "This balance pays Dash Platform network fees — usernames, contact requests, profile updates. It belongs to your identity, not your wallet: unlike your Transparent, Platform, and Shielded balances it can't be spent as regular Dash. Topping up converts Dash from a balance you choose — Shielded by default — into identity credits."; diff --git a/DashWalletTests/DashConnect/DashConnectUriTests.swift b/DashWalletTests/DashConnect/DashConnectUriTests.swift index 54fa951fe1..5366c8cefb 100644 --- a/DashWalletTests/DashConnect/DashConnectUriTests.swift +++ b/DashWalletTests/DashConnect/DashConnectUriTests.swift @@ -737,3 +737,262 @@ final class DashConnectUriTests: XCTestCase { XCTAssertEqual(request.age(now: created.addingTimeInterval(-2 * 60 - 1)), .future) } } + +// MARK: - dashpay://connect carrier + +extension DashConnectUriTests { + /// The DIP's "Request Vector": the devnet request as a `connect` URI, with its return link. + private static let connectVectorUri = "dashpay://connect?v=2&n=d&r=AgPoPLkn6F-WrlCpXKO-Icx6N1UTmpQbFdmbAa9P7PDScPiDPHotWKuBbCSukV_iqpRnZYi0Z7oenyskwaPff9t4BVlhcHByAjICAbBZDlkmnGiFrPcdJ9386FGH4syXNsQulYEnzTW-bTjoAAAAC6Q7dAAAAAGi9760AAI6AQKiobSsb-8i6ioaaOgSNkSzV4dfa0EsGBCSgcFG57JxvAAAAAA7msoAAAABove-tAAHcHJvZmlsZQMQppsbT2ZmgUU97Dc0ZnpasgQh-IM8ei1Yq4FsJK6RX-KqlGdliLRnuh6fKyTBo99_23gBBggAAAGhKEJcAA&cb=https%3A%2F%2Fyap.pr%2Fconnect%3Fr%3Dd77dc0da9df83a47755a15c42c5d9db9d7a7fd62" + private static let connectVectorCallback = "https://yap.pr/connect?r=d77dc0da9df83a47755a15c42c5d9db9d7a7fd62" + + /// The vector's `r`, and the URI with everything else as the DIP writes it. + private static var connectVectorR: String { + connectVectorUri.components(separatedBy: "&r=")[1].components(separatedBy: "&cb=")[0] + } + + private static func connectUri(r: String, query: String = "v=2&n=d") -> String { + "dashpay://connect?\(query)&r=\(r)" + } + + private func assertConnectInvalid(_ uri: String, file: StaticString = #filePath, line: UInt = #line) { + XCTAssertThrowsError(try DashConnectUri.parseConnectRequest(uri), file: file, line: line) { error in + guard case .invalid = error as? AppConnectRequestError else { + return XCTFail("expected invalid, got \(error)", file: file, line: line) + } + } + } + + func testTheDipConnectVectorDecodesToTheVectorBody() throws { + let parsed = try DashConnectUri.parseConnectRequest(Self.connectVectorUri) + + XCTAssertEqual(DashConnectUri.base64URLDecode(Self.connectVectorR), AppConnectVector.requestBytes) + XCTAssertEqual(parsed.request, try AppConnectRequest.decode(AppConnectVector.requestBytes)) + XCTAssertEqual(parsed.network, .devnet) + XCTAssertEqual(parsed.callback?.absoluteString, Self.connectVectorCallback) + } + + func testBothCarriersGiveTheSameRequest() throws { + let viaDashKey = try DashConnectUri.parseAppConnectRequest(AppConnectVector.requestUri) + XCTAssertEqual(try DashConnectUri.parseConnectRequest(Self.connectVectorUri), viaDashKey) + } + + func testConnectUriIsRecognisedAndOthersAreNot() { + XCTAssertTrue(DashConnectUri.isConnectUri(Self.connectVectorUri)) + XCTAssertFalse(DashConnectUri.isConnectUri("dashpay://invite?assetlocktx=00")) + XCTAssertFalse(DashConnectUri.isConnectUri("dashpay://connection?v=2")) + XCTAssertFalse(DashConnectUri.isConnectUri("dashpay:connect?v=2")) + XCTAssertFalse(DashConnectUri.isConnectUri(AppConnectVector.requestUri)) + XCTAssertFalse(DashConnectUri.isConnectUri("https://connect/")) + XCTAssertFalse(DashConnectUri.isConnectUri("")) + } + + func testSchemeAndHostAreComparedCaseInsensitively() throws { + let expected = try DashConnectUri.parseConnectRequest(Self.connectVectorUri) + let rest = String(Self.connectVectorUri.dropFirst("dashpay://connect".count)) + for prefix in ["DASHPAY://CONNECT", "DashPay://Connect", "dashpay://CONNECT", "DASHPAY://connect"] { + XCTAssertTrue(DashConnectUri.isConnectUri(prefix + rest), prefix) + XCTAssertEqual(try DashConnectUri.parseConnectRequest(prefix + rest), expected, prefix) + } + } + + func testPathIsEmptyOrASingleSlash() throws { + let rest = String(Self.connectVectorUri.dropFirst("dashpay://connect".count)) + XCTAssertNoThrow(try DashConnectUri.parseConnectRequest("dashpay://connect/" + rest)) + for path in ["//", "/x", "/connect", "/ "] { + assertConnectInvalid("dashpay://connect" + path + rest) + } + } + + func testUserinfoPortAndFragmentAreRefused() { + let rest = String(Self.connectVectorUri.dropFirst("dashpay://connect".count)) + assertConnectInvalid("dashpay://user@connect" + rest) + assertConnectInvalid("dashpay://user:pw@connect" + rest) + assertConnectInvalid("dashpay://connect:80" + rest) + assertConnectInvalid("dashpay://connect:" + rest) + assertConnectInvalid(Self.connectVectorUri + "#frag") + assertConnectInvalid(Self.connectVectorUri + "#") + assertConnectInvalid(Self.connectVectorUri.replacingOccurrences(of: "&n=d", with: "&n=d#x")) + // A userinfo or port is still a connect link, so it is refused here and not shown as another link. + XCTAssertTrue(DashConnectUri.isConnectUri("dashpay://user@connect" + rest)) + XCTAssertTrue(DashConnectUri.isConnectUri("dashpay://connect:80" + rest)) + XCTAssertFalse(DashConnectUri.isUnsupportedDashpayVerb("dashpay://connect:80" + rest)) + } + + func testVersionMustBeExactlyTwo() { + let r = Self.connectVectorR + for query in ["n=d", "v=1&n=d", "v=3&n=d", "v=22&n=d", "v=&n=d", "v=02&n=d"] { + XCTAssertThrowsError(try DashConnectUri.parseConnectRequest(Self.connectUri(r: r, query: query)), query) { error in + guard case .unsupported = error as? AppConnectRequestError else { + return XCTFail("expected unsupported, got \(error)") + } + } + } + // Form-decoded first, like the other carrier. + XCTAssertNoThrow(try DashConnectUri.parseConnectRequest(Self.connectUri(r: r, query: "%76=%32&n=d"))) + } + + func testNetworkMustBeKnown() throws { + let r = Self.connectVectorR + for query in ["v=2", "v=2&n=", "v=2&n=x", "v=2&n=mt", "v=2&n=D"] { + XCTAssertThrowsError(try DashConnectUri.parseConnectRequest(Self.connectUri(r: r, query: query)), query) { error in + XCTAssertEqual(error as? AppConnectRequestError, .invalid("unknown network"), query) + } + } + let networks: [(String, DashConnectNetwork)] = [("m", .mainnet), ("t", .testnet), ("d", .devnet)] + for (code, network) in networks { + XCTAssertEqual(try DashConnectUri.parseConnectRequest(Self.connectUri(r: r, query: "v=2&n=\(code)")).network, network) + } + } + + func testARepeatedKnownParameterIsInvalidAndUnknownOnesAreIgnored() throws { + let uri = Self.connectVectorUri + XCTAssertNoThrow(try DashConnectUri.parseConnectRequest(uri + "&x=1&x=2&exp=5")) + let cb = "&cb=https%3A%2F%2Fyap.pr%2F" + for repeated in ["&v=2", "&n=d", "&r=" + Self.connectVectorR, cb, "&%72=" + Self.connectVectorR] { + assertConnectInvalid(uri + repeated) + } + // Any order is accepted. + let reordered = "dashpay://connect?cb=https%3A%2F%2Fyap.pr%2Fconnect%3Fr%3Dd77dc0da9df83a47755a15c42c5d9db9d7a7fd62&r=\(Self.connectVectorR)&n=d&v=2" + XCTAssertEqual(try DashConnectUri.parseConnectRequest(reordered), try DashConnectUri.parseConnectRequest(uri)) + } + + func testTheRequestIsRequired() { + assertConnectInvalid("dashpay://connect?v=2&n=d") + assertConnectInvalid("dashpay://connect?v=2&n=d&r=") + assertConnectInvalid("dashpay://connect") + assertConnectInvalid("dashpay://connect/") + XCTAssertThrowsError(try DashConnectUri.parseConnectRequest("dashpay://connect?")) { error in + XCTAssertEqual(error as? AppConnectRequestError, .unsupported("URI version (none)")) + } + } + + func testTheRequestMustBeCanonicalBase64URL() { + let r = Self.connectVectorR + XCTAssertEqual(r.count % 4, 2) + let pad = String(repeating: "=", count: 2) + let cases: [String: String] = [ + "padding": r + pad, + "plus": "+" + String(r.dropFirst()), + "plus as space": String(r.dropFirst(2)) + "+A", + "slash": "/" + String(r.dropFirst()), + "outside the alphabet": "!" + String(r.dropFirst()), + "space": String(r.dropFirst()) + " ", + "non-ASCII": "\u{e9}" + String(r.dropFirst()), + "length 1 mod 4": String(r.dropLast()), + "non-zero trailing bits": String(r.dropLast()) + "B", + ] + for (name, bad) in cases { + assertConnectInvalid(Self.connectUri(r: bad)) + XCTAssertNil(DashConnectUri.base64URLDecode(bad), name) + } + // The canonical form of the same value decodes. + XCTAssertNotNil(DashConnectUri.base64URLDecode(r)) + } + + func testBase64URLDecoderMatchesRfc4648AndIsStrict() { + let text = { (string: String) in DashConnectUri.base64URLDecode(string).map { String(decoding: $0, as: UTF8.self) } } + XCTAssertEqual(DashConnectUri.base64URLDecode(""), Data()) + XCTAssertEqual(text("Zg"), "f") + XCTAssertEqual(text("Zm8"), "fo") + XCTAssertEqual(text("Zm9v"), "foo") + XCTAssertEqual(text("Zm9vYg"), "foob") + XCTAssertEqual(text("Zm9vYmE"), "fooba") + XCTAssertEqual(text("Zm9vYmFy"), "foobar") + // The URL-safe alphabet: `-` is 62 and `_` is 63. + XCTAssertEqual(DashConnectUri.base64URLDecode("-_8"), Data([0xfb, 0xff])) + XCTAssertEqual(DashConnectUri.base64URLDecode("-_-_"), Data([0xfb, 0xff, 0xbf])) + + for bad in ["Zg==", "Zm8=", "Z", "Zm9vY", "Zh", "Zm9", "Zm9vYh", "Zm+/", "Zm/+", "+_8", "Zm 8", "Zm8\n", "Zm\u{0}8", "Z\u{e9}", "\u{ff21}\u{ff21}"] { + XCTAssertNil(DashConnectUri.base64URLDecode(bad), bad) + } + // Every byte string has exactly one encoding: the decoder agrees with the encoder for a spread of lengths. + for length in 0 ... 40 { + let data = Data((0 ..< length).map { UInt8(truncatingIfNeeded: $0 &* 37 &+ 11) }) + let encoded = data.base64EncodedString() + .replacingOccurrences(of: "+", with: "-").replacingOccurrences(of: "/", with: "_") + .replacingOccurrences(of: "=", with: "") + XCTAssertEqual(DashConnectUri.base64URLDecode(encoded), data, "length \(length)") + } + } + + func testTheRequestLimits() throws { + // 1,366 characters is 1,024 bytes; the body decoder then refuses a body of zeros. + let atTheLimit = String(repeating: "A", count: 1366) + XCTAssertThrowsError(try DashConnectUri.parseConnectRequest(Self.connectUri(r: atTheLimit))) { error in + XCTAssertNotEqual(error as? AppConnectRequestError, .invalid("request is too long")) + } + for count in [1367, 1368, 2000] { + XCTAssertThrowsError(try DashConnectUri.parseConnectRequest(Self.connectUri(r: String(repeating: "A", count: count)))) { error in + XCTAssertEqual(error as? AppConnectRequestError, .invalid("request is too long"), "\(count)") + } + } + // Too long is reported before the alphabet is looked at. + XCTAssertThrowsError(try DashConnectUri.parseConnectRequest(Self.connectUri(r: String(repeating: "!", count: 1367)))) { error in + XCTAssertEqual(error as? AppConnectRequestError, .invalid("request is too long")) + } + } + + func testTheWholeUriIsLimitedTo4096BytesBeforeDecoding() throws { + let base = Self.connectVectorUri + // Exactly 4,096 bytes is read; one more is not. + let filler = "&x=" + String(repeating: "a", count: 4096 - base.utf8.count - 3) + XCTAssertEqual((base + filler).utf8.count, 4096) + XCTAssertNoThrow(try DashConnectUri.parseConnectRequest(base + filler)) + XCTAssertThrowsError(try DashConnectUri.parseConnectRequest(base + filler + "a")) { error in + XCTAssertEqual(error as? AppConnectRequestError, .invalid("URI is too long")) + } + // Bytes, not characters, and before anything else is read: a bad `v` is not what is reported. + let multibyte = "dashpay://connect?v=9&x=" + String(repeating: "\u{20ac}", count: 1366) + XCTAssertGreaterThan(multibyte.utf8.count, 4096) + XCTAssertLessThan(multibyte.count, 4096) + XCTAssertThrowsError(try DashConnectUri.parseConnectRequest(multibyte)) { error in + XCTAssertEqual(error as? AppConnectRequestError, .invalid("URI is too long")) + } + } + + func testTheReturnLinkKeepsItsRules() throws { + let uri = Self.connectUri(r: Self.connectVectorR) + XCTAssertNil(try DashConnectUri.parseConnectRequest(uri).callback) + for callback in ["http%3A%2F%2Fyap.pr%2F", "https%3A%2F%2Fuser%40yap.pr%2F", "yap.pr%2Fconnect", + "https%3A%2F%2F1.2.3.4%2F", "https%3A%2F%2FYAP.PR%2F"] { + assertConnectInvalid(uri + "&cb=" + callback) + } + XCTAssertEqual(try DashConnectUri.parseConnectRequest(uri + "&cb=https%3A%2F%2Fyap.pr%3A8443%2Fa").callback?.port, 8443) + } + + func testUnknownVerbsAreNamedAsNeedingANewerWallet() { + for uri in ["dashpay://sign?v=2&n=t&exp=1&st=AAAA", "DASHPAY://SIGN?v=2", "dashpay://sign", "dashpay://future/", + "dashpay://x@sign?v=2"] { + XCTAssertTrue(DashConnectUri.isUnsupportedDashpayVerb(uri), uri) + XCTAssertFalse(DashConnectUri.isConnectUri(uri), uri) + } + // Verbs the wallet reads elsewhere, links of another shape, and other schemes. + for uri in [Self.connectVectorUri, "dashpay://invite?assetlocktx=00", "DashPay://Invite?x=1", "dashpay://user?id=1", + "dashpay://", "dashpay:sign", "dash://sign", "https://sign/", AppConnectVector.requestUri, "dash-st:abc?n=t&v=1", ""] { + XCTAssertFalse(DashConnectUri.isUnsupportedDashpayVerb(uri), uri) + } + } + + func testDeepLinkRoutingTakesConnectAndLeavesInvitationsAlone() throws { + let connect = try XCTUnwrap(URL(string: Self.connectVectorUri)) + XCTAssertEqual(DashConnectDeepLink.uri(from: connect), Self.connectVectorUri) + XCTAssertTrue(DashConnectDeepLink.canHandle(connect)) + XCTAssertTrue(DashConnectDeepLink.canHandle(try XCTUnwrap(URL(string: "DASHPAY://CONNECT?v=2")))) + + // An invitation is not a connect link, and is not an unknown verb either. + for invite in ["dashpay://invite?assetlocktx=00&pk=1", "DashPay://INVITE?x=1"] { + let url = try XCTUnwrap(URL(string: invite)) + XCTAssertNil(DashConnectDeepLink.uri(from: url), invite) + XCTAssertFalse(DashConnectDeepLink.canHandle(url), invite) + XCTAssertFalse(DashConnectDeepLink.isUnsupportedDashpayVerb(url), invite) + } + let sign = try XCTUnwrap(URL(string: "dashpay://sign?v=2&n=t")) + XCTAssertNil(DashConnectDeepLink.uri(from: sign)) + XCTAssertTrue(DashConnectDeepLink.isUnsupportedDashpayVerb(sign)) + + // The existing carriers are unchanged. + XCTAssertEqual(DashConnectDeepLink.uri(from: try XCTUnwrap(URL(string: AppConnectVector.requestUri))), AppConnectVector.requestUri) + XCTAssertTrue(DashConnectDeepLink.canHandle(try XCTUnwrap(URL(string: "dash-st:abc?n=t&v=1")))) + XCTAssertFalse(DashConnectDeepLink.canHandle(try XCTUnwrap(URL(string: "dash:XyZ?amount=1")))) + } +} From 790df15b07cd747ed15f462225f01fde3dc1de0d Mon Sep 17 00:00:00 2001 From: pasta Date: Wed, 28 Oct 2026 18:20:15 -0500 Subject: [PATCH 055/108] fix(dashpay): bound the work dashpayHost does before the size limit dashpayHost copied and scanned the whole text after dashpay:// into an array. It runs from DashConnectDeepLink, isUnsupportedDashpayVerb and parseQR before parseConnectRequest checks the 4,096-byte limit, so a long dashpay:// string without a "/", "?" or "#" cost memory and time in proportion to its length. Read at most 256 scalars after the scheme. A verb, userinfo and port fit well inside that, so routing is unchanged: an oversized dashpay://connect link still reaches the parser and is refused as too large. A longer authority is classified from its first scalars, as an unknown verb. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/Protocol/DashConnectUri.swift | 11 ++++++- .../DashConnect/DashConnectUriTests.swift | 33 +++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift index ba709cb496..4515172688 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift @@ -246,18 +246,27 @@ enum DashConnectUri { private static let maxConnectUriBytes = 4096 /// 1,024 bytes of body in unpadded base64url. private static let maxConnectBodyCharacters = 1366 + /// How much of the text after `dashpay://` `dashpayHost` reads. + private static let maxAuthorityScalars = 256 /// The lowercased host of a `dashpay://` URI, which names its verb, or nil /// for any other string. Scheme and host compare case-insensitively. A /// userinfo or port is dropped here so that `dashpay://connect:80` is /// still read as `connect` and refused by the parser, not as another /// link. + /// + /// This runs on any string before the connect parser's size limit, so it + /// reads at most `maxAuthorityScalars` scalars after the scheme and its + /// cost does not grow with the input. A real verb, userinfo and port fit + /// well inside that; a longer authority is classified from its first + /// scalars, which makes it an unknown verb, not a connect link. private static func dashpayHost(of uri: String) -> String? { let scalars = uri.unicodeScalars let head = Array(scalars.prefix(dashpayUrlPrefix.count)) guard head.count == dashpayUrlPrefix.count, zip(head, dashpayUrlPrefix).allSatisfy({ asciiLowercased($0) == $1 }) else { return nil } - let authority = Array(scalars.dropFirst(dashpayUrlPrefix.count).prefix { $0 != "/" && $0 != "?" && $0 != "#" }) + let authority = Array(scalars.dropFirst(dashpayUrlPrefix.count).prefix(maxAuthorityScalars) + .prefix { $0 != "/" && $0 != "?" && $0 != "#" }) let afterUserinfo = authority.split(separator: "@", omittingEmptySubsequences: false).last ?? [] let host = afterUserinfo.prefix { $0 != ":" } var result = String.UnicodeScalarView() diff --git a/DashWalletTests/DashConnect/DashConnectUriTests.swift b/DashWalletTests/DashConnect/DashConnectUriTests.swift index 5366c8cefb..4399997a16 100644 --- a/DashWalletTests/DashConnect/DashConnectUriTests.swift +++ b/DashWalletTests/DashConnect/DashConnectUriTests.swift @@ -995,4 +995,37 @@ extension DashConnectUriTests { XCTAssertTrue(DashConnectDeepLink.canHandle(try XCTUnwrap(URL(string: "dash-st:abc?n=t&v=1")))) XCTAssertFalse(DashConnectDeepLink.canHandle(try XCTUnwrap(URL(string: "dash:XyZ?amount=1")))) } + + func testAnOversizedDashpayUriIsClassifiedFromItsFirstScalars() { + let tooLarge = AppConnectRequestError.invalid("URI is too long") + let filler = String(repeating: "a", count: 10_000) + + // A port with no delimiter after it: still a connect link, so the parser's own refusal is what the user sees. + let connectWithPort = "dashpay://connect:" + String(repeating: "9", count: 10_000) + XCTAssertTrue(DashConnectUri.isConnectUri(connectWithPort)) + XCTAssertFalse(DashConnectUri.isUnsupportedDashpayVerb(connectWithPort)) + XCTAssertThrowsError(try DashConnectUri.parseConnectRequest(connectWithPort)) { error in + XCTAssertEqual(error as? AppConnectRequestError, tooLarge) + } + + // A long run after the verb makes a different host, and the same under the cap as before it. + for uri in ["dashpay://" + filler, "dashpay://connect" + filler, "DASHPAY://SIGN" + filler] { + XCTAssertFalse(DashConnectUri.isConnectUri(uri)) + XCTAssertTrue(DashConnectUri.isUnsupportedDashpayVerb(uri)) + XCTAssertThrowsError(try DashConnectUri.parseConnectRequest(uri)) { error in + XCTAssertEqual(error as? AppConnectRequestError, tooLarge) + } + } + + // Routing reads the same way for a string far past anything a link carries. + let huge = "dashpay://" + String(repeating: "a", count: 5_000_000) + XCTAssertFalse(DashConnectUri.isConnectUri(huge)) + XCTAssertTrue(DashConnectUri.isUnsupportedDashpayVerb(huge)) + XCTAssertThrowsError(try DashConnectUri.parseConnectRequest(huge)) { error in + XCTAssertEqual(error as? AppConnectRequestError, tooLarge) + } + + // A connect host with a userinfo inside the cap is still read as connect. + XCTAssertTrue(DashConnectUri.isConnectUri("dashpay://" + String(repeating: "a", count: 200) + "@connect?v=2")) + } } From 1571e2b520a7410297a60fff2859d5790624a292 Mon Sep 17 00:00:00 2001 From: pasta Date: Thu, 29 Oct 2026 02:05:21 -0500 Subject: [PATCH 056/108] build: pin platform to 03945d3a for the encryption rotation level dashpay/platform#5649 (03945d3a on v5.1-dev) adds the DIP-13 rotation' level to App Connect encryption keys: deriveConnectKey for .appEncryption now requires a rotation, and deriveLegacyAppEncryptionKey derives the earlier 8-level path. The path becomes permanent with the first mainnet key, so the wallet has to derive it before mainnet ships. The only compile break in the 55 commits since 063589bf is the removed rotation-less .appEncryption overload; the call site passes rotation 0 here. Until the next commit selects keys by the DIP rules, this derives only rotation 0', so testnet keys at the old path read as another wallet's. Co-Authored-By: Claude Opus 5.5 --- .platform-ref | 2 +- .../Models/DashConnect/PlatformDashConnectDataSource.swift | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.platform-ref b/.platform-ref index 8ca7cef954..5ba0a30548 100644 --- a/.platform-ref +++ b/.platform-ref @@ -1 +1 @@ -063589bf0adbe1a8823a943cee95385b423b0e3f +03945d3aa75a250a2f3584e06804a3338f29610c diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 0f5556278a..0101a38b4f 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1426,6 +1426,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { identityId: context.identityId, leaf: grant.binding.contractId, purpose: grant.connectPurpose, + rotation: 0, network: context.network ) return (key.publicKeyData, key.privateKeyData) From 41b4f17c0b8644afd12d6aa5551cb75d1df6f2a0 Mon Sep 17 00:00:00 2001 From: pasta Date: Thu, 29 Oct 2026 02:06:38 -0500 Subject: [PATCH 057/108] feat(dashpay): select App Connect encryption keys by the DIP rotation rules The wallet derived one encryption key per binding and compared it with Platform's current key. With the rotation level, the identity's current key may be any rotation this wallet registered, or on testnet a key at the earlier 8-level path that today's builds registered. And a disabled current key of another wallet's read as absent under MultipleReferenceToLatest, so the login registered a new key beside it, where DIP rule 2 says to leave the slot out. Per granted binding the wallet now derives rotation 0', then 1', 2', ... while each is on the identity in any state (stopping at the first that is not), plus the earlier path on testnet and devnet only. A live current key among them is sent and nothing is registered; any other live current key, or a disabled one, leaves the slot out; only an identity with no key for the contract and purpose gets rotation 0' registered. The keys are derived after the identity's keys are fetched, and the candidates no slot carries are wiped before the update and the publish. Co-Authored-By: Claude Opus 5.5 --- DashWallet.xcodeproj/project.pbxproj | 4 + .../DashConnect/AppConnectV2Login.swift | 157 ++++++-- .../PlatformDashConnectDataSource.swift | 121 +++++-- .../AppConnectEncryptionRotationTests.swift | 336 ++++++++++++++++++ .../DashConnect/AppConnectV2LoginTests.swift | 24 +- 5 files changed, 572 insertions(+), 70 deletions(-) create mode 100644 DashWalletTests/DashConnect/AppConnectEncryptionRotationTests.swift diff --git a/DashWallet.xcodeproj/project.pbxproj b/DashWallet.xcodeproj/project.pbxproj index 2a6af95c7d..14f9cd61b1 100644 --- a/DashWallet.xcodeproj/project.pbxproj +++ b/DashWallet.xcodeproj/project.pbxproj @@ -1181,6 +1181,7 @@ AA04A0012FF4000000000001 /* DashConnectDataSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA04A0032FF4000000000003 /* DashConnectDataSourceTests.swift */; }; AA05A0012FF5000000000001 /* DashConnectStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA05A0032FF5000000000003 /* DashConnectStoreTests.swift */; }; AA06A0112FF6000000000011 /* AppConnectV2LoginTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA06A0132FF6000000000013 /* AppConnectV2LoginTests.swift */; }; + AA06A0212FF6000000000021 /* AppConnectEncryptionRotationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA06A0232FF6000000000023 /* AppConnectEncryptionRotationTests.swift */; }; AA06A0012FF6000000000001 /* PlatformDashConnectDataSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA06A0032FF6000000000003 /* PlatformDashConnectDataSourceTests.swift */; }; AA22BB33CC44DD55EE66FF78 /* BuyReceiveFlowUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA22BB33CC44DD55EE66FF77 /* BuyReceiveFlowUITests.swift */; }; AA29B7041CF55787428E1A04 /* libPods-WatchApp Extension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B9BF7550EF8D4BA009CB1EB5 /* libPods-WatchApp Extension.a */; }; @@ -3366,6 +3367,7 @@ AA04A0032FF4000000000003 /* DashConnectDataSourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DashConnectDataSourceTests.swift; path = DashConnect/DashConnectDataSourceTests.swift; sourceTree = ""; }; AA05A0032FF5000000000003 /* DashConnectStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DashConnectStoreTests.swift; path = DashConnect/DashConnectStoreTests.swift; sourceTree = ""; }; AA06A0132FF6000000000013 /* AppConnectV2LoginTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppConnectV2LoginTests.swift; path = DashConnect/AppConnectV2LoginTests.swift; sourceTree = ""; }; + AA06A0232FF6000000000023 /* AppConnectEncryptionRotationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppConnectEncryptionRotationTests.swift; path = DashConnect/AppConnectEncryptionRotationTests.swift; sourceTree = ""; }; AA06A0032FF6000000000003 /* PlatformDashConnectDataSourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PlatformDashConnectDataSourceTests.swift; path = DashConnect/PlatformDashConnectDataSourceTests.swift; sourceTree = ""; }; AA22BB33CC44DD55EE66FF77 /* BuyReceiveFlowUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuyReceiveFlowUITests.swift; sourceTree = ""; }; AA29A8515217AC4232F794C2 /* Pods-TodayExtension.testnet.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TodayExtension.testnet.xcconfig"; path = "Target Support Files/Pods-TodayExtension/Pods-TodayExtension.testnet.xcconfig"; sourceTree = ""; }; @@ -7575,6 +7577,7 @@ AA04A0032FF4000000000003 /* DashConnectDataSourceTests.swift */, AA05A0032FF5000000000003 /* DashConnectStoreTests.swift */, AA06A0132FF6000000000013 /* AppConnectV2LoginTests.swift */, + AA06A0232FF6000000000023 /* AppConnectEncryptionRotationTests.swift */, AA06A0032FF6000000000003 /* PlatformDashConnectDataSourceTests.swift */, 47976E492987772700612988 /* AmountObjectTests.swift */, A17EED0126C7000000000002 /* WalletWipeSerialExecutorTests.swift */, @@ -10908,6 +10911,7 @@ AA04A0012FF4000000000001 /* DashConnectDataSourceTests.swift in Sources */, AA05A0012FF5000000000001 /* DashConnectStoreTests.swift in Sources */, AA06A0112FF6000000000011 /* AppConnectV2LoginTests.swift in Sources */, + AA06A0212FF6000000000021 /* AppConnectEncryptionRotationTests.swift in Sources */, AA06A0012FF6000000000001 /* PlatformDashConnectDataSourceTests.swift in Sources */, 47976E4A2987772700612988 /* AmountObjectTests.swift in Sources */, A17EED0126C7000000000001 /* WalletWipeSerialExecutorTests.swift in Sources */, diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 6a7186871d..43cc13a1f1 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -358,17 +358,110 @@ extension AppConnect { ) } + /// One encryption key this wallet derives, as the data source holds it: + /// the private key is wiped by whoever owns the array it ends up in. + typealias DerivedEncryptionKey = (publicKey: Data, privateKey: Data) + + /// DIP "Encryption Keys": every key this wallet can derive for one + /// encryption binding of `purpose`. The first is always rotation `0'` at + /// `m/9'/coin'/5'/7'/0'/identityId'/contractId'/purpose'/rotation'`, the + /// key a login registers when the identity has none for the binding. + /// Rotations are registered in order, so the later ones are found by + /// deriving `1'`, `2'`, … and stopping at the first whose key is not on + /// the identity in any state; that one is wiped, not kept. No more + /// rotations are derived than the identity has keys of `purpose`. + /// + /// On testnet and devnet the key at the path without the rotation level + /// comes last: wallets built before the DIP registered keys there, and a + /// current key at that path is still sent. Mainnet never had them, so the + /// path is not derived there and such a key reads as another wallet's. + static func derivableEncryptionKeys( + network: Network, + purpose: KeyPurpose, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + rotation: (UInt32) throws -> DerivedEncryptionKey, + legacy: () throws -> DerivedEncryptionKey + ) throws -> [DerivedEncryptionKey] { + func isOnIdentity(_ publicKey: Data) -> Bool { + currentIdentityPublicKeys.contains { $0.purpose == purpose && $0.data == publicKey } + } + var keys: [DerivedEncryptionKey] = [] + var kept = false + defer { + if !kept { for index in keys.indices { PlatformDashConnectDataSource.zero(&keys[index].privateKey) } } + } + keys.append(try rotation(0)) + let maxRotations = max(1, currentIdentityPublicKeys.filter { $0.purpose == purpose }.count) + var next: UInt32 = 1 + while isOnIdentity(keys[keys.count - 1].publicKey), keys.count < maxRotations { + var key = try rotation(next) + guard isOnIdentity(key.publicKey) else { + PlatformDashConnectDataSource.zero(&key.privateKey) + break + } + keys.append(key) + next += 1 + } + if derivesLegacyEncryptionPath(network) { + keys.append(try legacy()) + } + kept = true + return keys + } + + /// Whether `network` derives encryption keys at the path without the + /// rotation level as well (DIP "Deployment and Compatibility"). + static func derivesLegacyEncryptionPath(_ network: Network) -> Bool { + network == .testnet || network == .devnet + } + + /// What a login does with one granted encryption binding. + enum EncryptionSlot: Equatable { + /// Send the identity's current key, which is `derivedIndex` among + /// the keys `derivableEncryptionKeys` returned; register nothing. + case send(keyId: UInt32, derivedIndex: Int) + /// Register rotation `0'` (the first derivable key) and send it. + case register + /// Leave the slot out and register nothing. + case omit + } + + /// The slot a settled `state` comes to, or nil for one that is not + /// settled, or a current key that is not among `derivedPublicKeys` as + /// the fetched keys show it (a read that is behind). + static func encryptionSlot( + for state: EncryptionKeyState, + derivedPublicKeys: [Data], + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> EncryptionSlot? { + switch state { + case .current(let keyId): + guard let key = currentIdentityPublicKeys.first(where: { UInt32(bitPattern: $0.keyId) == keyId }), + let derivedIndex = derivedPublicKeys.firstIndex(of: key.data) else { return nil } + return .send(keyId: keyId, derivedIndex: derivedIndex) + case .absent: + return .register + case .notThisWallets: + return .omit + case .outOfDate, .absentIfSettled, .notThisWalletsIfSettled, .currentIfSettled: + return nil + } + } + /// What the identity holds for the app's encryption key of one purpose - /// (wallet rule 7). + /// (wallet rule 7, DIP "Encryption Keys"). enum EncryptionKeyState: Equatable { - /// Its current key is the one this wallet derives: send it again. + /// Its current key is one this wallet derives: send it again. case current(keyId: UInt32) - /// It has none: register the one this wallet derives. + /// It has no key for the contract and purpose at all: register + /// rotation `0'`. case absent - /// Its current key is another wallet's, or the one this wallet - /// derives was disabled: leave the slot out. Replacing it would be a - /// rotation, which orphans what peers encrypted to it; that is an - /// explicit user action, never part of a login. + /// Its current key is another wallet's, or Platform's current key + /// for the contract and purpose is disabled, so none is current: + /// leave the slot out. + /// Replacing it would be a rotation, which orphans what peers + /// encrypted to it; that is an explicit user action, never part of a + /// login. case notThisWallets /// The fetched keys and Platform's current key disagree: one of the /// two reads is behind, and nothing can be said until both agree. @@ -583,22 +676,27 @@ extension AppConnect { isDisabled: !(disabledAt == nil || disabledAt is NSNull)) } - /// Rotation 0 only: the key at DIP-13 `7'` for (identity, contract, - /// purpose). `currentKey` is the key Platform names as current under - /// the app's `rule`; this wallet's key is sent only while it is that one - /// and live. The fetched keys must show that key as Platform does. + /// DIP "Encryption Keys", for one granted binding. `currentKey` is the + /// key Platform names as current under the app's `rule`; it is the + /// identity's current key only while it is live. `derivedPublicKeys` are + /// every key this wallet derives for the binding + /// (`derivableEncryptionKeys`). A live current key among them is sent; + /// any other live current key is another wallet's and its slot is left + /// out (rule 1). A disabled current key means a key for the contract and + /// purpose is on the identity and none is current: the slot is left out + /// and nothing is registered (rule 2). Only with no current key at all is a + /// key registered (rule 3). The fetched keys must show the current key + /// as Platform does. /// /// Every key bound to the app becomes current when it is registered, so /// with no current key at all a live key the store places on the app /// means Platform's read is behind, and a key it cannot place is /// bound elsewhere once a later read agrees. Beside a current key, a - /// live key the app may hold was registered before it, or after it with - /// Platform's read behind, so the answer waits on a later read. Behind - /// a disabled current key that a later read confirms, a key registered - /// before it is no longer current, and a new one shadows nothing; under - /// `unique`, nothing can be added behind a disabled current key at all. + /// key the app may hold was registered before it, or after it with + /// Platform's read behind, so under `latest` the answer waits on a later + /// read. static func encryptionKeyState( - derivedPublicKey: Data, + derivedPublicKeys: [Data], purpose: KeyPurpose, contractId: Data, rule: CurrentKeyRule, @@ -620,13 +718,16 @@ extension AppConnect { unplaced = true } } - let holdsTheDerivedKey = currentIdentityPublicKeys.contains(where: { $0.data == derivedPublicKey }) guard let currentKey else { // Registering a key bound to the app makes it current, so a key // the store places on the app with no current key at all, live or - // disabled, or this wallet's key in any state (it is derived for - // the app's contract), is a read from before it landed. - if placedInAnyState || holdsTheDerivedKey { return .outOfDate } + // disabled, or one of this wallet's keys in any state (they are + // derived for the app's contract), is a read from before it + // landed. + let holdsADerivedKey = currentIdentityPublicKeys.contains(where: { + $0.purpose == purpose && derivedPublicKeys.contains($0.data) + }) + if placedInAnyState || holdsADerivedKey { return .outOfDate } return unplaced ? .absentIfSettled : .absent } guard let fetched = currentIdentityPublicKeys.first(where: { UInt32(bitPattern: $0.keyId) == currentKey.keyId }), @@ -640,17 +741,19 @@ extension AppConnect { let mayBeBehind = rule == .latest && (placedInAnyState || unplaced) if !currentKey.isDisabled { guard fetched.keyType == .ecdsaSecp256k1, currentKey.keyType == .ecdsaSecp256k1, - currentKey.data == derivedPublicKey else { + derivedPublicKeys.contains(currentKey.data) else { return mayBeBehind ? .notThisWalletsIfSettled : .notThisWallets } return mayBeBehind ? .currentIfSettled(keyId: currentKey.keyId) : .current(keyId: currentKey.keyId) } + // Rule 2: the identity has a key for the contract and purpose, and + // none is current. Under `unique` Platform refuses any other; under + // `latest` a new key would be a rotation, which is the user's + // explicit action and never part of a login. A later live key with + // Platform's read behind is the one exception, so under `latest` + // the answer waits on a later read. if rule == .unique { return .notThisWallets } - // Behind a disabled current key, a key of the app's registered - // before it is no longer current either, so a new key shadows - // nothing; this wallet's own key cannot be added a second time. - if holdsTheDerivedKey { return mayBeBehind ? .notThisWalletsIfSettled : .notThisWallets } - return mayBeBehind ? .absentIfSettled : .absent + return mayBeBehind ? .notThisWalletsIfSettled : .notThisWallets } /// Wallet rule 8: the live auth keys of this wallet's earlier grants to diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 0101a38b4f..a2dfd0dabf 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1400,10 +1400,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // buffers leave the closure, so the arrays below own the private keys // and the deferred wipe reaches the real bytes. var authKeys: [(publicKeyHash160: Data, privateKey: Data)] = [] - var encryptionKeys: [(publicKey: Data, privateKey: Data)] = [] + // Per encryption grant, every key this wallet derives for it + // (`AppConnect.derivableEncryptionKeys`): rotation 0' first. + var encryptionKeys: [[AppConnect.DerivedEncryptionKey]] = [] defer { for index in authKeys.indices { Self.zero(&authKeys[index].privateKey) } - for index in encryptionKeys.indices { Self.zero(&encryptionKeys[index].privateKey) } + for grant in encryptionKeys.indices { + for index in encryptionKeys[grant].indices { Self.zero(&encryptionKeys[grant][index].privateKey) } + } } for grant in plan.auth { let leaf = AppConnect.authKeyLeaf( @@ -1419,19 +1423,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } authKeys.append((try KeyExchangeCrypto.hash160(publicKey), privateKey)) } - for grant in plan.encryption { - encryptionKeys.append(try await MainActor.run { - let key = try context.wallet.deriveConnectKey( - subFeature: .appEncryption, - identityId: context.identityId, - leaf: grant.binding.contractId, - purpose: grant.connectPurpose, - rotation: 0, - network: context.network - ) - return (key.publicKeyData, key.privateKeyData) - }) - } let signer = KeychainSigner(modelContainer: context.modelContainer) // The app's current encryption keys are a second read, from Platform. @@ -1456,6 +1447,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { defer { firstCurrentKeysRead.cancel() } let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + // Which rotations to derive depends on the keys the identity has. + for grant in plan.encryption { + encryptionKeys.append(try await MainActor.run { + try Self.derivableEncryptionKeys( + for: grant, wallet: context.wallet, identityId: context.identityId, + network: context.network, currentIdentityPublicKeys: currentPublicKeys) + }) + } // An auth key already on the identity at a binding's derived payload // is this request answered before: the payload comes from the @@ -1495,9 +1494,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - // Wallet rule 7: re-send the identity's key for the app when this - // wallet made it, register it when there is none, leave it out when - // another wallet made it. Which key is current is Platform's to say: + // Wallet rule 7 (DIP "Encryption Keys"): re-send the identity's + // current key for the app when this wallet derives it, at any + // rotation or (testnet and devnet) the path without one; register + // rotation 0' only when the identity has no key for the app at all; + // leave the slot out otherwise. Which key is current is Platform's to say: // the app's verifier checks the slot against the same proved read. // An answer this build cannot read reads the same on every try. func isUnreadableAnswer(_ error: Error) -> Bool { @@ -1543,7 +1544,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.approvalOutOfDate } return AppConnect.encryptionKeyState( - derivedPublicKey: encryptionKeys[index].publicKey, + derivedPublicKeys: encryptionKeys[index].map(\.publicKey), purpose: grant.keyPurpose, contractId: grant.binding.contractId, rule: rule, @@ -1570,20 +1571,34 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } catch { throw failedRead(error) } - var encryptionSlots: [(keyIndex: Int, keyId: UInt32?)] = [] + // `keyIndex` is the grant, `derivedIndex` the key among its + // derivable keys that the slot sends. + var encryptionSlots: [(keyIndex: Int, derivedIndex: Int, keyId: UInt32?)] = [] for (index, state) in keyStates.enumerated() { - switch state { - case .current(let keyId): - encryptionSlots.append((index, keyId)) - case .absent: - encryptionSlots.append((index, nil)) - case .notThisWallets: - Self.logger.info("🔗 DASHCONNECT :: the app's encryption key on this identity is not this wallet's; slot left out") - case .outOfDate, .absentIfSettled, .notThisWalletsIfSettled, .currentIfSettled: + switch AppConnect.encryptionSlot( + for: state, + derivedPublicKeys: encryptionKeys[index].map(\.publicKey), + currentIdentityPublicKeys: currentPublicKeys + ) { + case .send(let keyId, let derivedIndex): + encryptionSlots.append((index, derivedIndex, keyId)) + case .register: + encryptionSlots.append((index, 0, nil)) + case .omit: + Self.logger.info("🔗 DASHCONNECT :: the app's encryption key on this identity is not this wallet's, or none is live; slot left out") + case nil: Self.logger.error("🔗 DASHCONNECT :: the identity's keys and Platform's current encryption key disagree") throw DashConnectPlatformError.appConnectKeysOutOfDate } } + // The keys no slot carries are wiped now, not after the update and + // the publish. + for grant in encryptionKeys.indices { + let sent = encryptionSlots.first { $0.keyIndex == grant }?.derivedIndex + for index in encryptionKeys[grant].indices where index != sent { + Self.zero(&encryptionKeys[grant][index].privateKey) + } + } // A response recorded for this request carries the encryption keys // the identity had then, and a retry sends that response again. If @@ -1638,10 +1653,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } for slot in encryptionSlots.indices where encryptionSlots[slot].keyId == nil { guard let keyId = freeKeyIds.next() else { throw DashConnectPlatformError.noFreeKeyId } - let keyIndex = encryptionSlots[slot].keyIndex + let key = encryptionKeys[encryptionSlots[slot].keyIndex][encryptionSlots[slot].derivedIndex] add.append(AppConnect.encryptionIdentityPubkey( - plan.encryption[keyIndex], keyId: keyId, publicKey: encryptionKeys[keyIndex].publicKey)) - signingKeys.append((encryptionKeys[keyIndex].publicKey, encryptionKeys[keyIndex].privateKey)) + plan.encryption[encryptionSlots[slot].keyIndex], keyId: keyId, publicKey: key.publicKey)) + signingKeys.append((key.publicKey, key.privateKey)) encryptionSlots[slot].keyId = keyId } defer { for index in signingKeys.indices { Self.zero(&signingKeys[index].privateKey) } } @@ -1691,7 +1706,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // Slots: the auth keys in request order, then the encryption keys // that are sent. - var slots = authKeys.map(\.privateKey) + encryptionSlots.map { encryptionKeys[$0.keyIndex].privateKey } + var slots = authKeys.map(\.privateKey) + encryptionSlots.map { encryptionKeys[$0.keyIndex][$0.derivedIndex].privateKey } defer { for index in slots.indices { Self.zero(&slots[index]) } } var walletEphemeralPrivateKey = try Self.generateEphemeralPrivateKey() defer { Self.zero(&walletEphemeralPrivateKey) } @@ -3751,6 +3766,48 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return string } + /// Every key this wallet derives for one encryption grant + /// (`AppConnect.derivableEncryptionKeys`): rotations at the DIP-13 path + /// with the rotation level, and on testnet and devnet the path without + /// it. `storage` is the SDK's default outside tests. + @MainActor + static func derivableEncryptionKeys( + for grant: AppConnect.EncryptionGrant, + wallet: ManagedPlatformWallet, + identityId: Data, + network: Network, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + storage: WalletStorage = WalletStorage() + ) throws -> [AppConnect.DerivedEncryptionKey] { + try AppConnect.derivableEncryptionKeys( + network: network, + purpose: grant.keyPurpose, + currentIdentityPublicKeys: currentIdentityPublicKeys, + rotation: { rotation in + let key = try wallet.deriveConnectKey( + subFeature: .appEncryption, + identityId: identityId, + leaf: grant.binding.contractId, + purpose: grant.connectPurpose, + rotation: rotation, + network: network, + storage: storage + ) + return (key.publicKeyData, key.privateKeyData) + }, + legacy: { + let key = try wallet.deriveLegacyAppEncryptionKey( + identityId: identityId, + contractId: grant.binding.contractId, + purpose: grant.connectPurpose, + network: network, + storage: storage + ) + return (key.publicKeyData, key.privateKeyData) + } + ) + } + static func zero(_ data: inout Data) { data.withUnsafeMutableBytes { buffer in guard let baseAddress = buffer.baseAddress else { diff --git a/DashWalletTests/DashConnect/AppConnectEncryptionRotationTests.swift b/DashWalletTests/DashConnect/AppConnectEncryptionRotationTests.swift new file mode 100644 index 0000000000..cffac929f5 --- /dev/null +++ b/DashWalletTests/DashConnect/AppConnectEncryptionRotationTests.swift @@ -0,0 +1,336 @@ +import Foundation +import XCTest +@testable import dashpay +@testable import SwiftDashSDK + +/// DIP "Encryption Keys": which encryption key a login sends or registers +/// for a granted binding, with the `rotation'` level and, on testnet and +/// devnet, the earlier path without it (`derivableEncryptionKeys`, +/// `encryptionKeyState`, `encryptionSlot`). +final class AppConnectEncryptionRotationTests: XCTestCase { + private static let appId = Data(repeating: 0xA1, count: 32) + + // MARK: - A stand-in deriver + + /// Distinct points per rotation and for the earlier path, with private + /// keys that tell them apart. + private static func rotationPoint(_ rotation: UInt32) -> Data { + Data([0x02] + [UInt8](repeating: UInt8(rotation + 1), count: 32)) + } + + private static let legacyPoint = Data([0x03] + [UInt8](repeating: 0xEE, count: 32)) + + private static func rotationPrivateKey(_ rotation: UInt32) -> Data { + Data(repeating: UInt8(rotation + 1), count: 32) + } + + private static let legacyPrivateKey = Data(repeating: 0xEE, count: 32) + + private final class Deriver { + private(set) var rotations: [UInt32] = [] + private(set) var legacyCalls = 0 + + func rotation(_ rotation: UInt32) -> AppConnect.DerivedEncryptionKey { + rotations.append(rotation) + return (AppConnectEncryptionRotationTests.rotationPoint(rotation), + AppConnectEncryptionRotationTests.rotationPrivateKey(rotation)) + } + + func legacy() -> AppConnect.DerivedEncryptionKey { + legacyCalls += 1 + return (AppConnectEncryptionRotationTests.legacyPoint, AppConnectEncryptionRotationTests.legacyPrivateKey) + } + } + + private static func encryptionKey( + _ keyId: UInt32, data: Data, purpose: KeyPurpose = .encryption, disabled: Bool = false + ) -> ManagedIdentity.IdentityPublicKeyInfo { + ManagedIdentity.IdentityPublicKeyInfo( + keyId: Int32(bitPattern: keyId), purpose: purpose, securityLevel: .medium, keyType: .ecdsaSecp256k1, + readOnly: false, disabledAt: disabled ? 1 : nil, data: data, totalBudget: nil, expiresAt: nil) + } + + private static func binding(_ key: ManagedIdentity.IdentityPublicKeyInfo) -> AppConnect.KeyBinding { + .init(keyId: UInt32(bitPattern: key.keyId), data: key.data, singleContractId: appId) + } + + private static func current(_ key: ManagedIdentity.IdentityPublicKeyInfo) -> AppConnect.CurrentContractKey { + AppConnect.CurrentContractKey( + keyId: UInt32(bitPattern: key.keyId), keyType: .ecdsaSecp256k1, data: key.data, + isDisabled: key.disabledAt != nil) + } + + private struct Login { + let derived: [AppConnect.DerivedEncryptionKey] + let state: AppConnect.EncryptionKeyState + /// The slot once a later read of Platform's current key agrees. + let slot: AppConnect.EncryptionSlot? + + /// The private key the slot carries, registered or sent. + var sentPrivateKey: Data? { + switch slot { + case .send(_, let derivedIndex): return derived[derivedIndex].privateKey + case .register: return derived[0].privateKey + case .omit, nil: return nil + } + } + } + + /// One binding's login against `keys`, as the data source runs it. + private func login( + network: Network = .testnet, + rule: AppConnect.CurrentKeyRule = .latest, + keys: [ManagedIdentity.IdentityPublicKeyInfo], + current: AppConnect.CurrentContractKey?, + bindings: [AppConnect.KeyBinding]? = nil, + deriver: Deriver = Deriver() + ) throws -> Login { + let derived = try AppConnect.derivableEncryptionKeys( + network: network, purpose: .encryption, currentIdentityPublicKeys: keys, + rotation: deriver.rotation, legacy: deriver.legacy) + let state = AppConnect.encryptionKeyState( + derivedPublicKeys: derived.map(\.publicKey), + purpose: .encryption, + contractId: Self.appId, + rule: rule, + currentKey: current, + currentIdentityPublicKeys: keys, + bindings: bindings ?? keys.map(Self.binding)) + let slot = AppConnect.encryptionSlot( + for: state.settled, derivedPublicKeys: derived.map(\.publicKey), currentIdentityPublicKeys: keys) + return Login(derived: derived, state: state, slot: slot) + } + + // MARK: - Rule 1: a current key + + func testACurrentKeyAtRotationZeroIsSentAndNothingIsRegistered() throws { + let mine = Self.encryptionKey(5, data: Self.rotationPoint(0)) + for network: Network in [.mainnet, .testnet] { + let result = try login(network: network, keys: [mine], current: Self.current(mine)) + XCTAssertEqual(result.state, .current(keyId: 5), "\(network)") + XCTAssertEqual(result.slot, .send(keyId: 5, derivedIndex: 0), "\(network)") + XCTAssertEqual(result.sentPrivateKey, Self.rotationPrivateKey(0), "\(network)") + } + } + + func testACurrentKeyAtRotationOneIsSentBehindADisabledRotationZero() throws { + let rotationZero = Self.encryptionKey(5, data: Self.rotationPoint(0), disabled: true) + let rotationOne = Self.encryptionKey(6, data: Self.rotationPoint(1)) + let deriver = Deriver() + let result = try login( + network: .mainnet, keys: [rotationZero, rotationOne], current: Self.current(rotationOne), deriver: deriver) + XCTAssertEqual(deriver.rotations, [0, 1], "two keys on the identity hold at most two rotations") + XCTAssertEqual(result.derived.map(\.publicKey), [Self.rotationPoint(0), Self.rotationPoint(1)]) + // Rotation 0' beside it may be a later key with Platform's read + // behind, so the state waits on a later read; once it agrees: + XCTAssertEqual(result.state, .currentIfSettled(keyId: 6)) + XCTAssertEqual(result.slot, .send(keyId: 6, derivedIndex: 1)) + XCTAssertEqual(result.sentPrivateKey, Self.rotationPrivateKey(1)) + } + + func testAKeyAtTheEarlierPathIsSentOnTestnetAndDevnet() throws { + let legacy = Self.encryptionKey(5, data: Self.legacyPoint) + for network: Network in [.testnet, .devnet] { + let deriver = Deriver() + let result = try login(network: network, keys: [legacy], current: Self.current(legacy), deriver: deriver) + XCTAssertEqual(deriver.legacyCalls, 1) + XCTAssertEqual(result.derived.map(\.publicKey), [Self.rotationPoint(0), Self.legacyPoint]) + XCTAssertEqual(result.state, .current(keyId: 5), "\(network)") + XCTAssertEqual(result.slot, .send(keyId: 5, derivedIndex: 1), "\(network)") + XCTAssertEqual(result.sentPrivateKey, Self.legacyPrivateKey, "\(network)") + } + } + + /// Mainnet never had keys at the earlier path: the wallet does not derive + /// it there, so such a key reads as another wallet's and is left out. + func testTheEarlierPathIsNotDerivedOnMainnet() throws { + let legacy = Self.encryptionKey(5, data: Self.legacyPoint) + let deriver = Deriver() + let result = try login(network: .mainnet, keys: [legacy], current: Self.current(legacy), deriver: deriver) + XCTAssertEqual(deriver.legacyCalls, 0) + XCTAssertEqual(result.derived.map(\.publicKey), [Self.rotationPoint(0)]) + XCTAssertEqual(result.state, .notThisWallets) + XCTAssertEqual(result.slot, .omit) + XCTAssertNil(result.sentPrivateKey) + XCTAssertFalse(AppConnect.derivesLegacyEncryptionPath(.mainnet)) + XCTAssertFalse(AppConnect.derivesLegacyEncryptionPath(.regtest)) + } + + func testACurrentKeyThisWalletCannotDeriveIsLeftOut() throws { + let theirs = Self.encryptionKey(5, data: Data([0x02] + [UInt8](repeating: 0x77, count: 32))) + for rule: AppConnect.CurrentKeyRule in [.latest, .unique] { + let result = try login(rule: rule, keys: [theirs], current: Self.current(theirs)) + XCTAssertEqual(result.state, .notThisWallets, "\(rule)") + XCTAssertEqual(result.slot, .omit, "\(rule)") + } + } + + /// Rotations are registered in order: a gap ends the search, so a key + /// past it is not this wallet's to send. + func testTheRotationSearchStopsAtTheFirstRotationNotOnTheIdentity() throws { + let rotationZero = Self.encryptionKey(5, data: Self.rotationPoint(0), disabled: true) + let rotationTwo = Self.encryptionKey(6, data: Self.rotationPoint(2)) + let deriver = Deriver() + let result = try login( + network: .mainnet, keys: [rotationZero, rotationTwo], current: Self.current(rotationTwo), deriver: deriver) + XCTAssertEqual(deriver.rotations, [0, 1]) + XCTAssertEqual(result.state, .notThisWalletsIfSettled) + XCTAssertEqual(result.slot, .omit) + // The first rotation not on the identity is derived, then dropped. + let elsewhere = Self.encryptionKey(4, data: Data([0x02] + [UInt8](repeating: 0x42, count: 32))) + let past = Deriver() + let found = try AppConnect.derivableEncryptionKeys( + network: .mainnet, purpose: .encryption, + currentIdentityPublicKeys: [ + elsewhere, Self.encryptionKey(5, data: Self.rotationPoint(0)), Self.encryptionKey(6, data: Self.rotationPoint(1)), + ], + rotation: past.rotation, legacy: past.legacy) + XCTAssertEqual(past.rotations, [0, 1, 2]) + XCTAssertEqual(found.map(\.publicKey), [Self.rotationPoint(0), Self.rotationPoint(1)]) + } + + /// Keys of the other purpose at the same points are not this binding's. + func testKeysOfTheOtherPurposeDoNotCount() throws { + let unrelated = [ + Self.encryptionKey(1, data: Data([0x02] + [UInt8](repeating: 0x42, count: 32))), + Self.encryptionKey(2, data: Data([0x02] + [UInt8](repeating: 0x43, count: 32))), + ] + let decryption = [ + Self.encryptionKey(3, data: Self.rotationPoint(0), purpose: .decryption), + Self.encryptionKey(4, data: Self.rotationPoint(1), purpose: .decryption), + ] + let deriver = Deriver() + _ = try AppConnect.derivableEncryptionKeys( + network: .mainnet, purpose: .encryption, currentIdentityPublicKeys: unrelated + decryption, + rotation: deriver.rotation, legacy: deriver.legacy) + XCTAssertEqual(deriver.rotations, [0]) + // With no current key, a decryption key at the derived point is not + // this binding's key arriving ahead of Platform's read. + let result = try login( + network: .mainnet, keys: [decryption[0]], current: nil, + bindings: [.init(keyId: 3, data: Self.rotationPoint(0), singleContractId: Self.appId)]) + XCTAssertEqual(result.state, .absent) + XCTAssertEqual(result.slot, .register) + } + + // MARK: - Rule 2: keys for the binding, none live + + /// The bug this replaces: a disabled current key of another wallet's + /// read as absent under `latest`, and the login registered a new key. + func testOnlyADisabledForeignKeyLeavesTheSlotOutAndRegistersNothing() throws { + let theirs = Self.encryptionKey(9, data: Data([0x02] + [UInt8](repeating: 0x77, count: 32)), disabled: true) + for rule: AppConnect.CurrentKeyRule in [.latest, .unique] { + let result = try login(rule: rule, keys: [theirs], current: Self.current(theirs)) + XCTAssertEqual(result.state, .notThisWallets, "\(rule)") + XCTAssertEqual(result.slot, .omit, "\(rule)") + XCTAssertNil(result.sentPrivateKey) + } + } + + /// This wallet's own disabled key is not sent (it is not current) and + /// not replaced (that would be a rotation). + func testADisabledKeyOfThisWalletsIsNeitherSentNorReplaced() throws { + let mine = Self.encryptionKey(5, data: Self.rotationPoint(0), disabled: true) + let result = try login(keys: [mine], current: Self.current(mine)) + XCTAssertEqual(result.slot, .omit) + } + + // MARK: - Rule 3: nothing for the binding + + func testWithNothingOnTheIdentityRotationZeroAtTheNewPathIsRegistered() throws { + for network: Network in [.mainnet, .testnet] { + let deriver = Deriver() + let result = try login(network: network, keys: [], current: nil, deriver: deriver) + XCTAssertEqual(deriver.rotations, [0]) + XCTAssertEqual(result.state, .absent, "\(network)") + XCTAssertEqual(result.slot, .register, "\(network)") + XCTAssertEqual(result.derived[0].publicKey, Self.rotationPoint(0), "never the earlier path") + XCTAssertEqual(result.sentPrivateKey, Self.rotationPrivateKey(0)) + } + } + + // MARK: - Slots that are not settled + + func testAStateThatIsNotSettledHasNoSlot() { + for state: AppConnect.EncryptionKeyState in [ + .outOfDate, .absentIfSettled, .notThisWalletsIfSettled, .currentIfSettled(keyId: 5), + ] { + XCTAssertNil(AppConnect.encryptionSlot(for: state, derivedPublicKeys: [], currentIdentityPublicKeys: [])) + } + // A current key the fetched keys do not show as a derived one. + XCTAssertNil(AppConnect.encryptionSlot( + for: .current(keyId: 5), derivedPublicKeys: [Self.rotationPoint(0)], + currentIdentityPublicKeys: [Self.encryptionKey(5, data: Self.legacyPoint)])) + } + + // MARK: - DIP "Key Derivation Vectors", through the wallet's call path + + /// In-memory `WalletStorage`, so the resolver never touches the Keychain. + private final class InMemoryWalletStorage: WalletStorage { + private var mnemonics: [Data: Data] = [:] + + override func storeMnemonic(_ mnemonic: String, for walletId: Data) throws { + mnemonics[walletId] = Data(mnemonic.utf8) + } + + override func retrieveMnemonicUTF8Bytes(for walletId: Data) throws -> Data { + guard let data = mnemonics[walletId], !data.isEmpty else { throw WalletStorageError.mnemonicNotFound } + return data + } + + override func deleteMnemonic(for walletId: Data) throws { + mnemonics[walletId] = nil + } + + override func mnemonicAvailability(for walletId: Data) -> MnemonicAvailability { + mnemonics[walletId] != nil ? .present : .absent + } + } + + @MainActor + func testTheWalletDerivesTheDIPVectors() throws { + let storage = InMemoryWalletStorage() + let walletId = Data(repeating: 0x07, count: 32) + try storage.storeMnemonic( + "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about", + for: walletId) + // The derive goes through the resolver only, never the wallet handle. + let wallet = ManagedPlatformWallet(handle: 0, walletId: walletId) + + func derive( + identityId: Data, contractId: Data, purpose: AppConnectRequest.EncryptionPurpose, + onIdentity: [String] + ) throws -> [String] { + let keyPurpose: KeyPurpose = purpose == .encryption ? .encryption : .decryption + let keys = try onIdentity.enumerated().map { index, hex in + Self.encryptionKey(UInt32(index + 1), data: try XCTUnwrap(Data(hex: hex)), purpose: keyPurpose) + } + let grant = AppConnect.EncryptionGrant( + bindingIndex: 0, binding: .init(contractId: contractId, purpose: purpose)) + return try PlatformDashConnectDataSource.derivableEncryptionKeys( + for: grant, wallet: wallet, identityId: identityId, network: .mainnet, + currentIdentityPublicKeys: keys, storage: storage + ).map { $0.publicKey.toHexString() } + } + + // `m/9'/5'/5'/7'/0'/0x35…'/0x6b…'/1'/{0',1'}` + let rotationZero = "031a882c119e2b1f8e0349b444d877afa2599efeef49a26930fd25518cb6e9d57a" + let rotationOne = "03d0f6f0f48d968b9554d8e7fe467d7135bacf29d5c4994ca593bd10ebeed696f6" + let filled = (Data(repeating: 0x35, count: 32), Data(repeating: 0x6B, count: 32)) + XCTAssertEqual( + try derive(identityId: filled.0, contractId: filled.1, purpose: .encryption, onIdentity: []), + [rotationZero], "rotation 0' only, and no earlier path on mainnet") + XCTAssertEqual( + try derive(identityId: filled.0, contractId: filled.1, purpose: .encryption, onIdentity: [rotationZero, rotationOne]), + [rotationZero, rotationOne]) + + // `m/9'/5'/5'/7'/0'/asc'/desc'/2'/{0',1'}` + let ascending = Data((0 ..< 32).map { UInt8($0) }) + let descending = Data((0 ..< 32).map { UInt8(0xFF - $0) }) + let decryptionZero = "020bcde800f41ad1f924477a9502f111445224cc9ab70114ae4e5099ba02bdd034" + let decryptionOne = "021b97869c21933673076a938337c28848c8bf8094bbe6883e3a4acbf33c639072" + XCTAssertEqual( + try derive(identityId: ascending, contractId: descending, purpose: .decryption, onIdentity: [decryptionZero, decryptionOne]), + [decryptionZero, decryptionOne]) + } +} diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 6e100be33d..4e2044c45f 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -531,7 +531,7 @@ final class AppConnectV2LoginTests: XCTestCase { bindings: [AppConnect.KeyBinding] ) -> AppConnect.EncryptionKeyState { AppConnect.encryptionKeyState( - derivedPublicKey: Self.derivedPoint, + derivedPublicKeys: [Self.derivedPoint], purpose: .encryption, contractId: Self.appId, rule: rule, @@ -569,12 +569,12 @@ final class AppConnectV2LoginTests: XCTestCase { [elsewhere], current: nil, bindings: [.init(keyId: 5, data: elsewhere.data, singleContractId: other)]), .absent) - // Nor is a disabled current key of another wallet's in the way, when - // the latest key registered is current. + // A disabled current key of another wallet's is a key for the app + // with none live (DIP rule 2): nothing is registered beside it. let disabledTheirs = Self.encryptionKey(9, data: Data(repeating: 0x77, count: 33), disabled: true) XCTAssertEqual( encryptionState([disabledTheirs], current: Self.current(9, data: disabledTheirs.data, disabled: true), bindings: []), - .absent) + .notThisWallets) } func testAnotherWalletsKeyIsNeitherSentNorReplaced() { @@ -586,15 +586,15 @@ final class AppConnectV2LoginTests: XCTestCase { .notThisWallets) // One the fetched keys do not show yet stops the login. XCTAssertEqual(encryptionState([], current: Self.current(5, data: theirs.data), bindings: []), .outOfDate) - // One whose bound the store cannot place, behind a disabled current - // key, is no longer current either: a new key shadows nothing, once - // a later read confirms the disabled key is current. + // Behind a disabled current key nothing is registered (DIP rule 2); + // a live key the store cannot place may be a later one with + // Platform's read behind, so a later read confirms it. let disabledCurrent = Self.encryptionKey(9, data: Data(repeating: 0x77, count: 33), disabled: true) XCTAssertEqual( encryptionState( [theirs, disabledCurrent], current: Self.current(9, data: disabledCurrent.data, disabled: true), bindings: []), - .absentIfSettled) + .notThisWalletsIfSettled) // With no current key at all, a key bound to the app would be it: a // key the store cannot place is bound elsewhere, once a later read // agrees. @@ -781,14 +781,16 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertLessThanOrEqual(pauses, 3) return result } + // Behind a disabled current key the slot is left out (DIP rule 2), + // once a later read agrees that no newer key is current. let agreed = try await settle([[.encryption: current]]) - XCTAssertEqual(agreed, [.absent]) + XCTAssertEqual(agreed, [.notThisWallets]) // A lagging node that has lost the disabled key does not settle the // answer. let lagging = try await settle([[:], [:], [:]]) XCTAssertEqual(lagging, [.outOfDate]) let caughtUp = try await settle([[:], [.encryption: current]]) - XCTAssertEqual(caughtUp, [.absent]) + XCTAssertEqual(caughtUp, [.notThisWallets]) // A read that conflicts makes the answer out of date, even if a // later one agrees with the first. let unknown = Self.current(11, data: Data(repeating: 0x88, count: 33)) @@ -803,7 +805,7 @@ final class AppConnectV2LoginTests: XCTestCase { return read }, pause: { _ in }) - XCTAssertEqual(afterAFailedRead, [.absent]) + XCTAssertEqual(afterAFailedRead, [.notThisWallets]) // When no read answers, the failure is thrown. do { _ = try await AppConnect.settle( From ecca052bcd7cfb2e4a55e38f58f18a1bfc2a3ab8 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 13:30:45 +0200 Subject: [PATCH 058/108] feat(dashpay): leave unattributed DashPay profile keys on a disconnect and offer to revoke them A DashPay profile key's bound names no app, so with no grant record a disconnect cannot tell which app was given it. Disconnecting one app used to disable every such key, which could revoke another app's access. A disconnect now leaves them, says how many are still active, and the Connections screen offers "Revoke shared profile access", which disables them all after a confirmation, a PIN prompt and a fresh read of the identity. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 27 +++++-- .../DashConnect/DashConnectDataSource.swift | 15 ++++ .../DashConnect/DashConnectModels.swift | 10 +++ .../PlatformDashConnectDataSource.swift | 76 ++++++++++++++++++- .../UI/DashConnect/ConnectionsScreen.swift | 51 +++++++++++++ .../UI/DashConnect/ConnectionsViewModel.swift | 57 ++++++++++++++ DashWallet/en.lproj/Localizable.strings | 10 +++ .../DashConnect/AppConnectV2LoginTests.swift | 7 +- .../PlatformDashConnectDataSourceTests.swift | 62 +++++++++++++++ 9 files changed, 302 insertions(+), 13 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 43cc13a1f1..11d5711509 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -810,12 +810,10 @@ extension AppConnect { /// The ids of the keys in `keys` that belong to the app's v2 grants: /// bound to a contract the app's owner owns (`appContractIds`, the app's - /// own among them), a document type on one, a contract group that owner - /// owns (`appGroupIds`), or a foreign document type v2 allows (DashPay - /// `profile`). Those are the bindings `ownershipRefusal` lets a request - /// have. The last can be another app's when its record is lost too; it - /// is disabled all the same, since a key left on rather than off is what - /// a disconnect must not do, and that app's next sign-in adds a new one. + /// own among them), a document type on one, or a contract group that + /// owner owns (`appGroupIds`). A key bound to a foreign document type v2 + /// allows (DashPay `profile`) is not among them: that bound names no + /// app, so with no record it may be any app's (`unattributedProfileKeyIds`). static func appsV2KeyIds( appContractIds: Set, appGroupIds: Set, @@ -824,8 +822,7 @@ extension AppConnect { keys.filter { _, bound in switch bound { case .singleContract(let id): return appContractIds.contains(id) - case .documentType(let id, let name): - return appContractIds.contains(id) || allowedForeignDocumentTypes.contains("\(id.toBase58String())/\(name)") + case .documentType(let id, _): return appContractIds.contains(id) case .contractGroup(let id): return appGroupIds.contains(id) } } @@ -833,6 +830,20 @@ extension AppConnect { .sorted() } + /// The ids of the keys in `keys` bound to a foreign document type v2 + /// allows (DashPay `profile`). Every app can be given such a key and the + /// bound does not say which one was, so with no record a disconnect + /// leaves it on; only revoking shared profile access turns these off, + /// for every app that holds one. + static func unattributedProfileKeyIds(keys: [(keyId: UInt32, bound: StoredBound)]) -> [UInt32] { + keys.filter { _, bound in + guard case .documentType(let id, let name) = bound else { return false } + return allowedForeignDocumentTypes.contains("\(id.toBase58String())/\(name)") + } + .map(\.keyId) + .sorted() + } + /// The live v2-shaped keys on the identity that no grant record of it /// names, as a reinstall or a lost record leaves them: HASH160 /// authentication keys at HIGH or CRITICAL with an expiry (every v2 diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index fe502481a8..f72c125409 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -54,6 +54,16 @@ protocol DashConnectDataSource { /// on. func disconnect(id: String, scope: String?) async throws func remove(id: String, scope: String?) async + /// The live DashPay profile keys of the active identity that no grant + /// record names, from the wallet's store: keys App Connect gave some app + /// that a disconnect leaves on, because the bound does not say which app + /// it was. `nil` when the store cannot be read. + func sharedProfileAccess() async -> SharedProfileAccess? + /// Disables those keys, for every app that holds one, after the PIN + /// prompt and a fresh read of the identity, while `scope` (from + /// `sharedProfileAccess`) still names the active wallet. Returns how many + /// were disabled. + func revokeSharedProfileAccess(scope: String) async throws -> Int } /// Why a token purchase failed, and — the part that decides what the UI may @@ -281,6 +291,11 @@ final class MockDashConnectDataSource: DashConnectDataSource { persistAndSend(subject.value.filter { $0.id != id }) } + /// The mock grants no keys, so it holds no shared profile key. + func sharedProfileAccess() async -> SharedProfileAccess? { nil } + + func revokeSharedProfileAccess(scope: String) async throws -> Int { 0 } + private func validateNetwork(_ network: DashConnectNetwork) throws { guard network == supportedNetwork else { throw DashConnectMockError.unsupportedNetwork(expected: supportedNetwork, actual: network) diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 5a1f083208..b3807a7ba5 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -200,6 +200,16 @@ struct DAppConnection: Identifiable, Equatable, Hashable { var scope: String? = nil } +/// The DashPay profile keys App Connect gave apps on the active identity +/// that no grant record names. Such a key's bound names no app, so a +/// disconnect cannot tell whose it is and leaves it on. +struct SharedProfileAccess: Equatable { + let keyCount: Int + /// Names the wallet and network the count was read for; a revoke acts + /// only while it still names the active one. + let scope: String +} + /// A pending request derived from a scanned login QR code. struct ConnectionRequest: Equatable { let appLabel: String diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index a2dfd0dabf..562f447618 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -2328,6 +2328,75 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { try await gated { try await disconnectInTurn(id: id, scope: scope) } } + func sharedProfileAccess() async -> SharedProfileAccess? { + guard let stores = await showActiveWalletRows(), + let context = try? await requireContext(pinnedTo: stores) else { return nil } + let identityId = context.identityId.toBase58String() + guard let bindings = try? Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + else { return nil } + let keyIds = AppConnect.unattributedProfileKeyIds(keys: AppConnect.unrecordedV2Keys( + recordedKeyIds: Self.recordedKeyIds(of: identityId, in: stores), bindings: bindings)) + return SharedProfileAccess(keyCount: keyIds.count, scope: stores.scope) + } + + func revokeSharedProfileAccess(scope: String) async throws -> Int { + try await gated { try await revokeSharedProfileAccessInTurn(scope: scope) } + } + + /// Disables every live DashPay profile key of the active identity that no + /// grant record names, whichever app was given it. The set is read again + /// from Platform after the PIN prompt; nothing from an earlier count is + /// reused. Nothing is turned off while a registration of this identity + /// may still land (its key could be one of them under another record's + /// id), or while the fetched keys are behind the store. + private func revokeSharedProfileAccessInTurn(scope: String) async throws -> Int { + guard let stores = await showActiveWalletRows() else { + throw DashConnectPlatformError.noWallet + } + guard scope == stores.scope else { + throw DashConnectPlatformError.walletChanged + } + var context = try await requireContext(pinnedTo: stores) + try await authorize() + context = try await contextAfterAuthorization(matching: context) + let identityId = context.identityId.toBase58String() + let (currentPublicKeys, revision) = try await refreshedIdentityKeysAndRevision(context: context) + await confirmRegistrations( + identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, + modelContainer: context.modelContainer, in: stores) + for grant in stores.grants.load() where grant.identityId == identityId && grant.isUnconfirmed { + switch Self.registrationOutcome( + of: grant, currentIdentityPublicKeys: currentPublicKeys, identityRevision: revision) { + case .keyLive: throw DashConnectPlatformError.identityKeysOutOfDate + case .mayStillLand: throw DashConnectPlatformError.registrationPending + case .cannotLand, .unknownRevision: break + } + } + let recorded = Self.recordedKeyIds(of: identityId, in: stores) + let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + let keyIds = AppConnect.unattributedProfileKeyIds(keys: AppConnect.unrecordedV2Keys( + recordedKeyIds: recorded, bindings: bindings, currentIdentityPublicKeys: currentPublicKeys)) + // The store keeps every key it was ever given, the fetched view only + // what the node answered with: a stored one the view lacks means the + // view is behind. + let fetchedKeyIds = Set(currentPublicKeys.map { UInt32(bitPattern: $0.keyId) }) + guard AppConnect.unattributedProfileKeyIds(keys: AppConnect.unrecordedV2Keys( + recordedKeyIds: recorded, bindings: bindings)).allSatisfy(fetchedKeyIds.contains) + else { + throw DashConnectPlatformError.identityKeysOutOfDate + } + guard !keyIds.isEmpty else { return 0 } + Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) shared profile key(s)") + try await disableKeys(keyIds, context: context, signer: KeychainSigner(modelContainer: context.modelContainer)) + return keyIds.count + } + + /// The key ids this identity's confirmed grant records name. An + /// unconfirmed record's id may belong to another key by now. + private static func recordedKeyIds(of identityId: String, in stores: Stores) -> Set { + Set(stores.grants.load().filter { $0.identityId == identityId && !$0.isUnconfirmed }.flatMap(\.keyIds)) + } + private func disconnectInTurn(id: String, scope: String?) async throws { guard let stores = await showActiveWalletRows() else { throw DashConnectPlatformError.noWallet @@ -2497,9 +2566,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// that are bound to the app's contract and shaped as this login /// registers them, so the keys a reinstalled wallet kept no record of go /// too. For a one-QR disconnect that includes the shapes App Connect v2 - /// registers (`AppConnect.appsV2KeyIds`), among them a DashPay - /// profile key that may be another app's. A key another wallet gave the - /// app in any other shape stays. + /// registers (`AppConnect.appsV2KeyIds`). A DashPay profile key with no + /// record stays: its bound names no app, so it may be another app's, and + /// only `revokeSharedProfileAccess` turns it off. A key another wallet + /// gave the app in any other shape stays. /// TODO(app-connect-orphan-responses): the response behind a key with no /// record stays on Platform. It can only be found by its request hash, /// which the record held. diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 795b6d9b7d..49a7ae02bb 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -28,6 +28,7 @@ struct ConnectionsScreen: View { private let vc: UINavigationController @StateObject private var viewModel: ConnectionsViewModel + @State private var isConfirmingSharedProfileRevoke = false init(vc: UINavigationController, viewModel: ConnectionsViewModel? = nil) { self.vc = vc @@ -49,6 +50,12 @@ struct ConnectionsScreen: View { .padding(.bottom, 20) content + + if !viewModel.featureUnavailable, let access = viewModel.sharedProfileAccess { + SharedProfileAccessRow(keyCount: access.keyCount) { isConfirmingSharedProfileRevoke = true } + .padding(.horizontal, 20) + .padding(.vertical, 12) + } } if viewModel.isProcessingStateTransition || viewModel.isDisconnecting { @@ -66,6 +73,20 @@ struct ConnectionsScreen: View { } .background(Color.primaryBackground) .navigationBarHidden(true) + .confirmationDialog( + NSLocalizedString("Revoke shared profile access?", comment: "DashConnect"), + isPresented: $isConfirmingSharedProfileRevoke, + titleVisibility: .visible + ) { + Button(NSLocalizedString("Revoke shared profile access", comment: "DashConnect"), role: .destructive) { + viewModel.revokeSharedProfileAccess() + } + Button(NSLocalizedString("Cancel", comment: ""), role: .cancel) {} + } message: { + Text(NSLocalizedString( + "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again.", + comment: "DashConnect")) + } .alert(item: messageBinding) { message in Alert( title: Text(message.title), @@ -230,3 +251,33 @@ struct ConnectionsScreen: View { ) ) } + +/// The DashPay profile keys on the active identity that no connection +/// accounts for, and the way to turn them all off. A disconnect leaves them, +/// since their bound does not say which app was given them. +private struct SharedProfileAccessRow: View { + let keyCount: Int + let onRevoke: () -> Void + + var body: some View { + HStack(spacing: 12) { + VStack(alignment: .leading, spacing: 2) { + Text(NSLocalizedString("Shared profile access", comment: "DashConnect")) + .dashFont(.subhead) + .foregroundStyle(Color.dash.primaryText) + Text(String( + format: NSLocalizedString("DashPay profile keys no connection accounts for: %d", comment: "DashConnect"), + keyCount)) + .dashFont(.footnote) + .foregroundStyle(Color.dash.tertiaryText) + } + .frame(maxWidth: .infinity, alignment: .leading) + + Button(NSLocalizedString("Revoke", comment: "DashConnect"), role: .destructive, action: onRevoke) + .dashFont(.subhead) + .frame(minWidth: 44, minHeight: 44) + } + .padding(.horizontal, 14) + .padding(.vertical, 12) + } +} diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 4c902b1e8f..d793c1c7ab 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -57,6 +57,9 @@ final class ConnectionsViewModel: ObservableObject { /// `isProcessingStateTransition`: a `dash-st:` task clears that one when /// it finishes, which would lift the guard while a disconnect is still out. @Published private(set) var isDisconnecting = false + /// The DashPay profile keys on the active identity that no connection + /// accounts for; `nil` when there are none or they could not be read. + @Published private(set) var sharedProfileAccess: SharedProfileAccess? @Published var message: ConnectionsScreenMessage? /// Failure of the last approve attempt, rendered **inside** the approve sheet. /// A screen-level `.alert` cannot appear over a presented sheet, so routing this @@ -112,10 +115,21 @@ final class ConnectionsViewModel: ObservableObject { .receive(on: DispatchQueue.main) .sink { [weak self] in self?.connections = $0.sorted(by: { $0.updatedAt > $1.updatedAt }) + self?.refreshSharedProfileAccess() } .store(in: &cancellables) } + /// Reads the shared profile keys again from the wallet's store. + func refreshSharedProfileAccess() { + guard !featureUnavailable else { return } + Task { [weak self] in + guard let self else { return } + let access = await self.dataSource.sharedProfileAccess() + self.sharedProfileAccess = (access?.keyCount ?? 0) > 0 ? access : nil + } + } + func onQRScanned(_ content: String) { receive(content, byLink: false) } @@ -394,7 +408,50 @@ final class ConnectionsViewModel: ObservableObject { text: String( format: NSLocalizedString("Could not disconnect: %@", comment: "DashConnect"), error.localizedDescription)) + return + } + let access = await self.dataSource.sharedProfileAccess() + self.sharedProfileAccess = (access?.keyCount ?? 0) > 0 ? access : nil + if let access = self.sharedProfileAccess { + self.message = ConnectionsScreenMessage( + kind: .success, + text: String( + format: NSLocalizedString( + "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access.", + comment: "DashConnect"), + access.keyCount)) + } + } + } + + /// Disables every DashPay profile key no connection accounts for, for + /// every app that holds one. Same guards as `disconnect`: it signs an + /// identity update. + func revokeSharedProfileAccess() { + guard let access = sharedProfileAccess, !isDisconnecting, !isProcessingStateTransition, !isApproving, + !isApprovingPurchase, !isResolvingRequest, pendingRequest == nil, pendingTokenPurchase == nil + else { return } + isDisconnecting = true + Task { [weak self] in + guard let self else { return } + defer { self.isDisconnecting = false } + do { + let disabled = try await self.dataSource.revokeSharedProfileAccess(scope: access.scope) + self.message = ConnectionsScreenMessage( + kind: .success, + text: disabled > 0 + ? String( + format: NSLocalizedString("DashPay profile keys revoked: %d.", comment: "DashConnect"), + disabled) + : NSLocalizedString("No DashPay profile key needed revoking.", comment: "DashConnect")) + } catch { + self.message = ConnectionsScreenMessage( + kind: .error, + text: String( + format: NSLocalizedString("Could not revoke shared profile access: %@", comment: "DashConnect"), + error.localizedDescription)) } + self.refreshSharedProfileAccess() } } diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index de10a2346c..a7f84b4416 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6112,6 +6112,16 @@ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"Revoke" = "Revoke"; "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 4e2044c45f..a29de5b91c 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -411,12 +411,15 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertEqual(candidates.groups, [group, otherGroup]) XCTAssertEqual( AppConnect.appsV2KeyIds(appContractIds: [app], appGroupIds: [group], keys: unrecorded), - [1, 2, 3, 5]) + [1, 2, 3]) // Another contract of the app's owner: a binding the request could // have had, so its key goes too. XCTAssertEqual( AppConnect.appsV2KeyIds(appContractIds: [app, other], appGroupIds: [group], keys: unrecorded), - [1, 2, 3, 5, 11]) + [1, 2, 3, 11]) + // The DashPay profile key names no app: it is never the app's, only + // shared, and the contact-request type v2 does not allow is neither. + XCTAssertEqual(AppConnect.unattributedProfileKeyIds(keys: unrecorded), [5]) // A key the store cannot place is the disconnect's stop, not a guess. XCTAssertEqual( AppConnect.unrecordedV2Keys( diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 20b264d930..fcc84e96c6 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1372,6 +1372,42 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertNil(viewModel.message) } + /// A disconnect that leaves DashPay profile keys no connection accounts + /// for says so, and the screen offers to revoke them; the revoke goes + /// with the scope the count was read for and clears the offer. + func testADisconnectThatLeavesSharedProfileKeysOffersToRevokeThem() async { + let spy = PurchaseApprovalSpy() + spy.sharedAccess = SharedProfileAccess(keyCount: 2, scope: "wallet-a t") + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.disconnect(Self.connection) + await waitUntil { !viewModel.isDisconnecting && viewModel.message != nil } + + XCTAssertEqual(viewModel.sharedProfileAccess, SharedProfileAccess(keyCount: 2, scope: "wallet-a t")) + XCTAssertEqual(viewModel.message?.text.contains("2"), true) + + viewModel.revokeSharedProfileAccess() + await waitUntil { !viewModel.isDisconnecting && viewModel.sharedProfileAccess == nil } + + XCTAssertEqual(spy.revokedScopes, ["wallet-a t"]) + XCTAssertEqual(viewModel.message?.kind, .success) + } + + /// With nothing shared there is nothing to offer, and a revoke asks + /// nothing of the data source. + func testWithoutSharedProfileKeysNothingIsOffered() async { + let spy = PurchaseApprovalSpy() + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + spy.sharedAccess = SharedProfileAccess(keyCount: 0, scope: "wallet-a t") + viewModel.refreshSharedProfileAccess() + try? await Task.sleep(nanoseconds: 50_000_000) + + viewModel.revokeSharedProfileAccess() + + XCTAssertNil(viewModel.sharedProfileAccess) + XCTAssertEqual(spy.revokedScopes, []) + } + /// With the login unresolved the sheet's action asks again and approves /// nothing. func testAnUnresolvedLoginIsAskedForAgainInsteadOfApproved() async { @@ -1660,6 +1696,30 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { func remove(id: String, scope: String?) async { XCTFail("remove is not part of the purchase approval flow") } + + private var storedSharedAccess: SharedProfileAccess? + private var storedRevokedScopes: [String] = [] + + /// What `sharedProfileAccess` reports; a revoke clears it. + var sharedAccess: SharedProfileAccess? { + get { lock.withLock { storedSharedAccess } } + set { lock.withLock { storedSharedAccess = newValue } } + } + + var revokedScopes: [String] { + lock.withLock { storedRevokedScopes } + } + + func sharedProfileAccess() async -> SharedProfileAccess? { sharedAccess } + + func revokeSharedProfileAccess(scope: String) async throws -> Int { + lock.withLock { + storedRevokedScopes.append(scope) + let count = storedSharedAccess?.keyCount ?? 0 + storedSharedAccess = nil + return count + } + } } /// A `DashConnectDataSource` for the login approval: every QR is the sample @@ -1724,6 +1784,8 @@ private final class LoginApprovalSpy: DashConnectDataSource { } func remove(id: String, scope: String?) async {} + func sharedProfileAccess() async -> SharedProfileAccess? { nil } + func revokeSharedProfileAccess(scope: String) async throws -> Int { 0 } } /// The URLs a view model asked to open, in order. From 2b13a810e50a807e82cb8e345bab427b4f96e7b8 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 13:42:38 +0200 Subject: [PATCH 059/108] fix(dashpay): pin the shared profile revoke to its identity and refuse an untrusted view - The count carries the identity it was read for; the revoke refuses another. - A count the store could not read is shown as unknown, not as none. - The revoke refuses a fresh view with a live v2 key the store cannot place, as the disconnect does, and no longer waits on unrelated registrations: a v2 approval records its keys only once they land, so a pending record is never a profile key. - Expired keys are neither counted nor disabled. - The store is reloaded after the disable, so the row clears. - Only the latest count read is shown, and only a one-QR disconnect mentions the keys. - The key selection moved into AppConnect and is tested there. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 3 + .../DashConnect/AppConnectV2Login.swift | 40 ++++++ .../DashConnect/DashConnectDataSource.swift | 11 +- .../DashConnect/DashConnectModels.swift | 8 +- .../PlatformDashConnectDataSource.swift | 93 +++++++------ .../UI/DashConnect/ConnectionsScreen.swift | 11 +- .../UI/DashConnect/ConnectionsViewModel.swift | 56 ++++++-- DashWallet/en.lproj/Localizable.strings | 2 + .../DashConnect/AppConnectV2LoginTests.swift | 55 +++++++- .../PlatformDashConnectDataSourceTests.swift | 124 ++++++++++++++---- 10 files changed, 304 insertions(+), 99 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index c02dcfbccc..eb7c768060 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -246,6 +246,9 @@ enum AppConnect { /// The stored key has the shape of an App Connect v2 auth key: /// HASH160 authentication at HIGH or CRITICAL, with an expiry. var isV2AuthKeyShaped = false + /// When the stored key stops working, in milliseconds since 1970; + /// nil for a key with no expiry. + var expiresAt: Int64? = nil } /// A key's contract bound, as the wallet's store records it. diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 11d5711509..9c1837ea01 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -844,6 +844,46 @@ extension AppConnect { .sorted() } + /// The unattributed profile keys the wallet's store shows as live and + /// not yet expired: what the Connections screen counts. + static func storedSharedProfileKeyIds( + recordedKeyIds: Set, + bindings: [KeyBinding], + nowMilliseconds: Int64 + ) -> [UInt32] { + let unexpired = Set(bindings.filter { ($0.expiresAt ?? 0) > nowMilliseconds }.map(\.keyId)) + return unattributedProfileKeyIds(keys: unrecordedV2Keys(recordedKeyIds: recordedKeyIds, bindings: bindings)) + .filter(unexpired.contains) + } + + /// The keys revoking shared profile access disables, from a fresh view of + /// the identity: live, not yet expired, bound to an allowlisted foreign + /// document type, and named by no confirmed record (`recordedKeyIds`). + /// `nil` when the view cannot be trusted: a live v2-shaped key no record + /// names has no readable stored bound, so it may be one of them; or the + /// store holds one of them that the view lacks, so the node is behind. + static func sharedProfileKeyIdsToDisable( + recordedKeyIds: Set, + bindings: [KeyBinding], + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + nowMilliseconds: Int64 + ) -> [UInt32]? { + let hasUnplacedKey = currentIdentityPublicKeys.contains { key in + let keyId = UInt32(bitPattern: key.keyId) + return isLiveAppConnectAuthKey(key) && key.expiresAt != nil && !recordedKeyIds.contains(keyId) + && !bindings.contains { $0.keyId == keyId && $0.data == key.data && !$0.hasUnreadableBound } + } + let fetchedKeyIds = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) + guard !hasUnplacedKey, storedSharedProfileKeyIds( + recordedKeyIds: recordedKeyIds, bindings: bindings, nowMilliseconds: nowMilliseconds + ).allSatisfy(fetchedKeyIds.contains) else { return nil } + let unexpired = Set(currentIdentityPublicKeys + .filter { ($0.expiresAt ?? 0) > nowMilliseconds }.map { UInt32(bitPattern: $0.keyId) }) + return unattributedProfileKeyIds(keys: unrecordedV2Keys( + recordedKeyIds: recordedKeyIds, bindings: bindings, currentIdentityPublicKeys: currentIdentityPublicKeys)) + .filter(unexpired.contains) + } + /// The live v2-shaped keys on the identity that no grant record of it /// names, as a reinstall or a lost record leaves them: HASH160 /// authentication keys at HIGH or CRITICAL with an expiry (every v2 diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index f72c125409..cd0c560566 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -57,13 +57,12 @@ protocol DashConnectDataSource { /// The live DashPay profile keys of the active identity that no grant /// record names, from the wallet's store: keys App Connect gave some app /// that a disconnect leaves on, because the bound does not say which app - /// it was. `nil` when the store cannot be read. + /// it was. `nil` when there is no active wallet or identity. func sharedProfileAccess() async -> SharedProfileAccess? /// Disables those keys, for every app that holds one, after the PIN - /// prompt and a fresh read of the identity, while `scope` (from - /// `sharedProfileAccess`) still names the active wallet. Returns how many - /// were disabled. - func revokeSharedProfileAccess(scope: String) async throws -> Int + /// prompt and a fresh read of the identity, while `access` still names + /// the active wallet and identity. Returns how many were disabled. + func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int } /// Why a token purchase failed, and — the part that decides what the UI may @@ -294,7 +293,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { /// The mock grants no keys, so it holds no shared profile key. func sharedProfileAccess() async -> SharedProfileAccess? { nil } - func revokeSharedProfileAccess(scope: String) async throws -> Int { 0 } + func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int { 0 } private func validateNetwork(_ network: DashConnectNetwork) throws { guard network == supportedNetwork else { diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index b3807a7ba5..03476d9790 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -204,10 +204,12 @@ struct DAppConnection: Identifiable, Equatable, Hashable { /// that no grant record names. Such a key's bound names no app, so a /// disconnect cannot tell whose it is and leaves it on. struct SharedProfileAccess: Equatable { - let keyCount: Int - /// Names the wallet and network the count was read for; a revoke acts - /// only while it still names the active one. + /// `nil` when the wallet's store could not be read: unknown, not none. + let keyCount: Int? + /// The wallet and network, and the identity, the count was read for; a + /// revoke acts only while they are still the active ones. let scope: String + let identityId: String } /// A pending request derived from a scanned login QR code. diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 562f447618..76403e75b7 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -2332,62 +2332,60 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard let stores = await showActiveWalletRows(), let context = try? await requireContext(pinnedTo: stores) else { return nil } let identityId = context.identityId.toBase58String() - guard let bindings = try? Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) - else { return nil } - let keyIds = AppConnect.unattributedProfileKeyIds(keys: AppConnect.unrecordedV2Keys( - recordedKeyIds: Self.recordedKeyIds(of: identityId, in: stores), bindings: bindings)) - return SharedProfileAccess(keyCount: keyIds.count, scope: stores.scope) - } - - func revokeSharedProfileAccess(scope: String) async throws -> Int { - try await gated { try await revokeSharedProfileAccessInTurn(scope: scope) } - } - - /// Disables every live DashPay profile key of the active identity that no - /// grant record names, whichever app was given it. The set is read again - /// from Platform after the PIN prompt; nothing from an earlier count is - /// reused. Nothing is turned off while a registration of this identity - /// may still land (its key could be one of them under another record's - /// id), or while the fetched keys are behind the store. - private func revokeSharedProfileAccessInTurn(scope: String) async throws -> Int { + let keyCount = (try? Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer)) + .map { bindings in + AppConnect.storedSharedProfileKeyIds( + recordedKeyIds: Self.recordedKeyIds(of: identityId, in: stores), + bindings: bindings, + nowMilliseconds: Self.nowMilliseconds(now())).count + } + return SharedProfileAccess(keyCount: keyCount, scope: stores.scope, identityId: identityId) + } + + func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int { + try await gated { try await revokeSharedProfileAccessInTurn(access) } + } + + /// Disables every live DashPay profile key of the identity `access` was + /// read for that no confirmed grant record names, whichever app was given + /// it. The set is read again from Platform after the PIN prompt; nothing + /// from the count is reused. Nothing is turned off while that read cannot + /// be trusted (`AppConnect.sharedProfileKeyIdsToDisable`). + /// TODO(app-connect-v2-pending-record): a v2 approval writes its record + /// only once its update is seen to land, so the profile key of one whose + /// outcome was unknown when it failed has no record and is disabled here + /// like any other. + private func revokeSharedProfileAccessInTurn(_ access: SharedProfileAccess) async throws -> Int { guard let stores = await showActiveWalletRows() else { throw DashConnectPlatformError.noWallet } - guard scope == stores.scope else { + var context = try await requireContext(pinnedTo: stores) + guard access.scope == stores.scope, access.identityId == context.identityId.toBase58String() else { throw DashConnectPlatformError.walletChanged } - var context = try await requireContext(pinnedTo: stores) try await authorize() context = try await contextAfterAuthorization(matching: context) let identityId = context.identityId.toBase58String() - let (currentPublicKeys, revision) = try await refreshedIdentityKeysAndRevision(context: context) + let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) + // A registration whose key has turned up is confirmed, and its key is + // then the app's, not shared. await confirmRegistrations( identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, modelContainer: context.modelContainer, in: stores) - for grant in stores.grants.load() where grant.identityId == identityId && grant.isUnconfirmed { - switch Self.registrationOutcome( - of: grant, currentIdentityPublicKeys: currentPublicKeys, identityRevision: revision) { - case .keyLive: throw DashConnectPlatformError.identityKeysOutOfDate - case .mayStillLand: throw DashConnectPlatformError.registrationPending - case .cannotLand, .unknownRevision: break - } - } - let recorded = Self.recordedKeyIds(of: identityId, in: stores) - let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) - let keyIds = AppConnect.unattributedProfileKeyIds(keys: AppConnect.unrecordedV2Keys( - recordedKeyIds: recorded, bindings: bindings, currentIdentityPublicKeys: currentPublicKeys)) - // The store keeps every key it was ever given, the fetched view only - // what the node answered with: a stored one the view lacks means the - // view is behind. - let fetchedKeyIds = Set(currentPublicKeys.map { UInt32(bitPattern: $0.keyId) }) - guard AppConnect.unattributedProfileKeyIds(keys: AppConnect.unrecordedV2Keys( - recordedKeyIds: recorded, bindings: bindings)).allSatisfy(fetchedKeyIds.contains) - else { + guard let keyIds = AppConnect.sharedProfileKeyIdsToDisable( + recordedKeyIds: Self.recordedKeyIds(of: identityId, in: stores), + bindings: try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer), + currentIdentityPublicKeys: currentPublicKeys, + nowMilliseconds: Self.nowMilliseconds(now()) + ) else { throw DashConnectPlatformError.identityKeysOutOfDate } guard !keyIds.isEmpty else { return 0 } Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) shared profile key(s)") try await disableKeys(keyIds, context: context, signer: KeychainSigner(modelContainer: context.modelContainer)) + // The reload writes the disabled keys to the store the count is read + // from. The keys are off either way. + _ = try? await refreshedIdentityPublicKeys(context: context) return keyIds.count } @@ -2397,6 +2395,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Set(stores.grants.load().filter { $0.identityId == identityId && !$0.isUnconfirmed }.flatMap(\.keyIds)) } + private static func nowMilliseconds(_ date: Date) -> Int64 { + Int64((date.timeIntervalSince1970 * 1000).rounded()) + } + private func disconnectInTurn(id: String, scope: String?) async throws { guard let stores = await showActiveWalletRows() else { throw DashConnectPlatformError.noWallet @@ -2739,10 +2741,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // group they are bound to is the app's if the app's owner owns // it, which only the network says; if it cannot be read, // nothing is turned off and the row stays. - // Confirmed records only: an unconfirmed one's id may belong to - // another key by now. - let recordedKeyIds = Set(stores.grants.load() - .filter { $0.identityId == identityId && !$0.isUnconfirmed }.flatMap(\.keyIds)) + let recordedKeyIds = Self.recordedKeyIds(of: identityId, in: stores) let unrecorded = AppConnect.unrecordedV2Keys( recordedKeyIds: recordedKeyIds, bindings: bindings, currentIdentityPublicKeys: currentPublicKeys) // The store keeps every key it was ever given, the fetched view @@ -2888,8 +2887,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if AppConnect.holdsLiveSessionKey(appContractId: appContractId, bindings: bindings) { return true } let otherIdentityId = other.identityId.toBase58String() let unrecorded = AppConnect.unrecordedV2Keys( - recordedKeyIds: Set(context.stores.grants.load() - .filter { $0.identityId == otherIdentityId && !$0.isUnconfirmed }.flatMap(\.keyIds)), + recordedKeyIds: Self.recordedKeyIds(of: otherIdentityId, in: context.stores), bindings: bindings) if !unrecorded.isEmpty { let candidates = AppConnect.unrecordedV2KeyBoundIds(appContractId: appContractId, keys: unrecorded) @@ -3502,7 +3500,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { isV2AuthKeyShaped: $0.keyTypeEnum == .ecdsaHash160 && $0.purposeEnum == .authentication && ($0.securityLevelEnum == .high || $0.securityLevelEnum == .critical) - && $0.expiresAt != nil + && $0.expiresAt != nil, + expiresAt: $0.expiresAt ) } } diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 49a7ae02bb..dffbad4347 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -256,7 +256,8 @@ struct ConnectionsScreen: View { /// accounts for, and the way to turn them all off. A disconnect leaves them, /// since their bound does not say which app was given them. private struct SharedProfileAccessRow: View { - let keyCount: Int + /// `nil` when the store could not be read. + let keyCount: Int? let onRevoke: () -> Void var body: some View { @@ -265,9 +266,11 @@ private struct SharedProfileAccessRow: View { Text(NSLocalizedString("Shared profile access", comment: "DashConnect")) .dashFont(.subhead) .foregroundStyle(Color.dash.primaryText) - Text(String( - format: NSLocalizedString("DashPay profile keys no connection accounts for: %d", comment: "DashConnect"), - keyCount)) + Text(keyCount.map { + String( + format: NSLocalizedString("DashPay profile keys no connection accounts for: %d", comment: "DashConnect"), + $0) + } ?? NSLocalizedString("DashPay profile keys could not be checked", comment: "DashConnect")) .dashFont(.footnote) .foregroundStyle(Color.dash.tertiaryText) } diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index d793c1c7ab..d448cba6d2 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -58,8 +58,12 @@ final class ConnectionsViewModel: ObservableObject { /// it finishes, which would lift the guard while a disconnect is still out. @Published private(set) var isDisconnecting = false /// The DashPay profile keys on the active identity that no connection - /// accounts for; `nil` when there are none or they could not be read. + /// accounts for: `nil` when there are none or no identity is active, a + /// `nil` `keyCount` when the store could not be read. @Published private(set) var sharedProfileAccess: SharedProfileAccess? + /// Each read of `sharedProfileAccess` takes the next number; only the + /// latest one started is shown, so a slow older read cannot overwrite it. + private var sharedProfileAccessGeneration = 0 @Published var message: ConnectionsScreenMessage? /// Failure of the last approve attempt, rendered **inside** the approve sheet. /// A screen-level `.alert` cannot appear over a presented sheet, so routing this @@ -123,11 +127,21 @@ final class ConnectionsViewModel: ObservableObject { /// Reads the shared profile keys again from the wallet's store. func refreshSharedProfileAccess() { guard !featureUnavailable else { return } - Task { [weak self] in - guard let self else { return } - let access = await self.dataSource.sharedProfileAccess() - self.sharedProfileAccess = (access?.keyCount ?? 0) > 0 ? access : nil + Task { [weak self] in await self?.readSharedProfileAccess() } + } + + /// Reads the shared profile keys and shows them, unless a later read + /// started meanwhile. Returns what this read found. + @discardableResult + private func readSharedProfileAccess() async -> SharedProfileAccess? { + sharedProfileAccessGeneration += 1 + let generation = sharedProfileAccessGeneration + let read = await dataSource.sharedProfileAccess() + let access = read?.keyCount == 0 ? nil : read + if generation == sharedProfileAccessGeneration { + sharedProfileAccess = access } + return access } func onQRScanned(_ content: String) { @@ -410,16 +424,24 @@ final class ConnectionsViewModel: ObservableObject { error.localizedDescription)) return } - let access = await self.dataSource.sharedProfileAccess() - self.sharedProfileAccess = (access?.keyCount ?? 0) > 0 ? access : nil - if let access = self.sharedProfileAccess { + let access = await self.readSharedProfileAccess() + // Only a one-QR login gives an app a DashPay profile key, so only + // its disconnect can leave one behind. + guard connection.loginKind == .oneQR, let access else { return } + if let keyCount = access.keyCount { self.message = ConnectionsScreenMessage( kind: .success, text: String( format: NSLocalizedString( "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access.", comment: "DashConnect"), - access.keyCount)) + keyCount)) + } else { + self.message = ConnectionsScreenMessage( + kind: .success, + text: NSLocalizedString( + "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked.", + comment: "DashConnect")) } } } @@ -428,15 +450,21 @@ final class ConnectionsViewModel: ObservableObject { /// every app that holds one. Same guards as `disconnect`: it signs an /// identity update. func revokeSharedProfileAccess() { - guard let access = sharedProfileAccess, !isDisconnecting, !isProcessingStateTransition, !isApproving, - !isApprovingPurchase, !isResolvingRequest, pendingRequest == nil, pendingTokenPurchase == nil - else { return } + guard !isDisconnecting, !isProcessingStateTransition, !isApproving, !isApprovingPurchase, + !isResolvingRequest, pendingRequest == nil, pendingTokenPurchase == nil else { return } + guard let access = sharedProfileAccess else { + // A read finished while the confirmation was up and found none. + message = ConnectionsScreenMessage( + kind: .success, + text: NSLocalizedString("No DashPay profile key needed revoking.", comment: "DashConnect")) + return + } isDisconnecting = true Task { [weak self] in guard let self else { return } defer { self.isDisconnecting = false } do { - let disabled = try await self.dataSource.revokeSharedProfileAccess(scope: access.scope) + let disabled = try await self.dataSource.revokeSharedProfileAccess(access) self.message = ConnectionsScreenMessage( kind: .success, text: disabled > 0 @@ -451,7 +479,7 @@ final class ConnectionsViewModel: ObservableObject { format: NSLocalizedString("Could not revoke shared profile access: %@", comment: "DashConnect"), error.localizedDescription)) } - self.refreshSharedProfileAccess() + await self.readSharedProfileAccess() } } diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index a7f84b4416..fbc414d73f 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6122,6 +6122,8 @@ "Shared profile access" = "Shared profile access"; "DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; "Revoke" = "Revoke"; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index a29de5b91c..7bffa9d40b 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -365,8 +365,8 @@ final class AppConnectV2LoginTests: XCTestCase { } /// A disconnect finds the app's v2 keys that no record names: bound to - /// its contract, a document type on it, a group its owner owns, or the - /// allowlisted DashPay profile; with an expiry; HIGH or CRITICAL. + /// its contract, a document type on it, or a group its owner owns; with + /// an expiry; HIGH or CRITICAL. The allowlisted DashPay profile is shared. func testADisconnectFindsTheAppsV2KeysThatNoRecordNames() { let app = Data(repeating: 0xA1, count: 32) let group = Data(repeating: 0xB2, count: 32) @@ -441,6 +441,57 @@ final class AppConnectV2LoginTests: XCTestCase { [3], "a CRITICAL HASH160 key the store does not show stops a disconnect too") } + /// Revoking shared profile access takes the live, unexpired DashPay + /// profile keys no confirmed record names, and refuses a view of the + /// identity it cannot trust. + func testRevokingSharedProfileAccessTakesOnlyUnattributedLiveProfileKeys() { + let dashPay = Data.identifier(fromBase58: AppConnect.dashPayContractId)! + let app = Data(repeating: 0xA1, count: 32) + let now: Int64 = 5_000 + func key(_ id: Int32, expiresAt: Int64? = 9_000, disabled: Bool = false) -> ManagedIdentity.IdentityPublicKeyInfo { + ManagedIdentity.IdentityPublicKeyInfo( + keyId: id, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, readOnly: false, + disabledAt: disabled ? 1 : nil, data: Data([UInt8(id)]), + totalBudget: nil, expiresAt: expiresAt) + } + func binding(_ id: UInt32, _ bound: AppConnect.StoredBound?, expiresAt: Int64? = 9_000, + unreadable: Bool = false) -> AppConnect.KeyBinding { + var binding = AppConnect.KeyBinding(keyId: id, data: Data([UInt8(id)]), singleContractId: nil, + hasUnreadableBound: unreadable, bound: bound) + binding.isV2AuthKeyShaped = true + binding.expiresAt = expiresAt + return binding + } + let profile = AppConnect.StoredBound.documentType(contractId: dashPay, name: "profile") + let keys = [key(1), key(2), key(3, expiresAt: 4_000), key(4), key(5)] + let bindings = [ + binding(1, profile), binding(2, profile), binding(3, profile, expiresAt: 4_000), + binding(4, .singleContract(app)), binding(5, profile), + ] + + XCTAssertEqual( + AppConnect.sharedProfileKeyIdsToDisable( + recordedKeyIds: [5], bindings: bindings, currentIdentityPublicKeys: keys, nowMilliseconds: now), + [1, 2], "not the expired one, the app's own, or the recorded one") + XCTAssertEqual( + AppConnect.storedSharedProfileKeyIds(recordedKeyIds: [5], bindings: bindings, nowMilliseconds: now), + [1, 2]) + // A live v2 key the store cannot place may be a profile key. + XCTAssertNil(AppConnect.sharedProfileKeyIdsToDisable( + recordedKeyIds: [], bindings: [binding(1, nil, unreadable: true)], + currentIdentityPublicKeys: [key(1)], nowMilliseconds: now)) + XCTAssertNil(AppConnect.sharedProfileKeyIdsToDisable( + recordedKeyIds: [], bindings: [], currentIdentityPublicKeys: [key(1)], nowMilliseconds: now)) + // A stored profile key the fetched view lacks: the node is behind. + XCTAssertNil(AppConnect.sharedProfileKeyIdsToDisable( + recordedKeyIds: [], bindings: [binding(1, profile), binding(2, profile)], + currentIdentityPublicKeys: [key(1)], nowMilliseconds: now)) + // Disabled on Platform: nothing to do. + XCTAssertEqual(AppConnect.sharedProfileKeyIdsToDisable( + recordedKeyIds: [], bindings: [binding(1, profile)], + currentIdentityPublicKeys: [key(1, disabled: true)], nowMilliseconds: now), []) + } + /// A v2 grant's CRITICAL group key is disabled under its recorded id, /// but only while the store shows that key bound to a group: a CRITICAL /// key under a recorded id with no such record is not taken for it. diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index fcc84e96c6..5b76ab2e2e 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1372,40 +1372,99 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertNil(viewModel.message) } - /// A disconnect that leaves DashPay profile keys no connection accounts - /// for says so, and the screen offers to revoke them; the revoke goes - /// with the scope the count was read for and clears the offer. + /// A one-QR disconnect that leaves DashPay profile keys no connection + /// accounts for says so, and the screen offers to revoke them; the revoke + /// goes with the access the count was read for and clears the offer. func testADisconnectThatLeavesSharedProfileKeysOffersToRevokeThem() async { let spy = PurchaseApprovalSpy() - spy.sharedAccess = SharedProfileAccess(keyCount: 2, scope: "wallet-a t") + let access = SharedProfileAccess(keyCount: 2, scope: "wallet-a t", identityId: "identity-a") + spy.sharedAccess = access let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + var oneQR = Self.connection + oneQR.loginKind = .oneQR - viewModel.disconnect(Self.connection) + viewModel.disconnect(oneQR) await waitUntil { !viewModel.isDisconnecting && viewModel.message != nil } - XCTAssertEqual(viewModel.sharedProfileAccess, SharedProfileAccess(keyCount: 2, scope: "wallet-a t")) + XCTAssertEqual(viewModel.sharedProfileAccess, access) XCTAssertEqual(viewModel.message?.text.contains("2"), true) + viewModel.message = nil viewModel.revokeSharedProfileAccess() - await waitUntil { !viewModel.isDisconnecting && viewModel.sharedProfileAccess == nil } + await waitUntil { !viewModel.isDisconnecting && viewModel.message != nil } - XCTAssertEqual(spy.revokedScopes, ["wallet-a t"]) + XCTAssertEqual(spy.revoked, [access]) + XCTAssertNil(viewModel.sharedProfileAccess) XCTAssertEqual(viewModel.message?.kind, .success) } - /// With nothing shared there is nothing to offer, and a revoke asks - /// nothing of the data source. + /// A two-QR login gives an app no DashPay profile key, so its disconnect + /// says nothing about them; the row still shows them. + func testATwoQRDisconnectSaysNothingAboutSharedProfileKeys() async { + let spy = PurchaseApprovalSpy() + spy.sharedAccess = SharedProfileAccess(keyCount: 1, scope: "wallet-a t", identityId: "identity-a") + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.disconnect(Self.connection) + await waitUntil { !viewModel.isDisconnecting && viewModel.sharedProfileAccess != nil } + + XCTAssertNil(viewModel.message) + XCTAssertEqual(viewModel.sharedProfileAccess?.keyCount, 1) + } + + /// A count that could not be read is shown as unknown, not as none. + func testAnUnreadableCountIsShownAsUnknown() async { + let spy = PurchaseApprovalSpy() + spy.sharedAccess = SharedProfileAccess(keyCount: nil, scope: "wallet-a t", identityId: "identity-a") + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + var oneQR = Self.connection + oneQR.loginKind = .oneQR + + viewModel.disconnect(oneQR) + await waitUntil { !viewModel.isDisconnecting && viewModel.message != nil } + + XCTAssertNotNil(viewModel.sharedProfileAccess) + XCTAssertNil(viewModel.sharedProfileAccess?.keyCount) + XCTAssertEqual(viewModel.message?.text.contains("could not be checked"), true) + } + + /// With none shared there is nothing to offer, and a revoke asks nothing + /// of the data source. func testWithoutSharedProfileKeysNothingIsOffered() async { let spy = PurchaseApprovalSpy() + spy.sharedAccess = SharedProfileAccess(keyCount: 1, scope: "wallet-a t", identityId: "identity-a") let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - spy.sharedAccess = SharedProfileAccess(keyCount: 0, scope: "wallet-a t") + await waitUntil { viewModel.sharedProfileAccess != nil } + XCTAssertNotNil(viewModel.sharedProfileAccess) + spy.sharedAccess = SharedProfileAccess(keyCount: 0, scope: "wallet-a t", identityId: "identity-a") + viewModel.refreshSharedProfileAccess() - try? await Task.sleep(nanoseconds: 50_000_000) + await waitUntil { viewModel.sharedProfileAccess == nil } + XCTAssertNil(viewModel.sharedProfileAccess) viewModel.revokeSharedProfileAccess() + XCTAssertEqual(spy.revoked, []) + } - XCTAssertNil(viewModel.sharedProfileAccess) - XCTAssertEqual(spy.revokedScopes, []) + /// A failed revoke is reported, and the count is read again. + func testAFailedRevokeIsReported() async { + let spy = PurchaseApprovalSpy() + spy.sharedAccess = SharedProfileAccess(keyCount: 3, scope: "wallet-a t", identityId: "identity-a") + spy.revokeFailure = PurchaseSpyError.refused + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + await waitUntil { viewModel.sharedProfileAccess != nil } + let reads = spy.sharedAccessReads + + viewModel.revokeSharedProfileAccess() + XCTAssertTrue(viewModel.isDisconnecting) + // A second tap while the first is still out must not start another. + viewModel.revokeSharedProfileAccess() + await waitUntil { !viewModel.isDisconnecting } + + XCTAssertEqual(spy.revoked.count, 1) + XCTAssertEqual(viewModel.message?.kind, .error) + XCTAssertGreaterThan(spy.sharedAccessReads, reads) + XCTAssertEqual(viewModel.sharedProfileAccess?.keyCount, 3) } /// With the login unresolved the sheet's action asks again and approves @@ -1698,27 +1757,46 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { } private var storedSharedAccess: SharedProfileAccess? - private var storedRevokedScopes: [String] = [] + private var storedSharedAccessReads = 0 + private var storedRevoked: [SharedProfileAccess] = [] + private var storedRevokeFailure: Error? - /// What `sharedProfileAccess` reports; a revoke clears it. + /// What `sharedProfileAccess` reports; a revoke that succeeds clears it. var sharedAccess: SharedProfileAccess? { get { lock.withLock { storedSharedAccess } } set { lock.withLock { storedSharedAccess = newValue } } } - var revokedScopes: [String] { - lock.withLock { storedRevokedScopes } + var sharedAccessReads: Int { + lock.withLock { storedSharedAccessReads } + } + + var revoked: [SharedProfileAccess] { + lock.withLock { storedRevoked } } - func sharedProfileAccess() async -> SharedProfileAccess? { sharedAccess } + var revokeFailure: Error? { + get { lock.withLock { storedRevokeFailure } } + set { lock.withLock { storedRevokeFailure = newValue } } + } - func revokeSharedProfileAccess(scope: String) async throws -> Int { + func sharedProfileAccess() async -> SharedProfileAccess? { lock.withLock { - storedRevokedScopes.append(scope) + storedSharedAccessReads += 1 + return storedSharedAccess + } + } + + func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int { + let (count, failure) = lock.withLock { () -> (Int, Error?) in + storedRevoked.append(access) + if let failure = storedRevokeFailure { return (0, failure) } let count = storedSharedAccess?.keyCount ?? 0 storedSharedAccess = nil - return count + return (count, nil) } + if let failure { throw failure } + return count } } @@ -1785,7 +1863,7 @@ private final class LoginApprovalSpy: DashConnectDataSource { func remove(id: String, scope: String?) async {} func sharedProfileAccess() async -> SharedProfileAccess? { nil } - func revokeSharedProfileAccess(scope: String) async throws -> Int { 0 } + func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int { 0 } } /// The URLs a view model asked to open, in order. From 16c9bc545c8ff4960a34dd01361b37e71c614b94 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 13:49:48 +0200 Subject: [PATCH 060/108] fix(dashpay): keep an expired key from blocking the shared profile revoke - An expired v2 key with no readable stored bound no longer makes the view untrusted: it can no longer sign, so it is not one of the keys to revoke. - A one-QR disconnect reloads the identity after its disable, so the count it reports does not include the key it just turned off. - A wallet that could not be read gives an unknown count, not none; only a wallet with no identity gives none. The count leaves out every key a record names, unconfirmed records included. - A confirmed revoke that cannot run says why. The count is read again when the screen appears and when the rows change, not on every publish. - The millisecond conversion reuses AppConnect.milliseconds, and the new strings are in every locale catalog with their English text. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 13 +++++-- .../DashConnect/DashConnectDataSource.swift | 3 +- .../DashConnect/DashConnectModels.swift | 5 ++- .../PlatformDashConnectDataSource.swift | 37 +++++++++++++------ .../UI/DashConnect/ConnectionsScreen.swift | 2 + .../UI/DashConnect/ConnectionsViewModel.swift | 17 ++++++++- DashWallet/ar.lproj/Localizable.strings | 13 +++++++ DashWallet/bg.lproj/Localizable.strings | 13 +++++++ DashWallet/ca.lproj/Localizable.strings | 13 +++++++ DashWallet/cs.lproj/Localizable.strings | 13 +++++++ DashWallet/da.lproj/Localizable.strings | 13 +++++++ DashWallet/de.lproj/Localizable.strings | 13 +++++++ DashWallet/el.lproj/Localizable.strings | 13 +++++++ DashWallet/en.lproj/Localizable.strings | 5 ++- DashWallet/eo.lproj/Localizable.strings | 13 +++++++ DashWallet/es.lproj/Localizable.strings | 13 +++++++ DashWallet/et.lproj/Localizable.strings | 13 +++++++ DashWallet/fa.lproj/Localizable.strings | 13 +++++++ DashWallet/fi.lproj/Localizable.strings | 13 +++++++ DashWallet/fil.lproj/Localizable.strings | 13 +++++++ DashWallet/fr.lproj/Localizable.strings | 13 +++++++ DashWallet/hr.lproj/Localizable.strings | 13 +++++++ DashWallet/hu.lproj/Localizable.strings | 13 +++++++ DashWallet/id.lproj/Localizable.strings | 13 +++++++ DashWallet/it.lproj/Localizable.strings | 13 +++++++ DashWallet/ja.lproj/Localizable.strings | 13 +++++++ DashWallet/ko.lproj/Localizable.strings | 13 +++++++ DashWallet/mk.lproj/Localizable.strings | 13 +++++++ DashWallet/ms.lproj/Localizable.strings | 13 +++++++ DashWallet/nb.lproj/Localizable.strings | 13 +++++++ DashWallet/nl.lproj/Localizable.strings | 13 +++++++ DashWallet/pl.lproj/Localizable.strings | 13 +++++++ DashWallet/pt.lproj/Localizable.strings | 13 +++++++ DashWallet/ro.lproj/Localizable.strings | 13 +++++++ DashWallet/ru.lproj/Localizable.strings | 13 +++++++ DashWallet/sk.lproj/Localizable.strings | 13 +++++++ DashWallet/sl.lproj/Localizable.strings | 13 +++++++ DashWallet/sl_SI.lproj/Localizable.strings | 13 +++++++ DashWallet/sq.lproj/Localizable.strings | 13 +++++++ DashWallet/sr.lproj/Localizable.strings | 13 +++++++ DashWallet/sv.lproj/Localizable.strings | 13 +++++++ DashWallet/th.lproj/Localizable.strings | 13 +++++++ DashWallet/tr.lproj/Localizable.strings | 13 +++++++ DashWallet/uk.lproj/Localizable.strings | 13 +++++++ DashWallet/vi.lproj/Localizable.strings | 13 +++++++ DashWallet/zh-Hans.lproj/Localizable.strings | 13 +++++++ .../zh-Hant-TW.lproj/Localizable.strings | 13 +++++++ DashWallet/zh.lproj/Localizable.strings | 13 +++++++ DashWallet/zh_TW.lproj/Localizable.strings | 13 +++++++ 49 files changed, 607 insertions(+), 21 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 9c1837ea01..62988f4cee 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -844,6 +844,12 @@ extension AppConnect { .sorted() } + /// Whether a key with this expiry still works at `nowMilliseconds`. A + /// key that expired stays live on Platform but can no longer sign. + static func isUnexpired(_ expiresAt: Int64?, nowMilliseconds: Int64) -> Bool { + (expiresAt ?? 0) > nowMilliseconds + } + /// The unattributed profile keys the wallet's store shows as live and /// not yet expired: what the Connections screen counts. static func storedSharedProfileKeyIds( @@ -851,7 +857,7 @@ extension AppConnect { bindings: [KeyBinding], nowMilliseconds: Int64 ) -> [UInt32] { - let unexpired = Set(bindings.filter { ($0.expiresAt ?? 0) > nowMilliseconds }.map(\.keyId)) + let unexpired = Set(bindings.filter { isUnexpired($0.expiresAt, nowMilliseconds: nowMilliseconds) }.map(\.keyId)) return unattributedProfileKeyIds(keys: unrecordedV2Keys(recordedKeyIds: recordedKeyIds, bindings: bindings)) .filter(unexpired.contains) } @@ -870,7 +876,8 @@ extension AppConnect { ) -> [UInt32]? { let hasUnplacedKey = currentIdentityPublicKeys.contains { key in let keyId = UInt32(bitPattern: key.keyId) - return isLiveAppConnectAuthKey(key) && key.expiresAt != nil && !recordedKeyIds.contains(keyId) + return isLiveAppConnectAuthKey(key) && isUnexpired(key.expiresAt, nowMilliseconds: nowMilliseconds) + && !recordedKeyIds.contains(keyId) && !bindings.contains { $0.keyId == keyId && $0.data == key.data && !$0.hasUnreadableBound } } let fetchedKeyIds = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) @@ -878,7 +885,7 @@ extension AppConnect { recordedKeyIds: recordedKeyIds, bindings: bindings, nowMilliseconds: nowMilliseconds ).allSatisfy(fetchedKeyIds.contains) else { return nil } let unexpired = Set(currentIdentityPublicKeys - .filter { ($0.expiresAt ?? 0) > nowMilliseconds }.map { UInt32(bitPattern: $0.keyId) }) + .filter { isUnexpired($0.expiresAt, nowMilliseconds: nowMilliseconds) }.map { UInt32(bitPattern: $0.keyId) }) return unattributedProfileKeyIds(keys: unrecordedV2Keys( recordedKeyIds: recordedKeyIds, bindings: bindings, currentIdentityPublicKeys: currentIdentityPublicKeys)) .filter(unexpired.contains) diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index cd0c560566..77ad9dd1ae 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -57,7 +57,8 @@ protocol DashConnectDataSource { /// The live DashPay profile keys of the active identity that no grant /// record names, from the wallet's store: keys App Connect gave some app /// that a disconnect leaves on, because the bound does not say which app - /// it was. `nil` when there is no active wallet or identity. + /// it was. `nil` when there is no active wallet or identity; a `nil` + /// `keyCount` when the wallet could not be read. func sharedProfileAccess() async -> SharedProfileAccess? /// Disables those keys, for every app that holds one, after the PIN /// prompt and a fresh read of the identity, while `access` still names diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 03476d9790..25eae1e1cc 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -207,9 +207,10 @@ struct SharedProfileAccess: Equatable { /// `nil` when the wallet's store could not be read: unknown, not none. let keyCount: Int? /// The wallet and network, and the identity, the count was read for; a - /// revoke acts only while they are still the active ones. + /// revoke acts only while they are still the active ones. `identityId` + /// is nil when the count could not be read. let scope: String - let identityId: String + let identityId: String? } /// A pending request derived from a scanned login QR code. diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 76403e75b7..73b906577d 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -2329,15 +2329,26 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } func sharedProfileAccess() async -> SharedProfileAccess? { - guard let stores = await showActiveWalletRows(), - let context = try? await requireContext(pinnedTo: stores) else { return nil } + guard let stores = await showActiveWalletRows() else { return nil } + let context: Context + do { + context = try await requireContext(pinnedTo: stores) + } catch DashConnectPlatformError.noIdentity { + return nil + } catch { + // The wallet is there but could not be read: unknown, not none. + return SharedProfileAccess(keyCount: nil, scope: stores.scope, identityId: nil) + } let identityId = context.identityId.toBase58String() + // Every record of the identity counts here, unconfirmed ones too: a + // registration whose key has landed is only confirmed by a fresh + // read, which the revoke makes. + let named = Set(stores.grants.load().filter { $0.identityId == identityId }.flatMap(\.keyIds)) let keyCount = (try? Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer)) .map { bindings in AppConnect.storedSharedProfileKeyIds( - recordedKeyIds: Self.recordedKeyIds(of: identityId, in: stores), - bindings: bindings, - nowMilliseconds: Self.nowMilliseconds(now())).count + recordedKeyIds: named, bindings: bindings, + nowMilliseconds: Int64(AppConnect.milliseconds(now()))).count } return SharedProfileAccess(keyCount: keyCount, scope: stores.scope, identityId: identityId) } @@ -2360,7 +2371,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.noWallet } var context = try await requireContext(pinnedTo: stores) - guard access.scope == stores.scope, access.identityId == context.identityId.toBase58String() else { + // A count that could not be read names no identity; the revoke then + // acts on the active one, from its own fresh read. + guard access.scope == stores.scope, + access.identityId.map({ $0 == context.identityId.toBase58String() }) ?? true else { throw DashConnectPlatformError.walletChanged } try await authorize() @@ -2376,7 +2390,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { recordedKeyIds: Self.recordedKeyIds(of: identityId, in: stores), bindings: try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer), currentIdentityPublicKeys: currentPublicKeys, - nowMilliseconds: Self.nowMilliseconds(now()) + nowMilliseconds: Int64(AppConnect.milliseconds(now())) ) else { throw DashConnectPlatformError.identityKeysOutOfDate } @@ -2395,10 +2409,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Set(stores.grants.load().filter { $0.identityId == identityId && !$0.isUnconfirmed }.flatMap(\.keyIds)) } - private static func nowMilliseconds(_ date: Date) -> Int64 { - Int64((date.timeIntervalSince1970 * 1000).rounded()) - } - private func disconnectInTurn(id: String, scope: String?) async throws { guard let stores = await showActiveWalletRows() else { throw DashConnectPlatformError.noWallet @@ -2791,6 +2801,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // attempt picks up what is still live. try await disableKeys(keyIds, context: context, signer: signer) Self.logger.info("🔗 DASHCONNECT :: app key(s) disabled") + // The reload writes the disabled keys to the store the shared + // profile count is read from. The keys are off either way. + if mayStillLand.isEmpty { + _ = try? await refreshedIdentityPublicKeys(context: context) + } // Each registration that might still land names a revision above // `revision`, the one below it the identity was already at. The // update that just landed took one above the identity's revision diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index dffbad4347..42cc5ec834 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -73,6 +73,8 @@ struct ConnectionsScreen: View { } .background(Color.primaryBackground) .navigationBarHidden(true) + // Another identity may have become active while the screen was away. + .onAppear { viewModel.refreshSharedProfileAccess() } .confirmationDialog( NSLocalizedString("Revoke shared profile access?", comment: "DashConnect"), isPresented: $isConfirmingSharedProfileRevoke, diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index d448cba6d2..e0aa225696 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -119,9 +119,15 @@ final class ConnectionsViewModel: ObservableObject { .receive(on: DispatchQueue.main) .sink { [weak self] in self?.connections = $0.sorted(by: { $0.updatedAt > $1.updatedAt }) - self?.refreshSharedProfileAccess() } .store(in: &cancellables) + // The rows change when an app is approved, confirmed or removed, + // which is when the shared profile keys can change too. + self.dataSource.connections + .removeDuplicates() + .receive(on: DispatchQueue.main) + .sink { [weak self] _ in self?.refreshSharedProfileAccess() } + .store(in: &cancellables) } /// Reads the shared profile keys again from the wallet's store. @@ -451,7 +457,14 @@ final class ConnectionsViewModel: ObservableObject { /// identity update. func revokeSharedProfileAccess() { guard !isDisconnecting, !isProcessingStateTransition, !isApproving, !isApprovingPurchase, - !isResolvingRequest, pendingRequest == nil, pendingTokenPurchase == nil else { return } + !isResolvingRequest, pendingRequest == nil, pendingTokenPurchase == nil else { + // The user confirmed a destructive action; say why nothing ran. + message = ConnectionsScreenMessage( + kind: .error, + text: NSLocalizedString( + "Another DashConnect request is in progress. Try again when it finishes.", comment: "DashConnect")) + return + } guard let access = sharedProfileAccess else { // A read finished while the confirmation was up and found none. message = ConnectionsScreenMessage( diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 19bc51a6c4..99b44db4ac 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index a5823343f2..af59962ed5 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 5ae0fa41bb..418a3d59c9 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 510ce8f44a..f13629a03d 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 2a55b0175d..998f9aa8e4 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index dc4b03379f..6d46b069f5 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 8862e2bd4e..d9a410e7a6 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index fbc414d73f..9012e05dab 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6113,17 +6113,18 @@ "App contract" = "App contract"; "Could not disconnect: %@" = "Could not disconnect: %@"; "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; "Revoke shared profile access?" = "Revoke shared profile access?"; "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; "DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"Revoke" = "Revoke"; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; "DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index dc1028e20b..3981ec2678 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index a6b9ab4488..8b98f2be76 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 82f7f2d703..f38176599e 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 4cce5385cb..510cd29b11 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index bde8da7870..f0fcf2d977 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index bd74ff8542..988b6f2c5b 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index c538ca51bd..8a0d49c0a7 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 949c2fbd9d..215bc90492 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 7374a0a178..7d33ae6099 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index f49c6820ca..688280a852 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index ef5fe1d503..c4c5b4408b 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 43bcf950e3..c406505572 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 4a616ebeee..f48bc9b266 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 56a5bf2c1d..88b911c34c 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 688408a78a..05e673f913 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index a3cebe7107..863da977a9 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 4fd1983762..f50e6c94ed 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 57b0d3199f..72ea3e3503 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 8d5717537a..46ac80f5c6 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 69f08b0e68..398c314b3a 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 6a3b969e84..60a2efca6a 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index e9358ef6c6..59390f75d0 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index e6918973dd..a1ae1b2e67 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 671dba4d63..51391f75fb 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 3dcc98c339..1c24575e0d 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 1201ce8c55..d40bfc10c2 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 93d5e0e2ac..8880c20f82 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index ca7247528d..777cacee20 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 78040f22da..31a6289991 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index be7ae4832b..69d7c1098f 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 553bbd0eb4..d91ed3a89f 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 14fe8488d7..0595136452 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 833bb6256a..ac825a1e40 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6215,6 +6215,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 6443fc9697..0084019e84 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 9daeb6fd61..a2981ca089 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6213,6 +6213,19 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; +"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; +"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; +"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; +"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; +"Revoke shared profile access?" = "Revoke shared profile access?"; +"Revoke shared profile access" = "Revoke shared profile access"; +"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; +"Shared profile access" = "Shared profile access"; +"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; +"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Revoke" = "Revoke"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; From 0c5c2d671d2886ebaa09a4346634cb254b7dfa6b Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 13:56:25 +0200 Subject: [PATCH 061/108] fix(dashpay): revoke shared profile access only on the identity that was counted - The count and the revoke name the same keys as recorded: confirmed records. - An access whose identity could not be read offers no revoke. - Expiry allows the clock tolerance the rest of App Connect uses. - disconnect and revoke share one busy check. - The count is read when the screen appears, not again for the value the publisher replays. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 8 +++++--- .../DashConnect/DashConnectModels.swift | 6 ++++-- .../PlatformDashConnectDataSource.swift | 14 ++++---------- .../UI/DashConnect/ConnectionsScreen.swift | 15 ++++++++++----- .../UI/DashConnect/ConnectionsViewModel.swift | 19 ++++++++++++++----- .../DashConnect/AppConnectV2LoginTests.swift | 13 ++++++++----- .../PlatformDashConnectDataSourceTests.swift | 16 ++++++++++++++++ 7 files changed, 61 insertions(+), 30 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 62988f4cee..c0fa3008fc 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -844,10 +844,12 @@ extension AppConnect { .sorted() } - /// Whether a key with this expiry still works at `nowMilliseconds`. A - /// key that expired stays live on Platform but can no longer sign. + /// Whether a key with this expiry may still work at `nowMilliseconds`. + /// A key that expired stays live on Platform but can no longer sign. + /// Platform goes by block time, so a device clock up to `clockTolerance` + /// fast does not count a working key as expired. static func isUnexpired(_ expiresAt: Int64?, nowMilliseconds: Int64) -> Bool { - (expiresAt ?? 0) > nowMilliseconds + (expiresAt ?? 0) > nowMilliseconds - Int64(clockTolerance * 1000) } /// The unattributed profile keys the wallet's store shows as live and diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 25eae1e1cc..80e458826f 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -204,11 +204,13 @@ struct DAppConnection: Identifiable, Equatable, Hashable { /// that no grant record names. Such a key's bound names no app, so a /// disconnect cannot tell whose it is and leaves it on. struct SharedProfileAccess: Equatable { - /// `nil` when the wallet's store could not be read: unknown, not none. + /// `nil` when the identity or the wallet's store could not be read: + /// unknown, not none. let keyCount: Int? /// The wallet and network, and the identity, the count was read for; a /// revoke acts only while they are still the active ones. `identityId` - /// is nil when the count could not be read. + /// is nil when the identity could not be read, and then nothing can be + /// revoked from this access. let scope: String let identityId: String? } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 73b906577d..0fbaa3a320 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -2336,18 +2336,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } catch DashConnectPlatformError.noIdentity { return nil } catch { - // The wallet is there but could not be read: unknown, not none. + // The wallet is there but its identity could not be read: unknown, + // not none, and nothing to revoke on. return SharedProfileAccess(keyCount: nil, scope: stores.scope, identityId: nil) } let identityId = context.identityId.toBase58String() - // Every record of the identity counts here, unconfirmed ones too: a - // registration whose key has landed is only confirmed by a fresh - // read, which the revoke makes. - let named = Set(stores.grants.load().filter { $0.identityId == identityId }.flatMap(\.keyIds)) let keyCount = (try? Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer)) .map { bindings in AppConnect.storedSharedProfileKeyIds( - recordedKeyIds: named, bindings: bindings, + recordedKeyIds: Self.recordedKeyIds(of: identityId, in: stores), bindings: bindings, nowMilliseconds: Int64(AppConnect.milliseconds(now()))).count } return SharedProfileAccess(keyCount: keyCount, scope: stores.scope, identityId: identityId) @@ -2371,10 +2368,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.noWallet } var context = try await requireContext(pinnedTo: stores) - // A count that could not be read names no identity; the revoke then - // acts on the active one, from its own fresh read. - guard access.scope == stores.scope, - access.identityId.map({ $0 == context.identityId.toBase58String() }) ?? true else { + guard access.scope == stores.scope, access.identityId == context.identityId.toBase58String() else { throw DashConnectPlatformError.walletChanged } try await authorize() diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 42cc5ec834..4fb21c7f72 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -52,7 +52,9 @@ struct ConnectionsScreen: View { content if !viewModel.featureUnavailable, let access = viewModel.sharedProfileAccess { - SharedProfileAccessRow(keyCount: access.keyCount) { isConfirmingSharedProfileRevoke = true } + SharedProfileAccessRow( + keyCount: access.keyCount, + onRevoke: access.identityId == nil ? nil : { isConfirmingSharedProfileRevoke = true }) .padding(.horizontal, 20) .padding(.vertical, 12) } @@ -260,7 +262,8 @@ struct ConnectionsScreen: View { private struct SharedProfileAccessRow: View { /// `nil` when the store could not be read. let keyCount: Int? - let onRevoke: () -> Void + /// `nil` when the identity could not be read: nothing to revoke on. + let onRevoke: (() -> Void)? var body: some View { HStack(spacing: 12) { @@ -278,9 +281,11 @@ private struct SharedProfileAccessRow: View { } .frame(maxWidth: .infinity, alignment: .leading) - Button(NSLocalizedString("Revoke", comment: "DashConnect"), role: .destructive, action: onRevoke) - .dashFont(.subhead) - .frame(minWidth: 44, minHeight: 44) + if let onRevoke { + Button(NSLocalizedString("Revoke", comment: "DashConnect"), role: .destructive, action: onRevoke) + .dashFont(.subhead) + .frame(minWidth: 44, minHeight: 44) + } } .padding(.horizontal, 14) .padding(.vertical, 12) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index e0aa225696..8ba3fb93c5 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -123,7 +123,10 @@ final class ConnectionsViewModel: ObservableObject { .store(in: &cancellables) // The rows change when an app is approved, confirmed or removed, // which is when the shared profile keys can change too. + // The screen reads them when it appears; the current value the + // publisher replays is skipped. self.dataSource.connections + .dropFirst() .removeDuplicates() .receive(on: DispatchQueue.main) .sink { [weak self] _ in self?.refreshSharedProfileAccess() } @@ -414,8 +417,7 @@ final class ConnectionsViewModel: ObservableObject { // takes seconds. It must not overlap anything else that signs one or // touches the same records: a second tap, an approval on screen or in // flight, a request still resolving, a `dash-st:` in progress. - guard !isDisconnecting, !isProcessingStateTransition, !isApproving, !isApprovingPurchase, - !isResolvingRequest, pendingRequest == nil, pendingTokenPurchase == nil else { return } + guard canSignIdentityUpdate else { return } isDisconnecting = true Task { [weak self] in guard let self else { return } @@ -452,12 +454,19 @@ final class ConnectionsViewModel: ObservableObject { } } + /// Whether nothing else that signs an identity update or touches the same + /// records is going on: a disconnect or revoke, an approval on screen or + /// in flight, a request still resolving, a `dash-st:` in progress. + private var canSignIdentityUpdate: Bool { + !isDisconnecting && !isProcessingStateTransition && !isApproving && !isApprovingPurchase + && !isResolvingRequest && pendingRequest == nil && pendingTokenPurchase == nil + } + /// Disables every DashPay profile key no connection accounts for, for /// every app that holds one. Same guards as `disconnect`: it signs an /// identity update. func revokeSharedProfileAccess() { - guard !isDisconnecting, !isProcessingStateTransition, !isApproving, !isApprovingPurchase, - !isResolvingRequest, pendingRequest == nil, pendingTokenPurchase == nil else { + guard canSignIdentityUpdate else { // The user confirmed a destructive action; say why nothing ran. message = ConnectionsScreenMessage( kind: .error, @@ -465,7 +474,7 @@ final class ConnectionsViewModel: ObservableObject { "Another DashConnect request is in progress. Try again when it finishes.", comment: "DashConnect")) return } - guard let access = sharedProfileAccess else { + guard let access = sharedProfileAccess, access.identityId != nil else { // A read finished while the confirmation was up and found none. message = ConnectionsScreenMessage( kind: .success, diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 7bffa9d40b..136098d82e 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -447,14 +447,14 @@ final class AppConnectV2LoginTests: XCTestCase { func testRevokingSharedProfileAccessTakesOnlyUnattributedLiveProfileKeys() { let dashPay = Data.identifier(fromBase58: AppConnect.dashPayContractId)! let app = Data(repeating: 0xA1, count: 32) - let now: Int64 = 5_000 - func key(_ id: Int32, expiresAt: Int64? = 9_000, disabled: Bool = false) -> ManagedIdentity.IdentityPublicKeyInfo { + let now: Int64 = 100_000_000 + func key(_ id: Int32, expiresAt: Int64? = 200_000_000, disabled: Bool = false) -> ManagedIdentity.IdentityPublicKeyInfo { ManagedIdentity.IdentityPublicKeyInfo( keyId: id, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, readOnly: false, disabledAt: disabled ? 1 : nil, data: Data([UInt8(id)]), totalBudget: nil, expiresAt: expiresAt) } - func binding(_ id: UInt32, _ bound: AppConnect.StoredBound?, expiresAt: Int64? = 9_000, + func binding(_ id: UInt32, _ bound: AppConnect.StoredBound?, expiresAt: Int64? = 200_000_000, unreadable: Bool = false) -> AppConnect.KeyBinding { var binding = AppConnect.KeyBinding(keyId: id, data: Data([UInt8(id)]), singleContractId: nil, hasUnreadableBound: unreadable, bound: bound) @@ -463,9 +463,9 @@ final class AppConnectV2LoginTests: XCTestCase { return binding } let profile = AppConnect.StoredBound.documentType(contractId: dashPay, name: "profile") - let keys = [key(1), key(2), key(3, expiresAt: 4_000), key(4), key(5)] + let keys = [key(1), key(2), key(3, expiresAt: 92_800_000), key(4), key(5)] let bindings = [ - binding(1, profile), binding(2, profile), binding(3, profile, expiresAt: 4_000), + binding(1, profile), binding(2, profile), binding(3, profile, expiresAt: 92_800_000), binding(4, .singleContract(app)), binding(5, profile), ] @@ -476,6 +476,9 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertEqual( AppConnect.storedSharedProfileKeyIds(recordedKeyIds: [5], bindings: bindings, nowMilliseconds: now), [1, 2]) + // An hour of a fast device clock does not expire a working key. + XCTAssertEqual(AppConnect.storedSharedProfileKeyIds( + recordedKeyIds: [], bindings: [binding(1, profile, expiresAt: now - 1_000)], nowMilliseconds: now), [1]) // A live v2 key the store cannot place may be a profile key. XCTAssertNil(AppConnect.sharedProfileKeyIdsToDisable( recordedKeyIds: [], bindings: [binding(1, nil, unreadable: true)], diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 5b76ab2e2e..cb709e9d59 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1428,12 +1428,27 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertEqual(viewModel.message?.text.contains("could not be checked"), true) } + /// An access whose identity could not be read revokes nothing. + func testAnAccessWithNoIdentityRevokesNothing() async { + let spy = PurchaseApprovalSpy() + spy.sharedAccess = SharedProfileAccess(keyCount: nil, scope: "wallet-a t", identityId: nil) + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + viewModel.refreshSharedProfileAccess() + await waitUntil { viewModel.sharedProfileAccess != nil } + + viewModel.revokeSharedProfileAccess() + + XCTAssertEqual(spy.revoked, []) + XCTAssertFalse(viewModel.isDisconnecting) + } + /// With none shared there is nothing to offer, and a revoke asks nothing /// of the data source. func testWithoutSharedProfileKeysNothingIsOffered() async { let spy = PurchaseApprovalSpy() spy.sharedAccess = SharedProfileAccess(keyCount: 1, scope: "wallet-a t", identityId: "identity-a") let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + viewModel.refreshSharedProfileAccess() await waitUntil { viewModel.sharedProfileAccess != nil } XCTAssertNotNil(viewModel.sharedProfileAccess) spy.sharedAccess = SharedProfileAccess(keyCount: 0, scope: "wallet-a t", identityId: "identity-a") @@ -1452,6 +1467,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { spy.sharedAccess = SharedProfileAccess(keyCount: 3, scope: "wallet-a t", identityId: "identity-a") spy.revokeFailure = PurchaseSpyError.refused let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + viewModel.refreshSharedProfileAccess() await waitUntil { viewModel.sharedProfileAccess != nil } let reads = spy.sharedAccessReads From 9d9cb4731eb735f44488595585d02c0f81f49b76 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 15:51:36 +0200 Subject: [PATCH 062/108] fix(dashpay): clearer shared profile copy, card styling and an honest unknown on confirm - The row and the disconnect alert say what the keys do (they can update the DashPay profile) instead of "no connection accounts for". - A confirm whose access lost its identity meanwhile says the keys could not be checked, not that none needed revoking. - The row sits in the same card as connection rows, its texts read as one VoiceOver element and the button names what it revokes. - Whether the row shows and can revoke is decided in the view model. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 5 ++-- .../UI/DashConnect/ConnectionsScreen.swift | 13 +++++++---- .../UI/DashConnect/ConnectionsViewModel.swift | 23 ++++++++++++++++--- DashWallet/ar.lproj/Localizable.strings | 9 ++++---- DashWallet/bg.lproj/Localizable.strings | 9 ++++---- DashWallet/ca.lproj/Localizable.strings | 9 ++++---- DashWallet/cs.lproj/Localizable.strings | 9 ++++---- DashWallet/da.lproj/Localizable.strings | 9 ++++---- DashWallet/de.lproj/Localizable.strings | 9 ++++---- DashWallet/el.lproj/Localizable.strings | 9 ++++---- DashWallet/en.lproj/Localizable.strings | 9 ++++---- DashWallet/eo.lproj/Localizable.strings | 9 ++++---- DashWallet/es.lproj/Localizable.strings | 9 ++++---- DashWallet/et.lproj/Localizable.strings | 9 ++++---- DashWallet/fa.lproj/Localizable.strings | 9 ++++---- DashWallet/fi.lproj/Localizable.strings | 9 ++++---- DashWallet/fil.lproj/Localizable.strings | 9 ++++---- DashWallet/fr.lproj/Localizable.strings | 9 ++++---- DashWallet/hr.lproj/Localizable.strings | 9 ++++---- DashWallet/hu.lproj/Localizable.strings | 9 ++++---- DashWallet/id.lproj/Localizable.strings | 9 ++++---- DashWallet/it.lproj/Localizable.strings | 9 ++++---- DashWallet/ja.lproj/Localizable.strings | 9 ++++---- DashWallet/ko.lproj/Localizable.strings | 9 ++++---- DashWallet/mk.lproj/Localizable.strings | 9 ++++---- DashWallet/ms.lproj/Localizable.strings | 9 ++++---- DashWallet/nb.lproj/Localizable.strings | 9 ++++---- DashWallet/nl.lproj/Localizable.strings | 9 ++++---- DashWallet/pl.lproj/Localizable.strings | 9 ++++---- DashWallet/pt.lproj/Localizable.strings | 9 ++++---- DashWallet/ro.lproj/Localizable.strings | 9 ++++---- DashWallet/ru.lproj/Localizable.strings | 9 ++++---- DashWallet/sk.lproj/Localizable.strings | 9 ++++---- DashWallet/sl.lproj/Localizable.strings | 9 ++++---- DashWallet/sl_SI.lproj/Localizable.strings | 9 ++++---- DashWallet/sq.lproj/Localizable.strings | 9 ++++---- DashWallet/sr.lproj/Localizable.strings | 9 ++++---- DashWallet/sv.lproj/Localizable.strings | 9 ++++---- DashWallet/th.lproj/Localizable.strings | 9 ++++---- DashWallet/tr.lproj/Localizable.strings | 9 ++++---- DashWallet/uk.lproj/Localizable.strings | 9 ++++---- DashWallet/vi.lproj/Localizable.strings | 9 ++++---- DashWallet/zh-Hans.lproj/Localizable.strings | 9 ++++---- .../zh-Hant-TW.lproj/Localizable.strings | 9 ++++---- DashWallet/zh.lproj/Localizable.strings | 9 ++++---- DashWallet/zh_TW.lproj/Localizable.strings | 9 ++++---- .../PlatformDashConnectDataSourceTests.swift | 2 +- 47 files changed, 247 insertions(+), 183 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index c0fa3008fc..695fa92e12 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -844,10 +844,11 @@ extension AppConnect { .sorted() } - /// Whether a key with this expiry may still work at `nowMilliseconds`. + /// Whether a v2 key with this expiry may still work at `nowMilliseconds`. /// A key that expired stays live on Platform but can no longer sign. /// Platform goes by block time, so a device clock up to `clockTolerance` - /// fast does not count a working key as expired. + /// fast does not count a working key as expired. Every v2 auth key has an + /// expiry; a key with none is not one, and counts as false here. static func isUnexpired(_ expiresAt: Int64?, nowMilliseconds: Int64) -> Bool { (expiresAt ?? 0) > nowMilliseconds - Int64(clockTolerance * 1000) } diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 4fb21c7f72..c946ffe0c1 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -51,10 +51,11 @@ struct ConnectionsScreen: View { content - if !viewModel.featureUnavailable, let access = viewModel.sharedProfileAccess { + if viewModel.showsSharedProfileAccess { SharedProfileAccessRow( - keyCount: access.keyCount, - onRevoke: access.identityId == nil ? nil : { isConfirmingSharedProfileRevoke = true }) + keyCount: viewModel.sharedProfileAccess?.keyCount, + onRevoke: viewModel.canRevokeSharedProfileAccess ? { isConfirmingSharedProfileRevoke = true } : nil) + .modifier(MenuViewModifier()) .padding(.horizontal, 20) .padding(.vertical, 12) } @@ -273,18 +274,20 @@ private struct SharedProfileAccessRow: View { .foregroundStyle(Color.dash.primaryText) Text(keyCount.map { String( - format: NSLocalizedString("DashPay profile keys no connection accounts for: %d", comment: "DashConnect"), + format: NSLocalizedString("Keys not linked to a connection that can update your DashPay profile: %d", comment: "DashConnect"), $0) - } ?? NSLocalizedString("DashPay profile keys could not be checked", comment: "DashConnect")) + } ?? NSLocalizedString("Keys that can update your DashPay profile could not be checked", comment: "DashConnect")) .dashFont(.footnote) .foregroundStyle(Color.dash.tertiaryText) } .frame(maxWidth: .infinity, alignment: .leading) + .accessibilityElement(children: .combine) if let onRevoke { Button(NSLocalizedString("Revoke", comment: "DashConnect"), role: .destructive, action: onRevoke) .dashFont(.subhead) .frame(minWidth: 44, minHeight: 44) + .accessibilityLabel(Text(NSLocalizedString("Revoke shared profile access", comment: "DashConnect"))) } } .padding(.horizontal, 14) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 8ba3fb93c5..41893b1978 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -441,19 +441,26 @@ final class ConnectionsViewModel: ObservableObject { kind: .success, text: String( format: NSLocalizedString( - "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access.", + "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access.", comment: "DashConnect"), keyCount)) } else { self.message = ConnectionsScreenMessage( kind: .success, text: NSLocalizedString( - "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked.", + "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile.", comment: "DashConnect")) } } } + /// Whether the screen shows the shared profile keys. + var showsSharedProfileAccess: Bool { !featureUnavailable && sharedProfileAccess != nil } + + /// Whether they can be revoked from here: only for an identity that was + /// read. + var canRevokeSharedProfileAccess: Bool { sharedProfileAccess?.identityId != nil } + /// Whether nothing else that signs an identity update or touches the same /// records is going on: a disconnect or revoke, an approval on screen or /// in flight, a request still resolving, a `dash-st:` in progress. @@ -474,13 +481,23 @@ final class ConnectionsViewModel: ObservableObject { "Another DashConnect request is in progress. Try again when it finishes.", comment: "DashConnect")) return } - guard let access = sharedProfileAccess, access.identityId != nil else { + guard let access = sharedProfileAccess else { // A read finished while the confirmation was up and found none. message = ConnectionsScreenMessage( kind: .success, text: NSLocalizedString("No DashPay profile key needed revoking.", comment: "DashConnect")) return } + guard access.identityId != nil else { + // A read finished while the confirmation was up and could not + // read the identity: unknown, not none. + message = ConnectionsScreenMessage( + kind: .error, + text: NSLocalizedString( + "DashPay profile access could not be checked. Open Connections again and retry.", + comment: "DashConnect")) + return + } isDisconnecting = true Task { [weak self] in guard let self else { return } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 99b44db4ac..4e642e1bc5 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index af59962ed5..6ba8eac719 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 418a3d59c9..ca0f6ebdd3 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index f13629a03d..4650a974ab 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 998f9aa8e4..92823b0f35 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 6d46b069f5..1f2f6f24e2 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index d9a410e7a6..e5bba03b30 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 9012e05dab..bd2da748f7 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6112,8 +6112,8 @@ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6122,9 +6122,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 3981ec2678..4854d32a61 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 8b98f2be76..95864836f7 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index f38176599e..053988fb1b 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 510cd29b11..badea36546 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index f0fcf2d977..1ab0a6d154 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 988b6f2c5b..bfce95328f 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 8a0d49c0a7..4b2c29830d 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 215bc90492..f92236da4e 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 7d33ae6099..7c19f63593 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 688280a852..119f9e582b 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index c4c5b4408b..abff826290 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index c406505572..73582e88be 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index f48bc9b266..1cbf9b4cf8 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 88b911c34c..24569a38d6 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 05e673f913..caf6c6cf96 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 863da977a9..f56861e3e9 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index f50e6c94ed..157c46e18d 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 72ea3e3503..35e2ddd94f 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 46ac80f5c6..2882c76cb1 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 398c314b3a..f94eef93eb 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 60a2efca6a..eab1e7a07d 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 59390f75d0..31a7debb0d 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index a1ae1b2e67..1711bc24c5 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 51391f75fb..41917a23ac 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 1c24575e0d..d4dccd9bf4 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index d40bfc10c2..3b654f21ab 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 8880c20f82..943704a93b 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 777cacee20..a2c55d46da 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 31a6289991..5e8392a4b9 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 69d7c1098f..fc555a1338 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index d91ed3a89f..e45a9bcfa9 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 0595136452..10e926d4eb 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index ac825a1e40..dbc8dcbb01 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6215,8 +6215,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6225,9 +6225,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 0084019e84..c33e6f131f 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index a2981ca089..317dcf035a 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6213,8 +6213,8 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access." = "Disconnected. DashPay profile keys that no connection accounts for are still active on this identity: %d. They may belong to this app or to another one. You can revoke them under Shared profile access."; -"Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked." = "Disconnected. Whether DashPay profile keys that no connection accounts for are still active on this identity could not be checked."; +"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; +"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; "DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; "No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; "Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; @@ -6223,9 +6223,10 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; -"DashPay profile keys no connection accounts for: %d" = "DashPay profile keys no connection accounts for: %d"; -"DashPay profile keys could not be checked" = "DashPay profile keys could not be checked"; +"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; +"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; +"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index cb709e9d59..421273df33 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1425,7 +1425,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertNotNil(viewModel.sharedProfileAccess) XCTAssertNil(viewModel.sharedProfileAccess?.keyCount) - XCTAssertEqual(viewModel.message?.text.contains("could not be checked"), true) + XCTAssertEqual(viewModel.message?.text.contains("could not check"), true) } /// An access whose identity could not be read revokes nothing. From db0f58c5b4e64dd8b983283c0f8ce570857448da Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 16:28:34 +0200 Subject: [PATCH 063/108] test(dashpay): cover the shared profile revoke's wallet pin and an unknown count The revoke compares the counted wallet before it reads the SDK context, so a count from another wallet is refused the same way with or without one. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 5 ++- .../PlatformDashConnectDataSourceTests.swift | 31 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 0fbaa3a320..e2e61ce2f3 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -2367,8 +2367,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard let stores = await showActiveWalletRows() else { throw DashConnectPlatformError.noWallet } + guard access.scope == stores.scope else { + throw DashConnectPlatformError.walletChanged + } var context = try await requireContext(pinnedTo: stores) - guard access.scope == stores.scope, access.identityId == context.identityId.toBase58String() else { + guard access.identityId == context.identityId.toBase58String() else { throw DashConnectPlatformError.walletChanged } try await authorize() diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 421273df33..296f210636 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2553,6 +2553,37 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(store.load(), [grant]) } + /// A count read for one wallet does not revoke in another: the revoke is + /// refused before the PIN prompt, and nothing else is touched. + func testARevokeCountedForAnotherWalletIsRefused() async { + let active = ActiveWallet("wallet-a") + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [Self.twoQRRow(status: .active)]) + let scopeA = Self.shownRows(dataSource)[0].scope! + active.idHex = "wallet-b" + let other = Self.twoQRRow(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .approved) + connections.save([other]) + + await Self.expectWalletChanged { + _ = try await dataSource.revokeSharedProfileAccess( + SharedProfileAccess(keyCount: 1, scope: scopeA, identityId: "identity-a")) + } + XCTAssertEqual(connections.load(), [other]) + } + + /// With a wallet whose identity cannot be read (no SDK yet, as at launch) + /// the count is unknown and names no identity, so nothing can be revoked + /// from it. + func testACountWithoutAReadableIdentityIsUnknown() async { + let active = ActiveWallet("wallet-a") + let (dataSource, _) = makeScopedDataSource(active: active) + + let access = await dataSource.sharedProfileAccess() + + XCTAssertNotNil(access) + XCTAssertNil(access?.keyCount) + XCTAssertNil(access?.identityId) + } + func testDisconnectOfARowFromAnotherWalletIsRefusedAndTheListMovesToTheActiveWallet() async { let active = ActiveWallet("wallet-a") let row = Self.twoQRRow(status: .active) From 1ddb5d031a7a20a7bd25afa508e946ec97c9c9b2 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 17:24:56 +0200 Subject: [PATCH 064/108] fix(wallet): pin testnet to Platform protocol 14 on this stack The stack's platform pin (03945d3a) brings dashpay/platform#5561, which refuses any request that needs a newer protocol than the SDK is pinned to. With testnet pinned to 13 that refused the contract-group read App Connect makes on a disconnect and an approval ("get_contract_group_info needs Platform protocol version 14; this SDK is pinned to an earlier protocol version"). This takes the pin from #1222, already on develop; the rest of that change reaches the stack when develop is merged up through it. Co-Authored-By: Claude Opus 5.5 --- .../SwiftDashSDK/SwiftDashSDKHost.swift | 66 +++++++++---------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKHost.swift b/DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKHost.swift index 108c233385..1bf2e113c6 100644 --- a/DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKHost.swift +++ b/DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKHost.swift @@ -371,45 +371,41 @@ final class SwiftDashSDKHost { /// The `DashSDKConfig.platform_version` to build the SDK with, per network. /// - /// **Testnet stays pinned to 13.** Testnet Drive moved past v12 to v13, - /// whose validation set changed the shielded identity-create exit - /// denominations (v12/V8 `[0.1, 0.3, 0.5, 1.0]` → v13/V9 `[0.03, 0.1, - /// 0.25, 0.5, 1.0]`). Staying at v12 made the client build shielded - /// transitions against the old set, so a contested (0.25 DASH) shielded - /// username create failed client-side ("denomination 25000000000 is not a - /// member …") even though the server requires exactly 0.25. Pinning - /// explicitly also avoids a race where the shielded build runs before the - /// SDK has ratcheted to the network version. Bump this when the agreed - /// testnet protocol moves past v13. + /// **Testnet is pinned to the protocol testnet has activated** (14; check + /// `current` in an evonode's getStatus before bumping). Below it the + /// client builds transitions the network refuses — at 13, every + /// `ShieldFromAssetLock` (version 1 only at v14) failed with 10603 and + /// left its asset lock unspent. An explicit pin, rather than auto-detect, + /// keeps a shielded build from running before the SDK has ratcheted up to + /// the network version. A pinned SDK never ratchets + /// (`refreshProtocolVersion()` is a no-op while pinned), so the pin has to + /// be bumped by hand on the next testnet activation. /// - /// **Mainnet uses `0` — auto-detect.** The pin above was chosen for - /// testnet but applied to every network, which put the client two versions - /// ahead of mainnet. Platform v13 (`DRIVE_VERSION_V8`) switches the - /// compacted address-balance proof to the two-proof - /// `CompactedAddressBalanceProof` bincode envelope, while "nodes and - /// clients on v12 and below keep the legacy single GroveDB proof" - /// (rs-platform-version `version/v13.rs`). A v13 client therefore decodes - /// mainnet's legacy proof as the envelope, consumes the structure and - /// trips on the remainder: + /// **Mainnet and devnet use `0` — auto-detect.** The SDK seeds at its + /// per-network `min_protocol_version` floor (13 on mainnet) and moves up + /// only when a proved response carries a newer version, so it follows a + /// mainnet activation to any protocol the linked SDK carries without an + /// app release. The floor must not sit + /// above the network: a client ahead of the network misreads its proofs (a + /// v13 pin while mainnet ran v12 failed with "compacted address balance + /// proof contains trailing bytes"). Devnet's floor is 14, built from the + /// linked SDK's v14, which a devnet cut from another release may not run. + /// TODO(protocol-refresh): the app never calls `refreshProtocolVersion()`, + /// so until the first proved read an auto-detect SDK builds transitions at + /// its floor. /// - /// proof: corrupted error: compacted address balance proof contains trailing bytes + /// **Regtest** returns `0` only to keep the switch exhaustive; + /// `makeRuntime` rejects it before an SDK is built. /// - /// — observed 20× across three nodes on a mainnet device (2026-07-31), - /// with testnet clean, and it retries then gives up, so the Platform - /// address balance never populates there. - /// - /// `0` is what the SDK is designed for: it seeds at the per-network - /// `min_protocol_version` floor (mainnet 11, testnet 12) with auto-detect - /// on, ratcheting up as the network reports newer versions — "so this - /// picks the right wire without a Swift-side network→version map" - /// (`SDK.init(network:platformVersion:)`). A hard pin also disables - /// `refreshProtocolVersion()`, which is documented as a no-op while - /// pinned, so the client could never learn the network's real version. - /// - /// Devnet/regtest follow mainnet's auto-detect: no shielded-denomination - /// contract is pinned for them, and `makeRuntime` rejects regtest anyway. + /// The pin only names a version; its rules come from the linked SDK. + /// platform v4.2-dev carries a pre-release v14 whose `ShieldFromAssetLock` + /// is still version 0. Testnet runs 5.0.0-rc.4; link that release, or a + /// later commit with the same `v14.rs`. static func platformVersion(for network: Network) -> UInt32 { - network == .testnet ? 13 : 0 + switch network { + case .testnet: return 14 + case .mainnet, .devnet, .regtest: return 0 + } } // MARK: - Wallet presence From 6c95187145bbea531bc6520090884c100ecf4628 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 17:24:56 +0200 Subject: [PATCH 065/108] fix(wallet): pin testnet to Platform protocol 14 on this stack The stack's platform pin (03945d3a) brings dashpay/platform#5561, which refuses any request that needs a newer protocol than the SDK is pinned to. With testnet pinned to 13 that refused the contract-group read App Connect makes on a disconnect and an approval ("get_contract_group_info needs Platform protocol version 14; this SDK is pinned to an earlier protocol version"). This takes the pin from #1222, already on develop; the rest of that change reaches the stack when develop is merged up through it. Co-Authored-By: Claude Opus 5.5 (cherry picked from commit 1ddb5d031a7a20a7bd25afa508e946ec97c9c9b2) --- .../SwiftDashSDK/SwiftDashSDKHost.swift | 66 +++++++++---------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKHost.swift b/DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKHost.swift index 108c233385..1bf2e113c6 100644 --- a/DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKHost.swift +++ b/DashWallet/Sources/Infrastructure/SwiftDashSDK/SwiftDashSDKHost.swift @@ -371,45 +371,41 @@ final class SwiftDashSDKHost { /// The `DashSDKConfig.platform_version` to build the SDK with, per network. /// - /// **Testnet stays pinned to 13.** Testnet Drive moved past v12 to v13, - /// whose validation set changed the shielded identity-create exit - /// denominations (v12/V8 `[0.1, 0.3, 0.5, 1.0]` → v13/V9 `[0.03, 0.1, - /// 0.25, 0.5, 1.0]`). Staying at v12 made the client build shielded - /// transitions against the old set, so a contested (0.25 DASH) shielded - /// username create failed client-side ("denomination 25000000000 is not a - /// member …") even though the server requires exactly 0.25. Pinning - /// explicitly also avoids a race where the shielded build runs before the - /// SDK has ratcheted to the network version. Bump this when the agreed - /// testnet protocol moves past v13. + /// **Testnet is pinned to the protocol testnet has activated** (14; check + /// `current` in an evonode's getStatus before bumping). Below it the + /// client builds transitions the network refuses — at 13, every + /// `ShieldFromAssetLock` (version 1 only at v14) failed with 10603 and + /// left its asset lock unspent. An explicit pin, rather than auto-detect, + /// keeps a shielded build from running before the SDK has ratcheted up to + /// the network version. A pinned SDK never ratchets + /// (`refreshProtocolVersion()` is a no-op while pinned), so the pin has to + /// be bumped by hand on the next testnet activation. /// - /// **Mainnet uses `0` — auto-detect.** The pin above was chosen for - /// testnet but applied to every network, which put the client two versions - /// ahead of mainnet. Platform v13 (`DRIVE_VERSION_V8`) switches the - /// compacted address-balance proof to the two-proof - /// `CompactedAddressBalanceProof` bincode envelope, while "nodes and - /// clients on v12 and below keep the legacy single GroveDB proof" - /// (rs-platform-version `version/v13.rs`). A v13 client therefore decodes - /// mainnet's legacy proof as the envelope, consumes the structure and - /// trips on the remainder: + /// **Mainnet and devnet use `0` — auto-detect.** The SDK seeds at its + /// per-network `min_protocol_version` floor (13 on mainnet) and moves up + /// only when a proved response carries a newer version, so it follows a + /// mainnet activation to any protocol the linked SDK carries without an + /// app release. The floor must not sit + /// above the network: a client ahead of the network misreads its proofs (a + /// v13 pin while mainnet ran v12 failed with "compacted address balance + /// proof contains trailing bytes"). Devnet's floor is 14, built from the + /// linked SDK's v14, which a devnet cut from another release may not run. + /// TODO(protocol-refresh): the app never calls `refreshProtocolVersion()`, + /// so until the first proved read an auto-detect SDK builds transitions at + /// its floor. /// - /// proof: corrupted error: compacted address balance proof contains trailing bytes + /// **Regtest** returns `0` only to keep the switch exhaustive; + /// `makeRuntime` rejects it before an SDK is built. /// - /// — observed 20× across three nodes on a mainnet device (2026-07-31), - /// with testnet clean, and it retries then gives up, so the Platform - /// address balance never populates there. - /// - /// `0` is what the SDK is designed for: it seeds at the per-network - /// `min_protocol_version` floor (mainnet 11, testnet 12) with auto-detect - /// on, ratcheting up as the network reports newer versions — "so this - /// picks the right wire without a Swift-side network→version map" - /// (`SDK.init(network:platformVersion:)`). A hard pin also disables - /// `refreshProtocolVersion()`, which is documented as a no-op while - /// pinned, so the client could never learn the network's real version. - /// - /// Devnet/regtest follow mainnet's auto-detect: no shielded-denomination - /// contract is pinned for them, and `makeRuntime` rejects regtest anyway. + /// The pin only names a version; its rules come from the linked SDK. + /// platform v4.2-dev carries a pre-release v14 whose `ShieldFromAssetLock` + /// is still version 0. Testnet runs 5.0.0-rc.4; link that release, or a + /// later commit with the same `v14.rs`. static func platformVersion(for network: Network) -> UInt32 { - network == .testnet ? 13 : 0 + switch network { + case .testnet: return 14 + case .mainnet, .devnet, .regtest: return 0 + } } // MARK: - Wallet presence From c716e4dad4202b39edd564ba16bf20e01b401677 Mon Sep 17 00:00:00 2001 From: pasta Date: Fri, 30 Oct 2026 13:06:36 -0500 Subject: [PATCH 066/108] docs(dashpay): say testnet gets the App Connect login now that it is pinned to 14 Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/PlatformDashConnectDataSource.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index a2dfd0dabf..568f8b62f4 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -869,9 +869,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // prompt: from protocol version 14 the response goes to the App // Connect system contract and the wallet registers the key itself; // below it that contract does not exist and the two-QR flow runs. - // A pinned SDK reports its pin (testnet is pinned to 13 in - // `SwiftDashSDKHost.platformVersion(for:)`), so testnet stays on the - // two-QR flow until that pin moves. + // A pinned SDK reports its pin (testnet is pinned to 14 in + // `SwiftDashSDKHost.platformVersion(for:)`), so testnet gets the App + // Connect login. let protocolVersion: UInt32 do { protocolVersion = try await Self.networkProtocolVersion(sdk: context.sdk, network: context.network) From 95f097f150dc9a470bc0d174f3c2baee717b0697 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 22:32:20 +0200 Subject: [PATCH 067/108] fix(dashconnect): fail closed on unknown shared profile counts and let the user keep the keys - No revoke while the count is unknown, in the view model and the data source. - A live unrecorded v2 key in the store whose bound this build cannot read makes the count unknown and refuses the revoke, even when the fetched view lacks it; one the fetched view shows off does not. - An access lost to an unreadable wallet is not reported as nothing to revoke. - Keep: after the PIN prompt, the shown keys that are still shared are noted on this device and are no longer counted or revoked from here. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 26 ++++- .../DashConnect/DashConnectDataSource.swift | 17 ++- .../DashConnect/DashConnectModels.swift | 15 ++- .../PlatformDashConnectDataSource.swift | 84 ++++++++++++-- .../UI/DashConnect/ConnectionsScreen.swift | 33 +++++- .../UI/DashConnect/ConnectionsViewModel.swift | 106 ++++++++++++++---- DashWallet/ar.lproj/Localizable.strings | 6 + DashWallet/bg.lproj/Localizable.strings | 6 + DashWallet/ca.lproj/Localizable.strings | 6 + DashWallet/cs.lproj/Localizable.strings | 6 + DashWallet/da.lproj/Localizable.strings | 6 + DashWallet/de.lproj/Localizable.strings | 6 + DashWallet/el.lproj/Localizable.strings | 6 + DashWallet/en.lproj/Localizable.strings | 6 + DashWallet/eo.lproj/Localizable.strings | 6 + DashWallet/es.lproj/Localizable.strings | 6 + DashWallet/et.lproj/Localizable.strings | 6 + DashWallet/fa.lproj/Localizable.strings | 6 + DashWallet/fi.lproj/Localizable.strings | 6 + DashWallet/fil.lproj/Localizable.strings | 6 + DashWallet/fr.lproj/Localizable.strings | 6 + DashWallet/hr.lproj/Localizable.strings | 6 + DashWallet/hu.lproj/Localizable.strings | 6 + DashWallet/id.lproj/Localizable.strings | 6 + DashWallet/it.lproj/Localizable.strings | 6 + DashWallet/ja.lproj/Localizable.strings | 6 + DashWallet/ko.lproj/Localizable.strings | 6 + DashWallet/mk.lproj/Localizable.strings | 6 + DashWallet/ms.lproj/Localizable.strings | 6 + DashWallet/nb.lproj/Localizable.strings | 6 + DashWallet/nl.lproj/Localizable.strings | 6 + DashWallet/pl.lproj/Localizable.strings | 6 + DashWallet/pt.lproj/Localizable.strings | 6 + DashWallet/ro.lproj/Localizable.strings | 6 + DashWallet/ru.lproj/Localizable.strings | 6 + DashWallet/sk.lproj/Localizable.strings | 6 + DashWallet/sl.lproj/Localizable.strings | 6 + DashWallet/sl_SI.lproj/Localizable.strings | 6 + DashWallet/sq.lproj/Localizable.strings | 6 + DashWallet/sr.lproj/Localizable.strings | 6 + DashWallet/sv.lproj/Localizable.strings | 6 + DashWallet/th.lproj/Localizable.strings | 6 + DashWallet/tr.lproj/Localizable.strings | 6 + DashWallet/uk.lproj/Localizable.strings | 6 + DashWallet/vi.lproj/Localizable.strings | 6 + DashWallet/zh-Hans.lproj/Localizable.strings | 6 + .../zh-Hant-TW.lproj/Localizable.strings | 6 + DashWallet/zh.lproj/Localizable.strings | 6 + DashWallet/zh_TW.lproj/Localizable.strings | 6 + .../DashConnect/AppConnectV2LoginTests.swift | 27 +++++ .../PlatformDashConnectDataSourceTests.swift | 89 +++++++++++++-- 51 files changed, 597 insertions(+), 58 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 695fa92e12..1e2ce43e31 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -865,12 +865,24 @@ extension AppConnect { .filter(unexpired.contains) } + /// Whether the store shows a live, unexpired v2-shaped key that no record + /// names and whose bound this build cannot read: it may be a shared + /// profile key, so neither the count nor a revoke can be trusted. + static func hasUnplacedStoredKey(recordedKeyIds: Set, bindings: [KeyBinding], nowMilliseconds: Int64) -> Bool { + bindings.contains { + $0.isV2AuthKeyShaped && $0.hasUnreadableBound && !$0.isDisabled + && isUnexpired($0.expiresAt, nowMilliseconds: nowMilliseconds) && !recordedKeyIds.contains($0.keyId) + } + } + /// The keys revoking shared profile access disables, from a fresh view of /// the identity: live, not yet expired, bound to an allowlisted foreign - /// document type, and named by no confirmed record (`recordedKeyIds`). + /// document type, and not in `recordedKeyIds` (the keys confirmed records + /// name, and those the user kept). /// `nil` when the view cannot be trusted: a live v2-shaped key no record - /// names has no readable stored bound, so it may be one of them; or the - /// store holds one of them that the view lacks, so the node is behind. + /// names, in the view or in the store, has no readable stored bound, so + /// it may be one of them; or the store holds one of them that the view + /// lacks, so the node is behind. static func sharedProfileKeyIdsToDisable( recordedKeyIds: Set, bindings: [KeyBinding], @@ -884,7 +896,13 @@ extension AppConnect { && !bindings.contains { $0.keyId == keyId && $0.data == key.data && !$0.hasUnreadableBound } } let fetchedKeyIds = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) - guard !hasUnplacedKey, storedSharedProfileKeyIds( + // The store's own copy counts too: a fetched view that lacks such a + // key does not show it is off. One the view shows off is. + let offInView = Set(currentIdentityPublicKeys.filter { $0.disabledAt != nil }.map { UInt32(bitPattern: $0.keyId) }) + guard !hasUnplacedKey, + !hasUnplacedStoredKey( + recordedKeyIds: recordedKeyIds.union(offInView), bindings: bindings, nowMilliseconds: nowMilliseconds), + storedSharedProfileKeyIds( recordedKeyIds: recordedKeyIds, bindings: bindings, nowMilliseconds: nowMilliseconds ).allSatisfy(fetchedKeyIds.contains) else { return nil } let unexpired = Set(currentIdentityPublicKeys diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index 77ad9dd1ae..cdc6efaafe 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -55,15 +55,19 @@ protocol DashConnectDataSource { func disconnect(id: String, scope: String?) async throws func remove(id: String, scope: String?) async /// The live DashPay profile keys of the active identity that no grant - /// record names, from the wallet's store: keys App Connect gave some app - /// that a disconnect leaves on, because the bound does not say which app - /// it was. `nil` when there is no active wallet or identity; a `nil` - /// `keyCount` when the wallet could not be read. + /// record names and the user did not keep, from the wallet's store: keys + /// App Connect gave some app that a disconnect leaves on, because the + /// bound does not say which app it was. `nil` when there is no active + /// wallet or identity; `nil` `keyIds` when they could not be told. func sharedProfileAccess() async -> SharedProfileAccess? /// Disables those keys, for every app that holds one, after the PIN /// prompt and a fresh read of the identity, while `access` still names /// the active wallet and identity. Returns how many were disabled. func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int + /// Records on this device, after the PIN prompt, that the user + /// recognizes the keys `access` counted that are still shared: they are + /// no longer counted or revoked from here. Nothing changes on Platform. + func keepSharedProfileAccess(_ access: SharedProfileAccess) async throws } /// Why a token purchase failed, and — the part that decides what the UI may @@ -296,6 +300,11 @@ final class MockDashConnectDataSource: DashConnectDataSource { func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int { 0 } + /// The mock never reports keys to keep. + func keepSharedProfileAccess(_ access: SharedProfileAccess) async throws { + throw DashConnectMockError.approveFailed + } + private func validateNetwork(_ network: DashConnectNetwork) throws { guard network == supportedNetwork else { throw DashConnectMockError.unsupportedNetwork(expected: supportedNetwork, actual: network) diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 80e458826f..c6b48c969e 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -204,15 +204,18 @@ struct DAppConnection: Identifiable, Equatable, Hashable { /// that no grant record names. Such a key's bound names no app, so a /// disconnect cannot tell whose it is and leaves it on. struct SharedProfileAccess: Equatable { - /// `nil` when the identity or the wallet's store could not be read: - /// unknown, not none. - let keyCount: Int? + /// The keys counted; `nil` when the identity or the wallet's store could + /// not be read, or the store holds a key that may be one of them but + /// cannot be placed: unknown, not none. + let keyIds: [UInt32]? /// The wallet and network, and the identity, the count was read for; a - /// revoke acts only while they are still the active ones. `identityId` - /// is nil when the identity could not be read, and then nothing can be - /// revoked from this access. + /// revoke or a keep acts only while they are still the active ones. + /// `identityId` is nil when the identity could not be read, and then + /// nothing can be revoked or kept from this access. let scope: String let identityId: String? + + var keyCount: Int? { keyIds?.count } } /// A pending request derived from a scanned login QR code. diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 281ac5659b..2d60213775 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -495,6 +495,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private let authorizer: DWIdentityAuthorizer private let stateTransitionParser: any DashConnectStateTransitionParsing private let now: () -> Date + /// Where the shared profile keys the user kept are noted, per scope and + /// identity. + private let keptSharedProfileKeys: UserDefaults /// The DashConnect network matching the app's current network selection — /// what the default data source serves. Mainnet maps to `.mainnet` for @@ -518,6 +521,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { networkEndpoint: (() -> String?)? = nil, notificationCenter: NotificationCenter = .default, operationGate: DashConnectOperationGate = .shared, + keptSharedProfileKeys: UserDefaults = .standard, now: @escaping () -> Date = Date.init ) { assert( @@ -529,6 +533,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { self.authorizer = authorizer self.stateTransitionParser = stateTransitionParser self.now = now + self.keptSharedProfileKeys = keptSharedProfileKeys self.activeWalletIdHex = activeWalletIdHex self.operationGate = operationGate // Only a devnet's nodes are configurable. @@ -2338,16 +2343,73 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } catch { // The wallet is there but its identity could not be read: unknown, // not none, and nothing to revoke on. - return SharedProfileAccess(keyCount: nil, scope: stores.scope, identityId: nil) + return SharedProfileAccess(keyIds: nil, scope: stores.scope, identityId: nil) } let identityId = context.identityId.toBase58String() - let keyCount = (try? Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer)) - .map { bindings in - AppConnect.storedSharedProfileKeyIds( - recordedKeyIds: Self.recordedKeyIds(of: identityId, in: stores), bindings: bindings, - nowMilliseconds: Int64(AppConnect.milliseconds(now()))).count + let recorded = accountedKeyIds(of: identityId, in: stores) + let nowMilliseconds = Int64(AppConnect.milliseconds(now())) + guard let bindings = try? Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer), + !AppConnect.hasUnplacedStoredKey(recordedKeyIds: recorded, bindings: bindings, nowMilliseconds: nowMilliseconds) + else { + return SharedProfileAccess(keyIds: nil, scope: stores.scope, identityId: identityId) + } + let keyIds = AppConnect.storedSharedProfileKeyIds( + recordedKeyIds: recorded, bindings: bindings, nowMilliseconds: nowMilliseconds) + return SharedProfileAccess(keyIds: keyIds, scope: stores.scope, identityId: identityId) + } + + func keepSharedProfileAccess(_ access: SharedProfileAccess) async throws { + try await gated { + guard let stores = await showActiveWalletRows() else { + throw DashConnectPlatformError.noWallet + } + guard access.scope == stores.scope, let identityId = access.identityId else { + throw DashConnectPlatformError.walletChanged + } + var context = try await requireContext(pinnedTo: stores) + guard identityId == context.identityId.toBase58String() else { + throw DashConnectPlatformError.walletChanged } - return SharedProfileAccess(keyCount: keyCount, scope: stores.scope, identityId: identityId) + guard let keyIds = access.keyIds else { throw DashConnectPlatformError.identityKeysOutOfDate } + // It takes keys off what a revoke can reach, so it asks as a + // revoke does. + try await authorize() + context = try await contextAfterAuthorization(matching: context) + // Only keys the store still counts as shared now: an id that is + // no longer one must not be exempted from the checks the kept + // ids skip. + let recorded = accountedKeyIds(of: identityId, in: stores) + let nowMilliseconds = Int64(AppConnect.milliseconds(now())) + let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + guard !AppConnect.hasUnplacedStoredKey(recordedKeyIds: recorded, bindings: bindings, nowMilliseconds: nowMilliseconds) + else { throw DashConnectPlatformError.identityKeysOutOfDate } + let shared = Set(AppConnect.storedSharedProfileKeyIds( + recordedKeyIds: recorded, bindings: bindings, nowMilliseconds: nowMilliseconds)) + let key = Self.keptSharedProfileKeysKey(scope: stores.scope, identityId: identityId) + let kept = keptSharedProfileKeyIds(scope: stores.scope, identityId: identityId) + .union(keyIds.filter(shared.contains)) + keptSharedProfileKeys.set(kept.sorted().map(Int.init), forKey: key) + } + } + + /// The key ids this identity's confirmed grant records name, and the + /// shared profile keys the user kept: the keys the count and a revoke + /// leave alone. + private func accountedKeyIds(of identityId: String, in stores: Stores) -> Set { + Self.recordedKeyIds(of: identityId, in: stores) + .union(keptSharedProfileKeyIds(scope: stores.scope, identityId: identityId)) + } + + /// The shared profile keys the user kept for this identity in this scope. + /// A key id is never reused on an identity, so an id names one key. + private func keptSharedProfileKeyIds(scope: String, identityId: String) -> Set { + let stored = keptSharedProfileKeys.array( + forKey: Self.keptSharedProfileKeysKey(scope: scope, identityId: identityId)) as? [Int] ?? [] + return Set(stored.compactMap(UInt32.init(exactly:))) + } + + private static func keptSharedProfileKeysKey(scope: String, identityId: String) -> String { + "DashConnect.keptSharedProfileKeys \(scope) \(identityId)" } func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int { @@ -2355,8 +2417,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } /// Disables every live DashPay profile key of the identity `access` was - /// read for that no confirmed grant record names, whichever app was given - /// it. The set is read again from Platform after the PIN prompt; nothing + /// read for that no confirmed grant record names and the user did not + /// keep, whichever app was given it. The set is read again from Platform after the PIN prompt; nothing /// from the count is reused. Nothing is turned off while that read cannot /// be trusted (`AppConnect.sharedProfileKeyIdsToDisable`). /// TODO(app-connect-v2-pending-record): a v2 approval writes its record @@ -2374,6 +2436,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard access.identityId == context.identityId.toBase58String() else { throw DashConnectPlatformError.walletChanged } + // A count that was never established is not a go-ahead. + guard access.keyCount != nil else { throw DashConnectPlatformError.identityKeysOutOfDate } try await authorize() context = try await contextAfterAuthorization(matching: context) let identityId = context.identityId.toBase58String() @@ -2384,7 +2448,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, modelContainer: context.modelContainer, in: stores) guard let keyIds = AppConnect.sharedProfileKeyIdsToDisable( - recordedKeyIds: Self.recordedKeyIds(of: identityId, in: stores), + recordedKeyIds: accountedKeyIds(of: identityId, in: stores), bindings: try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer), currentIdentityPublicKeys: currentPublicKeys, nowMilliseconds: Int64(AppConnect.milliseconds(now())) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index c946ffe0c1..0ffaf9e547 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -29,6 +29,9 @@ struct ConnectionsScreen: View { @StateObject private var viewModel: ConnectionsViewModel @State private var isConfirmingSharedProfileRevoke = false + @State private var isConfirmingSharedProfileKeep = false + /// The access the keep confirmation was opened for. + @State private var sharedProfileAccessToKeep: SharedProfileAccess? init(vc: UINavigationController, viewModel: ConnectionsViewModel? = nil) { self.vc = vc @@ -54,7 +57,11 @@ struct ConnectionsScreen: View { if viewModel.showsSharedProfileAccess { SharedProfileAccessRow( keyCount: viewModel.sharedProfileAccess?.keyCount, - onRevoke: viewModel.canRevokeSharedProfileAccess ? { isConfirmingSharedProfileRevoke = true } : nil) + onRevoke: viewModel.canActOnSharedProfileAccess ? { isConfirmingSharedProfileRevoke = true } : nil, + onKeep: viewModel.canActOnSharedProfileAccess ? { + sharedProfileAccessToKeep = viewModel.sharedProfileAccess + isConfirmingSharedProfileKeep = true + } : nil) .modifier(MenuViewModifier()) .padding(.horizontal, 20) .padding(.vertical, 12) @@ -92,6 +99,20 @@ struct ConnectionsScreen: View { "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again.", comment: "DashConnect")) } + .confirmationDialog( + NSLocalizedString("Keep these keys?", comment: "DashConnect"), + isPresented: $isConfirmingSharedProfileKeep, + titleVisibility: .visible + ) { + Button(NSLocalizedString("Keep", comment: "DashConnect")) { + if let access = sharedProfileAccessToKeep { viewModel.keepSharedProfileAccess(access) } + } + Button(NSLocalizedString("Cancel", comment: ""), role: .cancel) {} + } message: { + Text(NSLocalizedString( + "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards.", + comment: "DashConnect")) + } .alert(item: messageBinding) { message in Alert( title: Text(message.title), @@ -263,8 +284,10 @@ struct ConnectionsScreen: View { private struct SharedProfileAccessRow: View { /// `nil` when the store could not be read. let keyCount: Int? - /// `nil` when the identity could not be read: nothing to revoke on. + /// `nil` when the identity or the count could not be read: nothing to + /// revoke or keep. let onRevoke: (() -> Void)? + let onKeep: (() -> Void)? var body: some View { HStack(spacing: 12) { @@ -283,6 +306,12 @@ private struct SharedProfileAccessRow: View { .frame(maxWidth: .infinity, alignment: .leading) .accessibilityElement(children: .combine) + if let onKeep { + Button(NSLocalizedString("Keep", comment: "DashConnect"), action: onKeep) + .dashFont(.subhead) + .frame(minWidth: 44, minHeight: 44) + .accessibilityLabel(Text(NSLocalizedString("Keep shared profile access", comment: "DashConnect"))) + } if let onRevoke { Button(NSLocalizedString("Revoke", comment: "DashConnect"), role: .destructive, action: onRevoke) .dashFont(.subhead) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 41893b1978..bdadf97d6c 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -53,17 +53,20 @@ final class ConnectionsViewModel: ObservableObject { @Published var isApproving = false @Published var isApprovingPurchase = false @Published var isProcessingStateTransition = false - /// A disconnect that is signing an identity update. Its own flag, not + /// A disconnect or a shared profile revoke or keep in progress. Its own flag, not /// `isProcessingStateTransition`: a `dash-st:` task clears that one when /// it finishes, which would lift the guard while a disconnect is still out. @Published private(set) var isDisconnecting = false /// The DashPay profile keys on the active identity that no connection - /// accounts for: `nil` when there are none or no identity is active, a - /// `nil` `keyCount` when the store could not be read. + /// accounts for and the user did not keep: `nil` when there are none or + /// no identity is active, a `nil` `keyCount` when they could not be told. @Published private(set) var sharedProfileAccess: SharedProfileAccess? /// Each read of `sharedProfileAccess` takes the next number; only the /// latest one started is shown, so a slow older read cannot overwrite it. private var sharedProfileAccessGeneration = 0 + /// Whether the latest shown read found the active identity with no such + /// key, as opposed to no readable wallet or identity. + private var sharedProfileAccessFoundNone = false @Published var message: ConnectionsScreenMessage? /// Failure of the last approve attempt, rendered **inside** the approve sheet. /// A screen-level `.alert` cannot appear over a presented sheet, so routing this @@ -149,6 +152,7 @@ final class ConnectionsViewModel: ObservableObject { let access = read?.keyCount == 0 ? nil : read if generation == sharedProfileAccessGeneration { sharedProfileAccess = access + sharedProfileAccessFoundNone = read?.keyCount == 0 } return access } @@ -457,9 +461,11 @@ final class ConnectionsViewModel: ObservableObject { /// Whether the screen shows the shared profile keys. var showsSharedProfileAccess: Bool { !featureUnavailable && sharedProfileAccess != nil } - /// Whether they can be revoked from here: only for an identity that was - /// read. - var canRevokeSharedProfileAccess: Bool { sharedProfileAccess?.identityId != nil } + /// Whether they can be revoked or kept from here: only for an identity + /// that was read, with a count that was. + var canActOnSharedProfileAccess: Bool { + sharedProfileAccess?.identityId != nil && sharedProfileAccess?.keyCount != nil + } /// Whether nothing else that signs an identity update or touches the same /// records is going on: a disconnect or revoke, an approval on screen or @@ -469,33 +475,29 @@ final class ConnectionsViewModel: ObservableObject { && !isResolvingRequest && pendingRequest == nil && pendingTokenPurchase == nil } - /// Disables every DashPay profile key no connection accounts for, for - /// every app that holds one. Same guards as `disconnect`: it signs an + /// Disables every DashPay profile key no connection accounts for and the + /// user did not keep, for every app that holds one. Same guards as `disconnect`: it signs an /// identity update. func revokeSharedProfileAccess() { guard canSignIdentityUpdate else { // The user confirmed a destructive action; say why nothing ran. - message = ConnectionsScreenMessage( - kind: .error, - text: NSLocalizedString( - "Another DashConnect request is in progress. Try again when it finishes.", comment: "DashConnect")) + message = Self.busyMessage return } guard let access = sharedProfileAccess else { - // A read finished while the confirmation was up and found none. - message = ConnectionsScreenMessage( - kind: .success, - text: NSLocalizedString("No DashPay profile key needed revoking.", comment: "DashConnect")) + // A read finished while the confirmation was up. Only one that + // read the identity and found none says so. + message = sharedProfileAccessFoundNone + ? ConnectionsScreenMessage( + kind: .success, + text: NSLocalizedString("No DashPay profile key needed revoking.", comment: "DashConnect")) + : Self.sharedProfileAccessUncheckedMessage return } - guard access.identityId != nil else { + guard canActOnSharedProfileAccess else { // A read finished while the confirmation was up and could not - // read the identity: unknown, not none. - message = ConnectionsScreenMessage( - kind: .error, - text: NSLocalizedString( - "DashPay profile access could not be checked. Open Connections again and retry.", - comment: "DashConnect")) + // read the identity or the count: unknown, not none. + message = Self.sharedProfileAccessUncheckedMessage return } isDisconnecting = true @@ -522,6 +524,64 @@ final class ConnectionsViewModel: ObservableObject { } } + /// Stops counting the shared profile keys shown, on this device, after + /// the PIN prompt: the user recognizes them. A key that is not among them shows the row + /// again. Nothing changes on Platform. + func keepSharedProfileAccess(_ shown: SharedProfileAccess) { + guard canSignIdentityUpdate else { + message = Self.busyMessage + return + } + // Only the keys the user was shown: a read that finished while the + // confirmation was up may count others, or none. + guard let access = sharedProfileAccess else { + if !sharedProfileAccessFoundNone { message = Self.sharedProfileAccessUncheckedMessage } + return + } + guard canActOnSharedProfileAccess else { + message = Self.sharedProfileAccessUncheckedMessage + return + } + guard access == shown else { + message = ConnectionsScreenMessage( + kind: .error, + text: NSLocalizedString("The keys changed. Check them and try again.", comment: "DashConnect")) + return + } + // Shares the revoke's busy flag: a revoke confirmed meanwhile would + // otherwise run on the access this keep is taking off the count. + isDisconnecting = true + Task { [weak self] in + guard let self else { return } + defer { self.isDisconnecting = false } + do { + try await self.dataSource.keepSharedProfileAccess(access) + } catch { + self.message = ConnectionsScreenMessage( + kind: .error, + text: String( + format: NSLocalizedString("Could not keep these keys: %@", comment: "DashConnect"), + error.localizedDescription)) + } + await self.readSharedProfileAccess() + } + } + + private static var busyMessage: ConnectionsScreenMessage { + ConnectionsScreenMessage( + kind: .error, + text: NSLocalizedString( + "Another DashConnect request is in progress. Try again when it finishes.", comment: "DashConnect")) + } + + private static var sharedProfileAccessUncheckedMessage: ConnectionsScreenMessage { + ConnectionsScreenMessage( + kind: .error, + text: NSLocalizedString( + "DashPay profile access could not be checked. Open Connections again and retry.", + comment: "DashConnect")) + } + func removeConnection(_ connection: DAppConnection) { Task { await dataSource.remove(id: connection.id, scope: connection.scope) diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 4e642e1bc5..368c7810b9 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 6ba8eac719..90a3efd6fc 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index ca0f6ebdd3..2b86716e92 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 4650a974ab..f03f2be8c2 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 92823b0f35..1479542496 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 1f2f6f24e2..6504def156 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index e5bba03b30..2087df62d7 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index bd2da748f7..8f2d7f7275 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6122,6 +6122,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 4854d32a61..18c5fe100e 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 95864836f7..64ae802372 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 053988fb1b..ec8b2d7e2d 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index badea36546..4c1d08a7f1 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 1ab0a6d154..ad8fb64400 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index bfce95328f..9903403a3c 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 4b2c29830d..1a7b9bcc55 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index f92236da4e..556158cac6 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 7c19f63593..4bff990bfe 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 119f9e582b..48215d312e 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index abff826290..5f1aa854fa 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 73582e88be..3a53cefb0a 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 1cbf9b4cf8..89387f089b 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 24569a38d6..fc83f4d11b 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index caf6c6cf96..101a03f701 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index f56861e3e9..9fc8ed3661 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 157c46e18d..f86af2d7cf 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 35e2ddd94f..cf5936ccec 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 2882c76cb1..2623b9ab65 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index f94eef93eb..e73836497d 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index eab1e7a07d..fb7b55392e 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 31a7debb0d..a3df164dd9 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 1711bc24c5..ae99f2a9f4 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 41917a23ac..d34adcbc09 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index d4dccd9bf4..f45dced04c 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 3b654f21ab..a8db714e09 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 943704a93b..d898ad273c 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index a2c55d46da..1d13ff9ac9 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 5e8392a4b9..dea6120696 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index fc555a1338..5364e0d1ae 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index e45a9bcfa9..4fc6e2bda1 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 10e926d4eb..9bb27e7708 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index dbc8dcbb01..0904d28f2c 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6225,6 +6225,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index c33e6f131f..f1aae6075f 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 317dcf035a..708e987818 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6223,6 +6223,12 @@ "Revoke shared profile access" = "Revoke shared profile access"; "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; "Shared profile access" = "Shared profile access"; +"Keep" = "Keep"; +"Keep shared profile access" = "Keep shared profile access"; +"Keep these keys?" = "Keep these keys?"; +"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; +"Could not keep these keys: %@" = "Could not keep these keys: %@"; +"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; "Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; "Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; "Revoke" = "Revoke"; diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 136098d82e..0150549010 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -485,6 +485,25 @@ final class AppConnectV2LoginTests: XCTestCase { currentIdentityPublicKeys: [key(1)], nowMilliseconds: now)) XCTAssertNil(AppConnect.sharedProfileKeyIdsToDisable( recordedKeyIds: [], bindings: [], currentIdentityPublicKeys: [key(1)], nowMilliseconds: now)) + // A live v2 key the store cannot place counts even when the fetched + // view lacks it. + XCTAssertNil(AppConnect.sharedProfileKeyIdsToDisable( + recordedKeyIds: [], bindings: [binding(1, profile), binding(2, nil, unreadable: true)], + currentIdentityPublicKeys: [key(1)], nowMilliseconds: now)) + // Not when that stored key is off, expired, or named by a record. + let placedOrOff: [(AppConnect.KeyBinding, Set)] = [ + (binding(2, nil, unreadable: true).disabled(), []), + (binding(2, nil, expiresAt: 92_800_000, unreadable: true), []), + (binding(2, nil, unreadable: true), [2]), + ] + for (stored, recorded) in placedOrOff { + XCTAssertFalse(AppConnect.hasUnplacedStoredKey( + recordedKeyIds: recorded, bindings: [stored], nowMilliseconds: now)) + } + // One the fetched view shows off does not. + XCTAssertEqual(AppConnect.sharedProfileKeyIdsToDisable( + recordedKeyIds: [], bindings: [binding(1, profile), binding(2, nil, unreadable: true)], + currentIdentityPublicKeys: [key(1), key(2, disabled: true)], nowMilliseconds: now), [1]) // A stored profile key the fetched view lacks: the node is behind. XCTAssertNil(AppConnect.sharedProfileKeyIdsToDisable( recordedKeyIds: [], bindings: [binding(1, profile), binding(2, profile)], @@ -1119,3 +1138,11 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertFalse(AppConnect.Login.refused(.init(.stale, "old")).isApprovable) } } + +private extension AppConnect.KeyBinding { + func disabled() -> AppConnect.KeyBinding { + var binding = self + binding.isDisabled = true + return binding + } +} diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 296f210636..72b19587b0 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1377,7 +1377,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { /// goes with the access the count was read for and clears the offer. func testADisconnectThatLeavesSharedProfileKeysOffersToRevokeThem() async { let spy = PurchaseApprovalSpy() - let access = SharedProfileAccess(keyCount: 2, scope: "wallet-a t", identityId: "identity-a") + let access = SharedProfileAccess(keyIds: Array(1 ... 2), scope: "wallet-a t", identityId: "identity-a") spy.sharedAccess = access let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) var oneQR = Self.connection @@ -1402,7 +1402,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { /// says nothing about them; the row still shows them. func testATwoQRDisconnectSaysNothingAboutSharedProfileKeys() async { let spy = PurchaseApprovalSpy() - spy.sharedAccess = SharedProfileAccess(keyCount: 1, scope: "wallet-a t", identityId: "identity-a") + spy.sharedAccess = SharedProfileAccess(keyIds: Array(1 ... 1), scope: "wallet-a t", identityId: "identity-a") let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) viewModel.disconnect(Self.connection) @@ -1415,7 +1415,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { /// A count that could not be read is shown as unknown, not as none. func testAnUnreadableCountIsShownAsUnknown() async { let spy = PurchaseApprovalSpy() - spy.sharedAccess = SharedProfileAccess(keyCount: nil, scope: "wallet-a t", identityId: "identity-a") + spy.sharedAccess = SharedProfileAccess(keyIds: nil, scope: "wallet-a t", identityId: "identity-a") let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) var oneQR = Self.connection oneQR.loginKind = .oneQR @@ -1431,7 +1431,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { /// An access whose identity could not be read revokes nothing. func testAnAccessWithNoIdentityRevokesNothing() async { let spy = PurchaseApprovalSpy() - spy.sharedAccess = SharedProfileAccess(keyCount: nil, scope: "wallet-a t", identityId: nil) + spy.sharedAccess = SharedProfileAccess(keyIds: nil, scope: "wallet-a t", identityId: nil) let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) viewModel.refreshSharedProfileAccess() await waitUntil { viewModel.sharedProfileAccess != nil } @@ -1446,12 +1446,12 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { /// of the data source. func testWithoutSharedProfileKeysNothingIsOffered() async { let spy = PurchaseApprovalSpy() - spy.sharedAccess = SharedProfileAccess(keyCount: 1, scope: "wallet-a t", identityId: "identity-a") + spy.sharedAccess = SharedProfileAccess(keyIds: Array(1 ... 1), scope: "wallet-a t", identityId: "identity-a") let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) viewModel.refreshSharedProfileAccess() await waitUntil { viewModel.sharedProfileAccess != nil } XCTAssertNotNil(viewModel.sharedProfileAccess) - spy.sharedAccess = SharedProfileAccess(keyCount: 0, scope: "wallet-a t", identityId: "identity-a") + spy.sharedAccess = SharedProfileAccess(keyIds: [], scope: "wallet-a t", identityId: "identity-a") viewModel.refreshSharedProfileAccess() await waitUntil { viewModel.sharedProfileAccess == nil } @@ -1464,7 +1464,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { /// A failed revoke is reported, and the count is read again. func testAFailedRevokeIsReported() async { let spy = PurchaseApprovalSpy() - spy.sharedAccess = SharedProfileAccess(keyCount: 3, scope: "wallet-a t", identityId: "identity-a") + spy.sharedAccess = SharedProfileAccess(keyIds: Array(1 ... 3), scope: "wallet-a t", identityId: "identity-a") spy.revokeFailure = PurchaseSpyError.refused let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) viewModel.refreshSharedProfileAccess() @@ -1483,6 +1483,59 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertEqual(viewModel.sharedProfileAccess?.keyCount, 3) } + /// A count that could not be read offers no revoke and no keep, and a + /// revoke confirmed before the read came back runs nothing. + func testAnUnknownCountOffersNeitherRevokeNorKeep() async { + let spy = PurchaseApprovalSpy() + spy.sharedAccess = SharedProfileAccess(keyIds: nil, scope: "wallet-a t", identityId: "identity-a") + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + viewModel.refreshSharedProfileAccess() + await waitUntil { viewModel.sharedProfileAccess != nil } + + XCTAssertFalse(viewModel.canActOnSharedProfileAccess) + viewModel.revokeSharedProfileAccess() + viewModel.keepSharedProfileAccess(try! XCTUnwrap(viewModel.sharedProfileAccess)) + + XCTAssertEqual(spy.revoked, []) + XCTAssertEqual(spy.kept, []) + XCTAssertEqual(viewModel.message?.kind, .error) + } + + /// An access that went away because nothing could be read is not + /// reported as nothing to revoke. + func testAnAccessLostToAnUnreadableWalletIsNotReportedAsNone() async { + let spy = PurchaseApprovalSpy() + spy.sharedAccess = SharedProfileAccess(keyIds: Array(1 ... 1), scope: "wallet-a t", identityId: "identity-a") + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + viewModel.refreshSharedProfileAccess() + await waitUntil { viewModel.sharedProfileAccess != nil } + spy.sharedAccess = nil + viewModel.refreshSharedProfileAccess() + await waitUntil { viewModel.sharedProfileAccess == nil } + + viewModel.revokeSharedProfileAccess() + + XCTAssertEqual(spy.revoked, []) + XCTAssertEqual(viewModel.message?.kind, .error) + } + + /// Keeping goes with the access shown and reads the count again. + func testKeepingSharedProfileAccessHidesTheKeysShown() async { + let spy = PurchaseApprovalSpy() + let access = SharedProfileAccess(keyIds: [4, 7], scope: "wallet-a t", identityId: "identity-a") + spy.sharedAccess = access + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + viewModel.refreshSharedProfileAccess() + await waitUntil { viewModel.sharedProfileAccess != nil } + + viewModel.keepSharedProfileAccess(access) + await waitUntil { viewModel.sharedProfileAccess == nil } + + XCTAssertEqual(spy.kept, [access]) + XCTAssertEqual(spy.revoked, []) + XCTAssertNil(viewModel.message) + } + /// With the login unresolved the sheet's action asks again and approves /// nothing. func testAnUnresolvedLoginIsAskedForAgainInsteadOfApproved() async { @@ -1776,8 +1829,14 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { private var storedSharedAccessReads = 0 private var storedRevoked: [SharedProfileAccess] = [] private var storedRevokeFailure: Error? + private var storedKept: [SharedProfileAccess] = [] + + var kept: [SharedProfileAccess] { + lock.withLock { storedKept } + } - /// What `sharedProfileAccess` reports; a revoke that succeeds clears it. + /// What `sharedProfileAccess` reports; a revoke or a keep that succeeds + /// clears it. var sharedAccess: SharedProfileAccess? { get { lock.withLock { storedSharedAccess } } set { lock.withLock { storedSharedAccess = newValue } } @@ -1814,6 +1873,13 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { if let failure { throw failure } return count } + + func keepSharedProfileAccess(_ access: SharedProfileAccess) async throws { + lock.withLock { + storedKept.append(access) + storedSharedAccess = nil + } + } } /// A `DashConnectDataSource` for the login approval: every QR is the sample @@ -1880,6 +1946,7 @@ private final class LoginApprovalSpy: DashConnectDataSource { func remove(id: String, scope: String?) async {} func sharedProfileAccess() async -> SharedProfileAccess? { nil } func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int { 0 } + func keepSharedProfileAccess(_ access: SharedProfileAccess) async throws {} } /// The URLs a view model asked to open, in order. @@ -2565,7 +2632,11 @@ final class AppConnectLoginTests: XCTestCase { await Self.expectWalletChanged { _ = try await dataSource.revokeSharedProfileAccess( - SharedProfileAccess(keyCount: 1, scope: scopeA, identityId: "identity-a")) + SharedProfileAccess(keyIds: Array(1 ... 1), scope: scopeA, identityId: "identity-a")) + } + await Self.expectWalletChanged { + try await dataSource.keepSharedProfileAccess( + SharedProfileAccess(keyIds: [3], scope: scopeA, identityId: "identity-a")) } XCTAssertEqual(connections.load(), [other]) } From a2c04e393127ba19ba2bafc3f35a484a1f45094d Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 22:35:52 +0200 Subject: [PATCH 068/108] fix(dashconnect): show the shared profile row in the connections card With connections on screen the row sat outside their scroll view and could end up below it. It is now the card's last row; without connections it stands on its own as before. Co-Authored-By: Claude Opus 5.5 --- .../Components/ConnectionsList.swift | 3 +++ .../UI/DashConnect/ConnectionsScreen.swift | 27 ++++++++++++------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionsList.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionsList.swift index 2fbfea899d..c1e899edfe 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionsList.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionsList.swift @@ -27,6 +27,8 @@ struct ConnectionsList: View { let onScanQR: () -> Void let onMockScan: () -> Void let onDisconnect: (DAppConnection) -> Void + /// A row under the connections, in the same card and scroll view. + var footer: AnyView? = nil var body: some View { ScrollView(showsIndicators: false) { @@ -39,6 +41,7 @@ struct ConnectionsList: View { onDisconnect: { onDisconnect(connection) } ) } + if let footer { footer } } .modifier(MenuViewModifier()) } diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 0ffaf9e547..4cae0a3f5e 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -54,14 +54,10 @@ struct ConnectionsScreen: View { content - if viewModel.showsSharedProfileAccess { - SharedProfileAccessRow( - keyCount: viewModel.sharedProfileAccess?.keyCount, - onRevoke: viewModel.canActOnSharedProfileAccess ? { isConfirmingSharedProfileRevoke = true } : nil, - onKeep: viewModel.canActOnSharedProfileAccess ? { - sharedProfileAccessToKeep = viewModel.sharedProfileAccess - isConfirmingSharedProfileKeep = true - } : nil) + // With connections the row is in their card, so it scrolls + // with them; without, it stands on its own. + if viewModel.connections.isEmpty, let row = sharedProfileAccessRow { + row .modifier(MenuViewModifier()) .padding(.horizontal, 20) .padding(.vertical, 12) @@ -136,6 +132,18 @@ struct ConnectionsScreen: View { // MARK: - States + /// The shared profile keys row, while there is something to show. + private var sharedProfileAccessRow: SharedProfileAccessRow? { + guard viewModel.showsSharedProfileAccess else { return nil } + return SharedProfileAccessRow( + keyCount: viewModel.sharedProfileAccess?.keyCount, + onRevoke: viewModel.canActOnSharedProfileAccess ? { isConfirmingSharedProfileRevoke = true } : nil, + onKeep: viewModel.canActOnSharedProfileAccess ? { + sharedProfileAccessToKeep = viewModel.sharedProfileAccess + isConfirmingSharedProfileKeep = true + } : nil) + } + @ViewBuilder private var content: some View { if viewModel.featureUnavailable { ConnectionsUnavailableState() @@ -146,7 +154,8 @@ struct ConnectionsScreen: View { connections: viewModel.connections, onScanQR: showScanner, onMockScan: mockScan, - onDisconnect: viewModel.disconnect + onDisconnect: viewModel.disconnect, + footer: sharedProfileAccessRow.map { AnyView($0) } ) .padding(.horizontal, 20) } From 1eff8850d854e82055af1fad2bdd39ad4ea31d28 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 23:19:47 +0200 Subject: [PATCH 069/108] fix(dashconnect): pin a shared profile revoke to what was shown and fail closed on unknown records - The revoke confirmation keeps the access it was opened for; a different current access is refused, and only the key ids shown are turned off. - A grant row the store cannot read that may belong to the identity makes the shared count unknown and refuses keep and revoke (before the PIN for the revoke). - No stored keys means not loaded: the count loads the identity once, and stays unknown if the store is still empty. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 13 +++++ .../PlatformDashConnectDataSource.swift | 51 ++++++++++++++++--- .../UI/DashConnect/ConnectionsScreen.swift | 9 +++- .../UI/DashConnect/ConnectionsViewModel.swift | 18 +++++-- .../PlatformDashConnectDataSourceTests.swift | 45 +++++++++++++--- 5 files changed, 116 insertions(+), 20 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index eb7c768060..6e6741912e 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -772,6 +772,10 @@ protocol AppConnectResponseStore { /// Whether `save` keeps anything. A login must not register a key the /// store cannot record: its response could not be found again. var canPersist: Bool { get } + /// Whether the store holds a row `load` leaves out because it cannot be + /// read, and that may be a record of `identityId`: one naming another + /// identity is not. + func hasUnreadableRows(identityId: String) -> Bool func load() -> [AppConnectGrant] func save(_ grants: [AppConnectGrant]) /// This store fixed to one wallet, and to the network scope it has now, @@ -781,6 +785,7 @@ protocol AppConnectResponseStore { extension AppConnectResponseStore { var canPersist: Bool { true } + func hasUnreadableRows(identityId: String) -> Bool { false } } /// Wallet- and network-scoped, like `UserDefaultsDashConnectStore`, whose @@ -854,6 +859,14 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { /// leaves such a value alone, so nothing new would be kept. var canPersist: Bool { storageKey != nil && !readRows().isNotRowList } + func hasUnreadableRows(identityId: String) -> Bool { + let rows = readRows() + return rows.isNotRowList || rows.unreadable.contains { + guard let named = ($0 as? [String: Any])?["identityId"] as? String else { return true } + return named == identityId + } + } + func load() -> [AppConnectGrant] { readRows().grants } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 2d60213775..f8185c1d9a 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -2348,8 +2348,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let identityId = context.identityId.toBase58String() let recorded = accountedKeyIds(of: identityId, in: stores) let nowMilliseconds = Int64(AppConnect.milliseconds(now())) - guard let bindings = try? Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer), - !AppConnect.hasUnplacedStoredKey(recordedKeyIds: recorded, bindings: bindings, nowMilliseconds: nowMilliseconds) + var stored = try? Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + // An identity always has keys: none stored means not loaded yet, and + // one load writes them. + if stored?.isEmpty == true, (try? await refreshedIdentityPublicKeys(context: context)) != nil { + stored = try? Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + } + guard let bindings = stored, + Self.canTellSharedProfileKeys( + identityId: identityId, recordedKeyIds: recorded, bindings: bindings, stores: stores, nowMilliseconds: nowMilliseconds) else { return SharedProfileAccess(keyIds: nil, scope: stores.scope, identityId: identityId) } @@ -2381,7 +2388,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let recorded = accountedKeyIds(of: identityId, in: stores) let nowMilliseconds = Int64(AppConnect.milliseconds(now())) let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) - guard !AppConnect.hasUnplacedStoredKey(recordedKeyIds: recorded, bindings: bindings, nowMilliseconds: nowMilliseconds) + guard Self.canTellSharedProfileKeys( + identityId: identityId, recordedKeyIds: recorded, bindings: bindings, stores: stores, nowMilliseconds: nowMilliseconds) else { throw DashConnectPlatformError.identityKeysOutOfDate } let shared = Set(AppConnect.storedSharedProfileKeyIds( recordedKeyIds: recorded, bindings: bindings, nowMilliseconds: nowMilliseconds)) @@ -2400,6 +2408,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { .union(keptSharedProfileKeyIds(scope: stores.scope, identityId: identityId)) } + /// Whether the wallet's records can tell the shared profile keys apart: + /// not while the identity's keys are not loaded (an identity always has + /// some, so none stored means not loaded), a grant record cannot be read + /// (it may name one of them), or a stored key cannot be placed + /// (`AppConnect.hasUnplacedStoredKey`). + private static func canTellSharedProfileKeys( + identityId: String, + recordedKeyIds: Set, + bindings: [AppConnect.KeyBinding], + stores: Stores, + nowMilliseconds: Int64 + ) -> Bool { + !bindings.isEmpty && !stores.grants.hasUnreadableRows(identityId: identityId) + && !AppConnect.hasUnplacedStoredKey( + recordedKeyIds: recordedKeyIds, bindings: bindings, nowMilliseconds: nowMilliseconds) + } + /// The shared profile keys the user kept for this identity in this scope. /// A key id is never reused on an identity, so an id names one key. private func keptSharedProfileKeyIds(scope: String, identityId: String) -> Set { @@ -2436,8 +2461,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard access.identityId == context.identityId.toBase58String() else { throw DashConnectPlatformError.walletChanged } - // A count that was never established is not a go-ahead. - guard access.keyCount != nil else { throw DashConnectPlatformError.identityKeysOutOfDate } + // A count that was never established is not a go-ahead, nor is one a + // grant record the store cannot read may contradict. + guard let shownKeyIds = access.keyIds, let accessIdentityId = access.identityId, + !stores.grants.hasUnreadableRows(identityId: accessIdentityId) else { + throw DashConnectPlatformError.identityKeysOutOfDate + } try await authorize() context = try await contextAfterAuthorization(matching: context) let identityId = context.identityId.toBase58String() @@ -2447,14 +2476,22 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { await confirmRegistrations( identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, modelContainer: context.modelContainer, in: stores) - guard let keyIds = AppConnect.sharedProfileKeyIdsToDisable( + let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + guard !bindings.isEmpty, !stores.grants.hasUnreadableRows(identityId: identityId) else { + throw DashConnectPlatformError.identityKeysOutOfDate + } + guard let unattributed = AppConnect.sharedProfileKeyIdsToDisable( recordedKeyIds: accountedKeyIds(of: identityId, in: stores), - bindings: try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer), + bindings: bindings, currentIdentityPublicKeys: currentPublicKeys, nowMilliseconds: Int64(AppConnect.milliseconds(now())) ) else { throw DashConnectPlatformError.identityKeysOutOfDate } + // Only keys the user was shown: one that turned up since is counted + // and offered next time, not turned off unseen. + let shown = Set(shownKeyIds) + let keyIds = unattributed.filter(shown.contains) guard !keyIds.isEmpty else { return 0 } Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) shared profile key(s)") try await disableKeys(keyIds, context: context, signer: KeychainSigner(modelContainer: context.modelContainer)) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 4cae0a3f5e..8a62f1981b 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -30,6 +30,8 @@ struct ConnectionsScreen: View { @StateObject private var viewModel: ConnectionsViewModel @State private var isConfirmingSharedProfileRevoke = false @State private var isConfirmingSharedProfileKeep = false + /// The access the revoke confirmation was opened for. + @State private var sharedProfileAccessToRevoke: SharedProfileAccess? /// The access the keep confirmation was opened for. @State private var sharedProfileAccessToKeep: SharedProfileAccess? @@ -87,7 +89,7 @@ struct ConnectionsScreen: View { titleVisibility: .visible ) { Button(NSLocalizedString("Revoke shared profile access", comment: "DashConnect"), role: .destructive) { - viewModel.revokeSharedProfileAccess() + viewModel.revokeSharedProfileAccess(sharedProfileAccessToRevoke) } Button(NSLocalizedString("Cancel", comment: ""), role: .cancel) {} } message: { @@ -137,7 +139,10 @@ struct ConnectionsScreen: View { guard viewModel.showsSharedProfileAccess else { return nil } return SharedProfileAccessRow( keyCount: viewModel.sharedProfileAccess?.keyCount, - onRevoke: viewModel.canActOnSharedProfileAccess ? { isConfirmingSharedProfileRevoke = true } : nil, + onRevoke: viewModel.canActOnSharedProfileAccess ? { + sharedProfileAccessToRevoke = viewModel.sharedProfileAccess + isConfirmingSharedProfileRevoke = true + } : nil, onKeep: viewModel.canActOnSharedProfileAccess ? { sharedProfileAccessToKeep = viewModel.sharedProfileAccess isConfirmingSharedProfileKeep = true diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index bdadf97d6c..8a33005e3e 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -478,7 +478,7 @@ final class ConnectionsViewModel: ObservableObject { /// Disables every DashPay profile key no connection accounts for and the /// user did not keep, for every app that holds one. Same guards as `disconnect`: it signs an /// identity update. - func revokeSharedProfileAccess() { + func revokeSharedProfileAccess(_ shown: SharedProfileAccess?) { guard canSignIdentityUpdate else { // The user confirmed a destructive action; say why nothing ran. message = Self.busyMessage @@ -500,6 +500,12 @@ final class ConnectionsViewModel: ObservableObject { message = Self.sharedProfileAccessUncheckedMessage return } + // Only the access the user confirmed: a read that finished while the + // confirmation was up may be another wallet's or identity's. + guard access == shown else { + message = Self.sharedProfileAccessChangedMessage + return + } isDisconnecting = true Task { [weak self] in guard let self else { return } @@ -543,9 +549,7 @@ final class ConnectionsViewModel: ObservableObject { return } guard access == shown else { - message = ConnectionsScreenMessage( - kind: .error, - text: NSLocalizedString("The keys changed. Check them and try again.", comment: "DashConnect")) + message = Self.sharedProfileAccessChangedMessage return } // Shares the revoke's busy flag: a revoke confirmed meanwhile would @@ -574,6 +578,12 @@ final class ConnectionsViewModel: ObservableObject { "Another DashConnect request is in progress. Try again when it finishes.", comment: "DashConnect")) } + private static var sharedProfileAccessChangedMessage: ConnectionsScreenMessage { + ConnectionsScreenMessage( + kind: .error, + text: NSLocalizedString("The keys changed. Check them and try again.", comment: "DashConnect")) + } + private static var sharedProfileAccessUncheckedMessage: ConnectionsScreenMessage { ConnectionsScreenMessage( kind: .error, diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 72b19587b0..fef72e6c6c 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1390,7 +1390,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertEqual(viewModel.message?.text.contains("2"), true) viewModel.message = nil - viewModel.revokeSharedProfileAccess() + viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) await waitUntil { !viewModel.isDisconnecting && viewModel.message != nil } XCTAssertEqual(spy.revoked, [access]) @@ -1436,7 +1436,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { viewModel.refreshSharedProfileAccess() await waitUntil { viewModel.sharedProfileAccess != nil } - viewModel.revokeSharedProfileAccess() + viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) XCTAssertEqual(spy.revoked, []) XCTAssertFalse(viewModel.isDisconnecting) @@ -1457,7 +1457,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { await waitUntil { viewModel.sharedProfileAccess == nil } XCTAssertNil(viewModel.sharedProfileAccess) - viewModel.revokeSharedProfileAccess() + viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) XCTAssertEqual(spy.revoked, []) } @@ -1471,10 +1471,10 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { await waitUntil { viewModel.sharedProfileAccess != nil } let reads = spy.sharedAccessReads - viewModel.revokeSharedProfileAccess() + viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) XCTAssertTrue(viewModel.isDisconnecting) // A second tap while the first is still out must not start another. - viewModel.revokeSharedProfileAccess() + viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) await waitUntil { !viewModel.isDisconnecting } XCTAssertEqual(spy.revoked.count, 1) @@ -1493,7 +1493,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { await waitUntil { viewModel.sharedProfileAccess != nil } XCTAssertFalse(viewModel.canActOnSharedProfileAccess) - viewModel.revokeSharedProfileAccess() + viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) viewModel.keepSharedProfileAccess(try! XCTUnwrap(viewModel.sharedProfileAccess)) XCTAssertEqual(spy.revoked, []) @@ -1513,7 +1513,26 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { viewModel.refreshSharedProfileAccess() await waitUntil { viewModel.sharedProfileAccess == nil } - viewModel.revokeSharedProfileAccess() + viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) + + XCTAssertEqual(spy.revoked, []) + XCTAssertEqual(viewModel.message?.kind, .error) + } + + /// A revoke goes only with the access its confirmation was opened for: + /// one read meanwhile, of another wallet or identity, is not revoked. + func testARevokeIsPinnedToTheAccessItWasConfirmedFor() async { + let spy = PurchaseApprovalSpy() + let shown = SharedProfileAccess(keyIds: [4], scope: "wallet-a t", identityId: "identity-a") + spy.sharedAccess = shown + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + viewModel.refreshSharedProfileAccess() + await waitUntil { viewModel.sharedProfileAccess != nil } + spy.sharedAccess = SharedProfileAccess(keyIds: [9], scope: "wallet-b t", identityId: "identity-b") + viewModel.refreshSharedProfileAccess() + await waitUntil { viewModel.sharedProfileAccess?.scope == "wallet-b t" } + + viewModel.revokeSharedProfileAccess(shown) XCTAssertEqual(spy.revoked, []) XCTAssertEqual(viewModel.message?.kind, .error) @@ -2511,6 +2530,7 @@ final class AppConnectLoginTests: XCTestCase { let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } XCTAssertEqual(store.load().map(\.sessionKeyId), [6]) + XCTAssertTrue(store.hasUnreadableRows(identityId: "identity"), "a record load leaves out may name a key") store.save(store.load() + [Self.grant(sessionKeyId: 7)]) XCTAssertEqual(store.load().map(\.sessionKeyId), [6, 7]) @@ -2524,6 +2544,15 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertNotNil(defaults.data(forKey: "scope.app-connect-responses.v1")) } + func testAnUnreadableRowOfAnotherIdentityLeavesThisOneReadable() { + let stored = #"[{"identityId":"other","somethingNewer":true}]"# + defaults.set(Data(stored.utf8), forKey: "scope.app-connect-responses.v1") + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } + + XCTAssertFalse(store.hasUnreadableRows(identityId: "identity")) + XCTAssertTrue(store.hasUnreadableRows(identityId: "other")) + } + func testAStoredValueThatIsNotARowListIsNeverReplaced() { let suiteName = "AppConnectResponseStoreTests.\(UUID().uuidString)" let defaults = UserDefaults(suiteName: suiteName)! @@ -2532,10 +2561,12 @@ final class AppConnectLoginTests: XCTestCase { let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } XCTAssertTrue(store.canPersist) + XCTAssertFalse(store.hasUnreadableRows(identityId: "identity")) for stored in [Data(#"{"rows":[]}"#.utf8), Data([0xFF, 0x00])] { defaults.set(stored, forKey: key) // Nothing new would be kept, so a login must not start. XCTAssertFalse(store.canPersist) + XCTAssertTrue(store.hasUnreadableRows(identityId: "identity")) XCTAssertEqual(store.load().count, 0) store.save([Self.grant(sessionKeyId: 7)]) XCTAssertEqual(defaults.data(forKey: key), stored) From 858797141ce2fa01aadf967ea491184f6a2e14cc Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 23:49:58 +0200 Subject: [PATCH 070/108] fix(dashconnect): judge a vanished shared profile access by the identity it was confirmed for - The view model keeps the latest read with its scope and identity. A confirmed revoke or keep whose access a read of another wallet or identity replaced with none is refused; none for the confirmed identity is reported as none. - Keep checks the store before the PIN prompt, and asks for nothing when none of the shown keys is still shared. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 26 ++++++-- .../UI/DashConnect/ConnectionsViewModel.swift | 27 ++++++--- .../PlatformDashConnectDataSourceTests.swift | 59 +++++++++++++++++++ 3 files changed, 97 insertions(+), 15 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index f8185c1d9a..fa8cb5ba1f 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -2378,6 +2378,25 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.walletChanged } guard let keyIds = access.keyIds else { throw DashConnectPlatformError.identityKeysOutOfDate } + // The shared keys the store tells apart now, or a refusal: read + // before the PIN prompt, so an unknown state asks for nothing, + // and again after it, since the store can change meanwhile. + func sharedNow() throws -> (recorded: Set, bindings: [AppConnect.KeyBinding], nowMilliseconds: Int64) { + let recorded = accountedKeyIds(of: identityId, in: stores) + let nowMilliseconds = Int64(AppConnect.milliseconds(now())) + let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + guard Self.canTellSharedProfileKeys( + identityId: identityId, recordedKeyIds: recorded, bindings: bindings, stores: stores, + nowMilliseconds: nowMilliseconds) + else { throw DashConnectPlatformError.identityKeysOutOfDate } + return (recorded, bindings, nowMilliseconds) + } + let before = try sharedNow() + // None of the shown keys is still shared: nothing to keep, and no + // reason to ask for the PIN. + guard keyIds.contains(where: Set(AppConnect.storedSharedProfileKeyIds( + recordedKeyIds: before.recorded, bindings: before.bindings, nowMilliseconds: before.nowMilliseconds + )).contains) else { return } // It takes keys off what a revoke can reach, so it asks as a // revoke does. try await authorize() @@ -2385,12 +2404,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // Only keys the store still counts as shared now: an id that is // no longer one must not be exempted from the checks the kept // ids skip. - let recorded = accountedKeyIds(of: identityId, in: stores) - let nowMilliseconds = Int64(AppConnect.milliseconds(now())) - let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) - guard Self.canTellSharedProfileKeys( - identityId: identityId, recordedKeyIds: recorded, bindings: bindings, stores: stores, nowMilliseconds: nowMilliseconds) - else { throw DashConnectPlatformError.identityKeysOutOfDate } + let (recorded, bindings, nowMilliseconds) = try sharedNow() let shared = Set(AppConnect.storedSharedProfileKeyIds( recordedKeyIds: recorded, bindings: bindings, nowMilliseconds: nowMilliseconds)) let key = Self.keptSharedProfileKeysKey(scope: stores.scope, identityId: identityId) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 8a33005e3e..23bfd6a397 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -64,9 +64,9 @@ final class ConnectionsViewModel: ObservableObject { /// Each read of `sharedProfileAccess` takes the next number; only the /// latest one started is shown, so a slow older read cannot overwrite it. private var sharedProfileAccessGeneration = 0 - /// Whether the latest shown read found the active identity with no such - /// key, as opposed to no readable wallet or identity. - private var sharedProfileAccessFoundNone = false + /// The latest shown read as the data source gave it, a count of none + /// included, so an empty result keeps the scope and identity it is for. + private var lastSharedProfileRead: SharedProfileAccess? @Published var message: ConnectionsScreenMessage? /// Failure of the last approve attempt, rendered **inside** the approve sheet. /// A screen-level `.alert` cannot appear over a presented sheet, so routing this @@ -152,7 +152,7 @@ final class ConnectionsViewModel: ObservableObject { let access = read?.keyCount == 0 ? nil : read if generation == sharedProfileAccessGeneration { sharedProfileAccess = access - sharedProfileAccessFoundNone = read?.keyCount == 0 + lastSharedProfileRead = read } return access } @@ -485,13 +485,14 @@ final class ConnectionsViewModel: ObservableObject { return } guard let access = sharedProfileAccess else { - // A read finished while the confirmation was up. Only one that - // read the identity and found none says so. - message = sharedProfileAccessFoundNone + // A read finished while the confirmation was up and shows none. + // Only one for the confirmed wallet and identity says so; another + // one's says nothing about the keys confirmed. + message = readNone(for: shown) ? ConnectionsScreenMessage( kind: .success, text: NSLocalizedString("No DashPay profile key needed revoking.", comment: "DashConnect")) - : Self.sharedProfileAccessUncheckedMessage + : Self.sharedProfileAccessChangedMessage return } guard canActOnSharedProfileAccess else { @@ -541,7 +542,8 @@ final class ConnectionsViewModel: ObservableObject { // Only the keys the user was shown: a read that finished while the // confirmation was up may count others, or none. guard let access = sharedProfileAccess else { - if !sharedProfileAccessFoundNone { message = Self.sharedProfileAccessUncheckedMessage } + // None left for the identity shown: nothing to keep. + if !readNone(for: shown) { message = Self.sharedProfileAccessChangedMessage } return } guard canActOnSharedProfileAccess else { @@ -571,6 +573,13 @@ final class ConnectionsViewModel: ObservableObject { } } + /// Whether the latest read found no shared key for the wallet, network + /// and identity `shown` was read for. + private func readNone(for shown: SharedProfileAccess?) -> Bool { + guard let shown, let read = lastSharedProfileRead, read.keyCount == 0 else { return false } + return read.scope == shown.scope && read.identityId == shown.identityId + } + private static var busyMessage: ConnectionsScreenMessage { ConnectionsScreenMessage( kind: .error, diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index fef72e6c6c..fb75d6ed29 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1538,6 +1538,65 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertEqual(viewModel.message?.kind, .error) } + /// A confirmed revoke whose access a later read replaced with none, of + /// another wallet, is not reported as nothing to revoke. + func testARevokeWhoseAccessWasReadAsNoneElsewhereIsNotReportedAsDone() async { + let spy = PurchaseApprovalSpy() + let shown = SharedProfileAccess(keyIds: [4], scope: "wallet-a t", identityId: "identity-a") + spy.sharedAccess = shown + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + viewModel.refreshSharedProfileAccess() + await waitUntil { viewModel.sharedProfileAccess != nil } + spy.sharedAccess = SharedProfileAccess(keyIds: [], scope: "wallet-b t", identityId: "identity-b") + viewModel.refreshSharedProfileAccess() + await waitUntil { viewModel.sharedProfileAccess == nil } + + viewModel.revokeSharedProfileAccess(shown) + + XCTAssertEqual(spy.revoked, []) + XCTAssertEqual(viewModel.message?.kind, .error) + } + + /// A read of the confirmed identity that finds none left is reported as + /// such; keeping then has nothing to do, and says nothing. + func testNoneLeftForTheConfirmedIdentityIsReportedAsNone() async { + let spy = PurchaseApprovalSpy() + let shown = SharedProfileAccess(keyIds: [4], scope: "wallet-a t", identityId: "identity-a") + spy.sharedAccess = shown + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + viewModel.refreshSharedProfileAccess() + await waitUntil { viewModel.sharedProfileAccess != nil } + spy.sharedAccess = SharedProfileAccess(keyIds: [], scope: "wallet-a t", identityId: "identity-a") + viewModel.refreshSharedProfileAccess() + await waitUntil { viewModel.sharedProfileAccess == nil } + + viewModel.keepSharedProfileAccess(shown) + XCTAssertNil(viewModel.message) + viewModel.revokeSharedProfileAccess(shown) + + XCTAssertEqual(spy.revoked, []) + XCTAssertEqual(spy.kept, []) + XCTAssertEqual(viewModel.message?.kind, .success) + } + + /// Keeping an access a later read of another wallet replaced is refused. + func testAKeepWhoseAccessWasReadAsNoneElsewhereIsRefused() async { + let spy = PurchaseApprovalSpy() + let shown = SharedProfileAccess(keyIds: [4], scope: "wallet-a t", identityId: "identity-a") + spy.sharedAccess = shown + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + viewModel.refreshSharedProfileAccess() + await waitUntil { viewModel.sharedProfileAccess != nil } + spy.sharedAccess = SharedProfileAccess(keyIds: [], scope: "wallet-b t", identityId: "identity-b") + viewModel.refreshSharedProfileAccess() + await waitUntil { viewModel.sharedProfileAccess == nil } + + viewModel.keepSharedProfileAccess(shown) + + XCTAssertEqual(spy.kept, []) + XCTAssertEqual(viewModel.message?.kind, .error) + } + /// Keeping goes with the access shown and reads the count again. func testKeepingSharedProfileAccessHidesTheKeysShown() async { let spy = PurchaseApprovalSpy() From eb523024d17c96c885fabdde376c64440c9ee72f Mon Sep 17 00:00:00 2001 From: romchornyi Date: Sat, 31 Oct 2026 00:16:18 +0200 Subject: [PATCH 071/108] fix(dashconnect): compare App Connect key expiries as unsigned timestamps The SDK carries the protocol's unsigned expiry in an Int64's bits, so an expiry past Int64.max read as already expired and hid a live shared profile key from the count, the revoke and the unplaced-key check. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectV2Login.swift | 7 ++++++- .../DashConnect/AppConnectV2LoginTests.swift | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 1e2ce43e31..a6793dac5c 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -849,8 +849,13 @@ extension AppConnect { /// Platform goes by block time, so a device clock up to `clockTolerance` /// fast does not count a working key as expired. Every v2 auth key has an /// expiry; a key with none is not one, and counts as false here. + /// `expiresAt` carries the protocol's unsigned timestamp in an `Int64`'s + /// bits, so it is compared as unsigned: an expiry past `Int64.max` is far + /// in the future, not in the past. static func isUnexpired(_ expiresAt: Int64?, nowMilliseconds: Int64) -> Bool { - (expiresAt ?? 0) > nowMilliseconds - Int64(clockTolerance * 1000) + guard let expiresAt else { return false } + let earliest = max(0, nowMilliseconds - Int64(clockTolerance * 1000)) + return UInt64(bitPattern: expiresAt) > UInt64(earliest) } /// The unattributed profile keys the wallet's store shows as live and diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 0150549010..0a46b37f17 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -476,6 +476,20 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertEqual( AppConnect.storedSharedProfileKeyIds(recordedKeyIds: [5], bindings: bindings, nowMilliseconds: now), [1, 2]) + // Expiries past Int64.max arrive as negative bit patterns and are far + // in the future: counted, revoked, and still blocking when unplaced. + for far in [Int64.max, Int64(bitPattern: UInt64(Int64.max) + 1), -1] { + XCTAssertTrue(AppConnect.isUnexpired(far, nowMilliseconds: now)) + XCTAssertEqual(AppConnect.storedSharedProfileKeyIds( + recordedKeyIds: [], bindings: [binding(1, profile, expiresAt: far)], nowMilliseconds: now), [1]) + XCTAssertEqual(AppConnect.sharedProfileKeyIdsToDisable( + recordedKeyIds: [], bindings: [binding(1, profile, expiresAt: far)], + currentIdentityPublicKeys: [key(1, expiresAt: far)], nowMilliseconds: now), [1]) + XCTAssertTrue(AppConnect.hasUnplacedStoredKey( + recordedKeyIds: [], bindings: [binding(2, nil, expiresAt: far, unreadable: true)], nowMilliseconds: now)) + } + XCTAssertFalse(AppConnect.isUnexpired(nil, nowMilliseconds: now)) + XCTAssertFalse(AppConnect.isUnexpired(0, nowMilliseconds: now)) // An hour of a fast device clock does not expire a working key. XCTAssertEqual(AppConnect.storedSharedProfileKeyIds( recordedKeyIds: [], bindings: [binding(1, profile, expiresAt: now - 1_000)], nowMilliseconds: now), [1]) From 78ceedd30de1a1b945d797c03102e89b7e1d3560 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Sat, 31 Oct 2026 20:42:53 +0200 Subject: [PATCH 072/108] feat(dashconnect): a disconnect turns off unattributed DashPay profile keys; remove Keep and the shared profile row Product decision: DashPay profile keys that no grant record names are turned off automatically. A disconnect that signs an update for the app also disables the active identity's live, unexpired profile keys no confirmed record names (AppConnect.sharedProfileKeyIdsToDisable), and stops with identityKeysOutOfDate when that set cannot be told. The disconnect returns how many it turned off, and the screen says so. The Keep feature, its store, the shared profile access row with its Revoke, SharedProfileAccess and the data source's sharedProfileAccess, revokeSharedProfileAccess and keepSharedProfileAccess are removed. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 24 +- .../DashConnect/DashConnectDataSource.swift | 37 +- .../DashConnect/DashConnectModels.swift | 18 - .../PlatformDashConnectDataSource.swift | 244 +++--------- .../Components/ConnectionsList.swift | 3 - .../UI/DashConnect/ConnectionsScreen.swift | 109 +----- .../UI/DashConnect/ConnectionsViewModel.swift | 220 +---------- DashWallet/ar.lproj/Localizable.strings | 23 +- DashWallet/bg.lproj/Localizable.strings | 23 +- DashWallet/ca.lproj/Localizable.strings | 23 +- DashWallet/cs.lproj/Localizable.strings | 23 +- DashWallet/da.lproj/Localizable.strings | 23 +- DashWallet/de.lproj/Localizable.strings | 23 +- DashWallet/el.lproj/Localizable.strings | 23 +- DashWallet/en.lproj/Localizable.strings | 23 +- DashWallet/eo.lproj/Localizable.strings | 23 +- DashWallet/es.lproj/Localizable.strings | 23 +- DashWallet/et.lproj/Localizable.strings | 23 +- DashWallet/fa.lproj/Localizable.strings | 23 +- DashWallet/fi.lproj/Localizable.strings | 23 +- DashWallet/fil.lproj/Localizable.strings | 23 +- DashWallet/fr.lproj/Localizable.strings | 23 +- DashWallet/hr.lproj/Localizable.strings | 23 +- DashWallet/hu.lproj/Localizable.strings | 23 +- DashWallet/id.lproj/Localizable.strings | 23 +- DashWallet/it.lproj/Localizable.strings | 23 +- DashWallet/ja.lproj/Localizable.strings | 23 +- DashWallet/ko.lproj/Localizable.strings | 23 +- DashWallet/mk.lproj/Localizable.strings | 23 +- DashWallet/ms.lproj/Localizable.strings | 23 +- DashWallet/nb.lproj/Localizable.strings | 23 +- DashWallet/nl.lproj/Localizable.strings | 23 +- DashWallet/pl.lproj/Localizable.strings | 23 +- DashWallet/pt.lproj/Localizable.strings | 23 +- DashWallet/ro.lproj/Localizable.strings | 23 +- DashWallet/ru.lproj/Localizable.strings | 23 +- DashWallet/sk.lproj/Localizable.strings | 23 +- DashWallet/sl.lproj/Localizable.strings | 23 +- DashWallet/sl_SI.lproj/Localizable.strings | 23 +- DashWallet/sq.lproj/Localizable.strings | 23 +- DashWallet/sr.lproj/Localizable.strings | 23 +- DashWallet/sv.lproj/Localizable.strings | 23 +- DashWallet/th.lproj/Localizable.strings | 23 +- DashWallet/tr.lproj/Localizable.strings | 23 +- DashWallet/uk.lproj/Localizable.strings | 23 +- DashWallet/vi.lproj/Localizable.strings | 23 +- DashWallet/zh-Hans.lproj/Localizable.strings | 23 +- .../zh-Hant-TW.lproj/Localizable.strings | 23 +- DashWallet/zh.lproj/Localizable.strings | 23 +- DashWallet/zh_TW.lproj/Localizable.strings | 23 +- .../DashConnect/AppConnectV2LoginTests.swift | 8 +- .../PlatformDashConnectDataSourceTests.swift | 352 ++---------------- 52 files changed, 237 insertions(+), 1767 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index a6793dac5c..b3c84ba721 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -813,7 +813,8 @@ extension AppConnect { /// own among them), a document type on one, or a contract group that /// owner owns (`appGroupIds`). A key bound to a foreign document type v2 /// allows (DashPay `profile`) is not among them: that bound names no - /// app, so with no record it may be any app's (`unattributedProfileKeyIds`). + /// app, so with no record it may be any app's, and a disconnect takes it + /// through `unattributedProfileKeyIds` instead. static func appsV2KeyIds( appContractIds: Set, appGroupIds: Set, @@ -832,9 +833,9 @@ extension AppConnect { /// The ids of the keys in `keys` bound to a foreign document type v2 /// allows (DashPay `profile`). Every app can be given such a key and the - /// bound does not say which one was, so with no record a disconnect - /// leaves it on; only revoking shared profile access turns these off, - /// for every app that holds one. + /// bound does not say which one was, so with no record every disconnect + /// on the identity turns these off, for every app that holds one + /// (`sharedProfileKeyIdsToDisable`). static func unattributedProfileKeyIds(keys: [(keyId: UInt32, bound: StoredBound)]) -> [UInt32] { keys.filter { _, bound in guard case .documentType(let id, let name) = bound else { return false } @@ -859,7 +860,7 @@ extension AppConnect { } /// The unattributed profile keys the wallet's store shows as live and - /// not yet expired: what the Connections screen counts. + /// not yet expired. static func storedSharedProfileKeyIds( recordedKeyIds: Set, bindings: [KeyBinding], @@ -871,8 +872,9 @@ extension AppConnect { } /// Whether the store shows a live, unexpired v2-shaped key that no record - /// names and whose bound this build cannot read: it may be a shared - /// profile key, so neither the count nor a revoke can be trusted. + /// names and whose bound this build cannot read: it may be an + /// unattributed profile key, so the set a disconnect turns off cannot be + /// trusted. static func hasUnplacedStoredKey(recordedKeyIds: Set, bindings: [KeyBinding], nowMilliseconds: Int64) -> Bool { bindings.contains { $0.isV2AuthKeyShaped && $0.hasUnreadableBound && !$0.isDisabled @@ -880,10 +882,10 @@ extension AppConnect { } } - /// The keys revoking shared profile access disables, from a fresh view of - /// the identity: live, not yet expired, bound to an allowlisted foreign - /// document type, and not in `recordedKeyIds` (the keys confirmed records - /// name, and those the user kept). + /// The unattributed profile keys a disconnect disables, from a fresh view + /// of the identity: live, not yet expired, bound to an allowlisted + /// foreign document type, and not in `recordedKeyIds` (the keys confirmed + /// records name). /// `nil` when the view cannot be trusted: a live v2-shaped key no record /// names, in the view or in the store, has no readable stored bound, so /// it may be one of them; or the store holds one of them that the view diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index cdc6efaafe..a153470fba 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -42,7 +42,11 @@ protocol DashConnectDataSource { /// Turns a connection off. For a one-QR connection this disables the key /// the app was given on the identity and deletes the published response, /// and throws when the key could not be disabled — the connection then - /// stays as it was. The connection also stays, and that is thrown, while + /// stays as it was. Every disconnect that signs an update also disables + /// the live DashPay profile keys of the active identity that no grant + /// record names: their bound does not say which app was given them, so + /// they cannot be left to a later disconnect. Returns how many of those + /// were disabled. The connection also stays, and that is thrown, while /// the app holds a key on another identity of the wallet. For a two-QR /// connection it only changes the local status: that login derives the /// same key every time and Platform never re-adds a disabled key, so @@ -52,22 +56,9 @@ protocol DashConnectDataSource { /// `scope` is the `DAppConnection.scope` of the row that was picked: /// both calls act only while it still names the wallet they would act /// on. - func disconnect(id: String, scope: String?) async throws + @discardableResult + func disconnect(id: String, scope: String?) async throws -> Int func remove(id: String, scope: String?) async - /// The live DashPay profile keys of the active identity that no grant - /// record names and the user did not keep, from the wallet's store: keys - /// App Connect gave some app that a disconnect leaves on, because the - /// bound does not say which app it was. `nil` when there is no active - /// wallet or identity; `nil` `keyIds` when they could not be told. - func sharedProfileAccess() async -> SharedProfileAccess? - /// Disables those keys, for every app that holds one, after the PIN - /// prompt and a fresh read of the identity, while `access` still names - /// the active wallet and identity. Returns how many were disabled. - func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int - /// Records on this device, after the PIN prompt, that the user - /// recognizes the keys `access` counted that are still shared: they are - /// no longer counted or revoked from here. Nothing changes on Platform. - func keepSharedProfileAccess(_ access: SharedProfileAccess) async throws } /// Why a token purchase failed, and — the part that decides what the UI may @@ -277,7 +268,8 @@ final class MockDashConnectDataSource: DashConnectDataSource { DashConnectMockError.stateTransitionNotSupported) } - func disconnect(id: String, scope: String?) async throws { + @discardableResult + func disconnect(id: String, scope: String?) async throws -> Int { let disconnectedAt = Date() persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } @@ -289,22 +281,13 @@ final class MockDashConnectDataSource: DashConnectDataSource { updatedAt: disconnectedAt ) }) + return 0 } func remove(id: String, scope: String?) async { persistAndSend(subject.value.filter { $0.id != id }) } - /// The mock grants no keys, so it holds no shared profile key. - func sharedProfileAccess() async -> SharedProfileAccess? { nil } - - func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int { 0 } - - /// The mock never reports keys to keep. - func keepSharedProfileAccess(_ access: SharedProfileAccess) async throws { - throw DashConnectMockError.approveFailed - } - private func validateNetwork(_ network: DashConnectNetwork) throws { guard network == supportedNetwork else { throw DashConnectMockError.unsupportedNetwork(expected: supportedNetwork, actual: network) diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index c6b48c969e..5a1f083208 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -200,24 +200,6 @@ struct DAppConnection: Identifiable, Equatable, Hashable { var scope: String? = nil } -/// The DashPay profile keys App Connect gave apps on the active identity -/// that no grant record names. Such a key's bound names no app, so a -/// disconnect cannot tell whose it is and leaves it on. -struct SharedProfileAccess: Equatable { - /// The keys counted; `nil` when the identity or the wallet's store could - /// not be read, or the store holds a key that may be one of them but - /// cannot be placed: unknown, not none. - let keyIds: [UInt32]? - /// The wallet and network, and the identity, the count was read for; a - /// revoke or a keep acts only while they are still the active ones. - /// `identityId` is nil when the identity could not be read, and then - /// nothing can be revoked or kept from this access. - let scope: String - let identityId: String? - - var keyCount: Int? { keyIds?.count } -} - /// A pending request derived from a scanned login QR code. struct ConnectionRequest: Equatable { let appLabel: String diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index fa8cb5ba1f..29f59cdda6 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -495,9 +495,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private let authorizer: DWIdentityAuthorizer private let stateTransitionParser: any DashConnectStateTransitionParsing private let now: () -> Date - /// Where the shared profile keys the user kept are noted, per scope and - /// identity. - private let keptSharedProfileKeys: UserDefaults /// The DashConnect network matching the app's current network selection — /// what the default data source serves. Mainnet maps to `.mainnet` for @@ -521,7 +518,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { networkEndpoint: (() -> String?)? = nil, notificationCenter: NotificationCenter = .default, operationGate: DashConnectOperationGate = .shared, - keptSharedProfileKeys: UserDefaults = .standard, now: @escaping () -> Date = Date.init ) { assert( @@ -533,7 +529,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { self.authorizer = authorizer self.stateTransitionParser = stateTransitionParser self.now = now - self.keptSharedProfileKeys = keptSharedProfileKeys self.activeWalletIdHex = activeWalletIdHex self.operationGate = operationGate // Only a devnet's nodes are configurable. @@ -2329,199 +2324,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { await updateRows(in: stores) { rows in rows.filter { $0.id != id } } } - func disconnect(id: String, scope: String?) async throws { + @discardableResult + func disconnect(id: String, scope: String?) async throws -> Int { try await gated { try await disconnectInTurn(id: id, scope: scope) } } - func sharedProfileAccess() async -> SharedProfileAccess? { - guard let stores = await showActiveWalletRows() else { return nil } - let context: Context - do { - context = try await requireContext(pinnedTo: stores) - } catch DashConnectPlatformError.noIdentity { - return nil - } catch { - // The wallet is there but its identity could not be read: unknown, - // not none, and nothing to revoke on. - return SharedProfileAccess(keyIds: nil, scope: stores.scope, identityId: nil) - } - let identityId = context.identityId.toBase58String() - let recorded = accountedKeyIds(of: identityId, in: stores) - let nowMilliseconds = Int64(AppConnect.milliseconds(now())) - var stored = try? Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) - // An identity always has keys: none stored means not loaded yet, and - // one load writes them. - if stored?.isEmpty == true, (try? await refreshedIdentityPublicKeys(context: context)) != nil { - stored = try? Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) - } - guard let bindings = stored, - Self.canTellSharedProfileKeys( - identityId: identityId, recordedKeyIds: recorded, bindings: bindings, stores: stores, nowMilliseconds: nowMilliseconds) - else { - return SharedProfileAccess(keyIds: nil, scope: stores.scope, identityId: identityId) - } - let keyIds = AppConnect.storedSharedProfileKeyIds( - recordedKeyIds: recorded, bindings: bindings, nowMilliseconds: nowMilliseconds) - return SharedProfileAccess(keyIds: keyIds, scope: stores.scope, identityId: identityId) - } - - func keepSharedProfileAccess(_ access: SharedProfileAccess) async throws { - try await gated { - guard let stores = await showActiveWalletRows() else { - throw DashConnectPlatformError.noWallet - } - guard access.scope == stores.scope, let identityId = access.identityId else { - throw DashConnectPlatformError.walletChanged - } - var context = try await requireContext(pinnedTo: stores) - guard identityId == context.identityId.toBase58String() else { - throw DashConnectPlatformError.walletChanged - } - guard let keyIds = access.keyIds else { throw DashConnectPlatformError.identityKeysOutOfDate } - // The shared keys the store tells apart now, or a refusal: read - // before the PIN prompt, so an unknown state asks for nothing, - // and again after it, since the store can change meanwhile. - func sharedNow() throws -> (recorded: Set, bindings: [AppConnect.KeyBinding], nowMilliseconds: Int64) { - let recorded = accountedKeyIds(of: identityId, in: stores) - let nowMilliseconds = Int64(AppConnect.milliseconds(now())) - let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) - guard Self.canTellSharedProfileKeys( - identityId: identityId, recordedKeyIds: recorded, bindings: bindings, stores: stores, - nowMilliseconds: nowMilliseconds) - else { throw DashConnectPlatformError.identityKeysOutOfDate } - return (recorded, bindings, nowMilliseconds) - } - let before = try sharedNow() - // None of the shown keys is still shared: nothing to keep, and no - // reason to ask for the PIN. - guard keyIds.contains(where: Set(AppConnect.storedSharedProfileKeyIds( - recordedKeyIds: before.recorded, bindings: before.bindings, nowMilliseconds: before.nowMilliseconds - )).contains) else { return } - // It takes keys off what a revoke can reach, so it asks as a - // revoke does. - try await authorize() - context = try await contextAfterAuthorization(matching: context) - // Only keys the store still counts as shared now: an id that is - // no longer one must not be exempted from the checks the kept - // ids skip. - let (recorded, bindings, nowMilliseconds) = try sharedNow() - let shared = Set(AppConnect.storedSharedProfileKeyIds( - recordedKeyIds: recorded, bindings: bindings, nowMilliseconds: nowMilliseconds)) - let key = Self.keptSharedProfileKeysKey(scope: stores.scope, identityId: identityId) - let kept = keptSharedProfileKeyIds(scope: stores.scope, identityId: identityId) - .union(keyIds.filter(shared.contains)) - keptSharedProfileKeys.set(kept.sorted().map(Int.init), forKey: key) - } - } - - /// The key ids this identity's confirmed grant records name, and the - /// shared profile keys the user kept: the keys the count and a revoke - /// leave alone. - private func accountedKeyIds(of identityId: String, in stores: Stores) -> Set { - Self.recordedKeyIds(of: identityId, in: stores) - .union(keptSharedProfileKeyIds(scope: stores.scope, identityId: identityId)) - } - - /// Whether the wallet's records can tell the shared profile keys apart: - /// not while the identity's keys are not loaded (an identity always has - /// some, so none stored means not loaded), a grant record cannot be read - /// (it may name one of them), or a stored key cannot be placed - /// (`AppConnect.hasUnplacedStoredKey`). - private static func canTellSharedProfileKeys( - identityId: String, - recordedKeyIds: Set, - bindings: [AppConnect.KeyBinding], - stores: Stores, - nowMilliseconds: Int64 - ) -> Bool { - !bindings.isEmpty && !stores.grants.hasUnreadableRows(identityId: identityId) - && !AppConnect.hasUnplacedStoredKey( - recordedKeyIds: recordedKeyIds, bindings: bindings, nowMilliseconds: nowMilliseconds) - } - - /// The shared profile keys the user kept for this identity in this scope. - /// A key id is never reused on an identity, so an id names one key. - private func keptSharedProfileKeyIds(scope: String, identityId: String) -> Set { - let stored = keptSharedProfileKeys.array( - forKey: Self.keptSharedProfileKeysKey(scope: scope, identityId: identityId)) as? [Int] ?? [] - return Set(stored.compactMap(UInt32.init(exactly:))) - } - - private static func keptSharedProfileKeysKey(scope: String, identityId: String) -> String { - "DashConnect.keptSharedProfileKeys \(scope) \(identityId)" - } - - func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int { - try await gated { try await revokeSharedProfileAccessInTurn(access) } - } - - /// Disables every live DashPay profile key of the identity `access` was - /// read for that no confirmed grant record names and the user did not - /// keep, whichever app was given it. The set is read again from Platform after the PIN prompt; nothing - /// from the count is reused. Nothing is turned off while that read cannot - /// be trusted (`AppConnect.sharedProfileKeyIdsToDisable`). - /// TODO(app-connect-v2-pending-record): a v2 approval writes its record - /// only once its update is seen to land, so the profile key of one whose - /// outcome was unknown when it failed has no record and is disabled here - /// like any other. - private func revokeSharedProfileAccessInTurn(_ access: SharedProfileAccess) async throws -> Int { - guard let stores = await showActiveWalletRows() else { - throw DashConnectPlatformError.noWallet - } - guard access.scope == stores.scope else { - throw DashConnectPlatformError.walletChanged - } - var context = try await requireContext(pinnedTo: stores) - guard access.identityId == context.identityId.toBase58String() else { - throw DashConnectPlatformError.walletChanged - } - // A count that was never established is not a go-ahead, nor is one a - // grant record the store cannot read may contradict. - guard let shownKeyIds = access.keyIds, let accessIdentityId = access.identityId, - !stores.grants.hasUnreadableRows(identityId: accessIdentityId) else { - throw DashConnectPlatformError.identityKeysOutOfDate - } - try await authorize() - context = try await contextAfterAuthorization(matching: context) - let identityId = context.identityId.toBase58String() - let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) - // A registration whose key has turned up is confirmed, and its key is - // then the app's, not shared. - await confirmRegistrations( - identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, - modelContainer: context.modelContainer, in: stores) - let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) - guard !bindings.isEmpty, !stores.grants.hasUnreadableRows(identityId: identityId) else { - throw DashConnectPlatformError.identityKeysOutOfDate - } - guard let unattributed = AppConnect.sharedProfileKeyIdsToDisable( - recordedKeyIds: accountedKeyIds(of: identityId, in: stores), - bindings: bindings, - currentIdentityPublicKeys: currentPublicKeys, - nowMilliseconds: Int64(AppConnect.milliseconds(now())) - ) else { - throw DashConnectPlatformError.identityKeysOutOfDate - } - // Only keys the user was shown: one that turned up since is counted - // and offered next time, not turned off unseen. - let shown = Set(shownKeyIds) - let keyIds = unattributed.filter(shown.contains) - guard !keyIds.isEmpty else { return 0 } - Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) shared profile key(s)") - try await disableKeys(keyIds, context: context, signer: KeychainSigner(modelContainer: context.modelContainer)) - // The reload writes the disabled keys to the store the count is read - // from. The keys are off either way. - _ = try? await refreshedIdentityPublicKeys(context: context) - return keyIds.count - } - /// The key ids this identity's confirmed grant records name. An /// unconfirmed record's id may belong to another key by now. private static func recordedKeyIds(of identityId: String, in stores: Stores) -> Set { Set(stores.grants.load().filter { $0.identityId == identityId && !$0.isUnconfirmed }.flatMap(\.keyIds)) } - private func disconnectInTurn(id: String, scope: String?) async throws { + private func disconnectInTurn(id: String, scope: String?) async throws -> Int { guard let stores = await showActiveWalletRows() else { throw DashConnectPlatformError.noWallet } @@ -2542,6 +2356,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let hasGrants = stores.grants.load().contains { $0.appContractId == id && (!$0.isUnconfirmed || $0.submittedRevision != nil) } + var profileKeysOff = 0 if rowIsOneQR || hasGrants { let revocation = try await revokeAppConnectGrants( appContractId: id, rowIsOneQR: rowIsOneQR, stores: stores) @@ -2551,6 +2366,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // while it is the active one, so the row stays to get there, and // the user is told; this identity's keys are off. if let heldElsewhere = revocation.heldElsewhere { throw heldElsewhere } + profileKeysOff = revocation.profileKeysOff if revocation.asOneQR { // The session keys are disabled, and so are the keys of an // earlier two-QR login that were found: the same QR can no @@ -2558,7 +2374,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // for, so the row goes instead of sitting in the two-QR // "approved" state. await updateRows(in: stores) { rows in rows.filter { $0.id != id } } - return + return profileKeysOff } } @@ -2578,6 +2394,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } } + return profileKeysOff } /// Whether a disconnect of the app takes the one-QR path. A live session @@ -2690,10 +2507,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// that are bound to the app's contract and shaped as this login /// registers them, so the keys a reinstalled wallet kept no record of go /// too. For a one-QR disconnect that includes the shapes App Connect v2 - /// registers (`AppConnect.appsV2KeyIds`). A DashPay profile key with no - /// record stays: its bound names no app, so it may be another app's, and - /// only `revokeSharedProfileAccess` turns it off. A key another wallet - /// gave the app in any other shape stays. + /// registers (`AppConnect.appsV2KeyIds`). Every live DashPay profile key + /// no record names goes as well: its bound names no app, so it may be + /// another app's, and it is turned off with any app's disconnect + /// (`AppConnect.sharedProfileKeyIdsToDisable`); their number is returned + /// as `profileKeysOff`. A key another wallet gave the app in any other + /// shape stays. /// TODO(app-connect-orphan-responses): the response behind a key with no /// record stays on Platform. It can only be found by its request hash, /// which the record held. @@ -2707,7 +2526,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// shows the app with a live key on another identity of this wallet, or /// with a registration there that may still land /// (`reasonHeldElsewhere`). When this identity gave it none, that is - /// thrown instead: nothing was turned off. For a one-QR disconnect that + /// thrown instead, before anything is signed: nothing was turned off, + /// the profile keys included. For a one-QR disconnect that /// also covers keys on another identity that no grant record names, as /// far as the wallet's store shows them. `asOneQR` says which disconnect /// this was. @@ -2729,7 +2549,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { appContractId: String, rowIsOneQR: Bool, stores: Stores - ) async throws -> (heldElsewhere: DashConnectPlatformError?, asOneQR: Bool) { + ) async throws -> (heldElsewhere: DashConnectPlatformError?, asOneQR: Bool, profileKeysOff: Int) { // The row was picked in the wallet `stores` belongs to; another // wallet's identity is not the one the row belongs to. var context = try await requireContext(pinnedTo: stores) @@ -2767,7 +2587,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // an earlier two-QR login can only be looked for after it. if !holdsUnrecordedKey, !rowIsOneQR { if let heldElsewhere = reasonHeldElsewhere() { throw heldElsewhere } - return (heldElsewhere: nil, asOneQR: false) + return (heldElsewhere: nil, asOneQR: false, profileKeysOff: 0) } } @@ -2884,6 +2704,25 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { appContractIds: owned.contracts, appGroupIds: owned.groups, keys: unrecorded) keyIds = Array(Set(keyIds).union(liveTwoQRLoginKeyIds).union(unrecordedV2KeyIds)).sorted() } + // The DashPay profile keys no record names go too: their bound does + // not say which app was given them, so they are turned off with + // every disconnect rather than left on for none to reach. A view the + // set cannot be told from (a live key no record names whose bound + // the store cannot read, a stored one the view lacks, a record the + // store cannot read) stops the disconnect. + // TODO(app-connect-v2-pending-record): a v2 approval writes its record + // only once its update is seen to land, so the profile key of one whose + // outcome was unknown when it failed has no record and is turned off + // here like any other. + guard !stores.grants.hasUnreadableRows(identityId: identityId), + let profileKeyIds = AppConnect.sharedProfileKeyIdsToDisable( + recordedKeyIds: Self.recordedKeyIds(of: identityId, in: stores), + bindings: bindings, + currentIdentityPublicKeys: currentPublicKeys, + nowMilliseconds: Int64(AppConnect.milliseconds(now()))) + else { + throw DashConnectPlatformError.identityKeysOutOfDate + } if !mayStillLand.isEmpty, keyIds.isEmpty { // No update would be sent, so nothing settles the registration. // This identity's own state comes first: whatever another @@ -2906,6 +2745,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let heldElsewhere = reasonHeldElsewhere(heldOnAnotherIdentity: heldOnAnotherIdentity == true) { throw heldElsewhere } + // Only once this disconnect turns off something of the app's: one + // that stops before signing leaves the profile keys too. + keyIds = Array(Set(keyIds).union(profileKeyIds)).sorted() if !keyIds.isEmpty { Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) app key(s)") // Platform takes a limited number of keys per update. A failure @@ -2913,8 +2755,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // attempt picks up what is still live. try await disableKeys(keyIds, context: context, signer: signer) Self.logger.info("🔗 DASHCONNECT :: app key(s) disabled") - // The reload writes the disabled keys to the store the shared - // profile count is read from. The keys are off either way. + // The reload writes the disabled keys to the store. The keys are + // off either way. if mayStillLand.isEmpty { _ = try? await refreshedIdentityPublicKeys(context: context) } @@ -2958,13 +2800,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } if let heldElsewhere = reasonHeldElsewhere(heldOnAnotherIdentity: heldOnAnotherIdentity == true) { - return (heldElsewhere: heldElsewhere, asOneQR: asOneQR) + return (heldElsewhere: heldElsewhere, asOneQR: asOneQR, profileKeysOff: profileKeyIds.count) } // This identity's keys are off. Whether another one holds a key of // the app could not be read from the store, so the row stays, with // an error rather than without one. guard heldOnAnotherIdentity != nil else { throw DashConnectPlatformError.otherIdentitiesNotChecked } - return (heldElsewhere: nil, asOneQR: asOneQR) + return (heldElsewhere: nil, asOneQR: asOneQR, profileKeysOff: profileKeyIds.count) } /// Disables `keyIds` on the identity, as many per update as Platform diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionsList.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionsList.swift index c1e899edfe..2fbfea899d 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionsList.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionsList.swift @@ -27,8 +27,6 @@ struct ConnectionsList: View { let onScanQR: () -> Void let onMockScan: () -> Void let onDisconnect: (DAppConnection) -> Void - /// A row under the connections, in the same card and scroll view. - var footer: AnyView? = nil var body: some View { ScrollView(showsIndicators: false) { @@ -41,7 +39,6 @@ struct ConnectionsList: View { onDisconnect: { onDisconnect(connection) } ) } - if let footer { footer } } .modifier(MenuViewModifier()) } diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 8a62f1981b..795b6d9b7d 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -28,12 +28,6 @@ struct ConnectionsScreen: View { private let vc: UINavigationController @StateObject private var viewModel: ConnectionsViewModel - @State private var isConfirmingSharedProfileRevoke = false - @State private var isConfirmingSharedProfileKeep = false - /// The access the revoke confirmation was opened for. - @State private var sharedProfileAccessToRevoke: SharedProfileAccess? - /// The access the keep confirmation was opened for. - @State private var sharedProfileAccessToKeep: SharedProfileAccess? init(vc: UINavigationController, viewModel: ConnectionsViewModel? = nil) { self.vc = vc @@ -55,15 +49,6 @@ struct ConnectionsScreen: View { .padding(.bottom, 20) content - - // With connections the row is in their card, so it scrolls - // with them; without, it stands on its own. - if viewModel.connections.isEmpty, let row = sharedProfileAccessRow { - row - .modifier(MenuViewModifier()) - .padding(.horizontal, 20) - .padding(.vertical, 12) - } } if viewModel.isProcessingStateTransition || viewModel.isDisconnecting { @@ -81,36 +66,6 @@ struct ConnectionsScreen: View { } .background(Color.primaryBackground) .navigationBarHidden(true) - // Another identity may have become active while the screen was away. - .onAppear { viewModel.refreshSharedProfileAccess() } - .confirmationDialog( - NSLocalizedString("Revoke shared profile access?", comment: "DashConnect"), - isPresented: $isConfirmingSharedProfileRevoke, - titleVisibility: .visible - ) { - Button(NSLocalizedString("Revoke shared profile access", comment: "DashConnect"), role: .destructive) { - viewModel.revokeSharedProfileAccess(sharedProfileAccessToRevoke) - } - Button(NSLocalizedString("Cancel", comment: ""), role: .cancel) {} - } message: { - Text(NSLocalizedString( - "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again.", - comment: "DashConnect")) - } - .confirmationDialog( - NSLocalizedString("Keep these keys?", comment: "DashConnect"), - isPresented: $isConfirmingSharedProfileKeep, - titleVisibility: .visible - ) { - Button(NSLocalizedString("Keep", comment: "DashConnect")) { - if let access = sharedProfileAccessToKeep { viewModel.keepSharedProfileAccess(access) } - } - Button(NSLocalizedString("Cancel", comment: ""), role: .cancel) {} - } message: { - Text(NSLocalizedString( - "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards.", - comment: "DashConnect")) - } .alert(item: messageBinding) { message in Alert( title: Text(message.title), @@ -134,21 +89,6 @@ struct ConnectionsScreen: View { // MARK: - States - /// The shared profile keys row, while there is something to show. - private var sharedProfileAccessRow: SharedProfileAccessRow? { - guard viewModel.showsSharedProfileAccess else { return nil } - return SharedProfileAccessRow( - keyCount: viewModel.sharedProfileAccess?.keyCount, - onRevoke: viewModel.canActOnSharedProfileAccess ? { - sharedProfileAccessToRevoke = viewModel.sharedProfileAccess - isConfirmingSharedProfileRevoke = true - } : nil, - onKeep: viewModel.canActOnSharedProfileAccess ? { - sharedProfileAccessToKeep = viewModel.sharedProfileAccess - isConfirmingSharedProfileKeep = true - } : nil) - } - @ViewBuilder private var content: some View { if viewModel.featureUnavailable { ConnectionsUnavailableState() @@ -159,8 +99,7 @@ struct ConnectionsScreen: View { connections: viewModel.connections, onScanQR: showScanner, onMockScan: mockScan, - onDisconnect: viewModel.disconnect, - footer: sharedProfileAccessRow.map { AnyView($0) } + onDisconnect: viewModel.disconnect ) .padding(.horizontal, 20) } @@ -291,49 +230,3 @@ struct ConnectionsScreen: View { ) ) } - -/// The DashPay profile keys on the active identity that no connection -/// accounts for, and the way to turn them all off. A disconnect leaves them, -/// since their bound does not say which app was given them. -private struct SharedProfileAccessRow: View { - /// `nil` when the store could not be read. - let keyCount: Int? - /// `nil` when the identity or the count could not be read: nothing to - /// revoke or keep. - let onRevoke: (() -> Void)? - let onKeep: (() -> Void)? - - var body: some View { - HStack(spacing: 12) { - VStack(alignment: .leading, spacing: 2) { - Text(NSLocalizedString("Shared profile access", comment: "DashConnect")) - .dashFont(.subhead) - .foregroundStyle(Color.dash.primaryText) - Text(keyCount.map { - String( - format: NSLocalizedString("Keys not linked to a connection that can update your DashPay profile: %d", comment: "DashConnect"), - $0) - } ?? NSLocalizedString("Keys that can update your DashPay profile could not be checked", comment: "DashConnect")) - .dashFont(.footnote) - .foregroundStyle(Color.dash.tertiaryText) - } - .frame(maxWidth: .infinity, alignment: .leading) - .accessibilityElement(children: .combine) - - if let onKeep { - Button(NSLocalizedString("Keep", comment: "DashConnect"), action: onKeep) - .dashFont(.subhead) - .frame(minWidth: 44, minHeight: 44) - .accessibilityLabel(Text(NSLocalizedString("Keep shared profile access", comment: "DashConnect"))) - } - if let onRevoke { - Button(NSLocalizedString("Revoke", comment: "DashConnect"), role: .destructive, action: onRevoke) - .dashFont(.subhead) - .frame(minWidth: 44, minHeight: 44) - .accessibilityLabel(Text(NSLocalizedString("Revoke shared profile access", comment: "DashConnect"))) - } - } - .padding(.horizontal, 14) - .padding(.vertical, 12) - } -} diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 23bfd6a397..d65aab9ac6 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -53,20 +53,10 @@ final class ConnectionsViewModel: ObservableObject { @Published var isApproving = false @Published var isApprovingPurchase = false @Published var isProcessingStateTransition = false - /// A disconnect or a shared profile revoke or keep in progress. Its own flag, not + /// A disconnect that is signing an identity update. Its own flag, not /// `isProcessingStateTransition`: a `dash-st:` task clears that one when /// it finishes, which would lift the guard while a disconnect is still out. @Published private(set) var isDisconnecting = false - /// The DashPay profile keys on the active identity that no connection - /// accounts for and the user did not keep: `nil` when there are none or - /// no identity is active, a `nil` `keyCount` when they could not be told. - @Published private(set) var sharedProfileAccess: SharedProfileAccess? - /// Each read of `sharedProfileAccess` takes the next number; only the - /// latest one started is shown, so a slow older read cannot overwrite it. - private var sharedProfileAccessGeneration = 0 - /// The latest shown read as the data source gave it, a count of none - /// included, so an empty result keeps the scope and identity it is for. - private var lastSharedProfileRead: SharedProfileAccess? @Published var message: ConnectionsScreenMessage? /// Failure of the last approve attempt, rendered **inside** the approve sheet. /// A screen-level `.alert` cannot appear over a presented sheet, so routing this @@ -124,37 +114,6 @@ final class ConnectionsViewModel: ObservableObject { self?.connections = $0.sorted(by: { $0.updatedAt > $1.updatedAt }) } .store(in: &cancellables) - // The rows change when an app is approved, confirmed or removed, - // which is when the shared profile keys can change too. - // The screen reads them when it appears; the current value the - // publisher replays is skipped. - self.dataSource.connections - .dropFirst() - .removeDuplicates() - .receive(on: DispatchQueue.main) - .sink { [weak self] _ in self?.refreshSharedProfileAccess() } - .store(in: &cancellables) - } - - /// Reads the shared profile keys again from the wallet's store. - func refreshSharedProfileAccess() { - guard !featureUnavailable else { return } - Task { [weak self] in await self?.readSharedProfileAccess() } - } - - /// Reads the shared profile keys and shows them, unless a later read - /// started meanwhile. Returns what this read found. - @discardableResult - private func readSharedProfileAccess() async -> SharedProfileAccess? { - sharedProfileAccessGeneration += 1 - let generation = sharedProfileAccessGeneration - let read = await dataSource.sharedProfileAccess() - let access = read?.keyCount == 0 ? nil : read - if generation == sharedProfileAccessGeneration { - sharedProfileAccess = access - lastSharedProfileRead = read - } - return access } func onQRScanned(_ content: String) { @@ -421,186 +380,35 @@ final class ConnectionsViewModel: ObservableObject { // takes seconds. It must not overlap anything else that signs one or // touches the same records: a second tap, an approval on screen or in // flight, a request still resolving, a `dash-st:` in progress. - guard canSignIdentityUpdate else { return } + guard !isDisconnecting, !isProcessingStateTransition, !isApproving, !isApprovingPurchase, + !isResolvingRequest, pendingRequest == nil, pendingTokenPurchase == nil else { return } isDisconnecting = true Task { [weak self] in guard let self else { return } defer { self.isDisconnecting = false } do { - try await self.dataSource.disconnect(id: connection.id, scope: connection.scope) - } catch { - self.message = ConnectionsScreenMessage( - kind: .error, - text: String( - format: NSLocalizedString("Could not disconnect: %@", comment: "DashConnect"), - error.localizedDescription)) - return - } - let access = await self.readSharedProfileAccess() - // Only a one-QR login gives an app a DashPay profile key, so only - // its disconnect can leave one behind. - guard connection.loginKind == .oneQR, let access else { return } - if let keyCount = access.keyCount { + let profileKeysOff = try await self.dataSource.disconnect(id: connection.id, scope: connection.scope) + // The disconnect also turned off the DashPay profile keys no + // connection accounts for; say so, since they may have been + // another app's. + guard profileKeysOff > 0 else { return } self.message = ConnectionsScreenMessage( kind: .success, - text: String( - format: NSLocalizedString( - "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access.", - comment: "DashConnect"), - keyCount)) - } else { - self.message = ConnectionsScreenMessage( - kind: .success, - text: NSLocalizedString( - "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile.", - comment: "DashConnect")) - } - } - } - - /// Whether the screen shows the shared profile keys. - var showsSharedProfileAccess: Bool { !featureUnavailable && sharedProfileAccess != nil } - - /// Whether they can be revoked or kept from here: only for an identity - /// that was read, with a count that was. - var canActOnSharedProfileAccess: Bool { - sharedProfileAccess?.identityId != nil && sharedProfileAccess?.keyCount != nil - } - - /// Whether nothing else that signs an identity update or touches the same - /// records is going on: a disconnect or revoke, an approval on screen or - /// in flight, a request still resolving, a `dash-st:` in progress. - private var canSignIdentityUpdate: Bool { - !isDisconnecting && !isProcessingStateTransition && !isApproving && !isApprovingPurchase - && !isResolvingRequest && pendingRequest == nil && pendingTokenPurchase == nil - } - - /// Disables every DashPay profile key no connection accounts for and the - /// user did not keep, for every app that holds one. Same guards as `disconnect`: it signs an - /// identity update. - func revokeSharedProfileAccess(_ shown: SharedProfileAccess?) { - guard canSignIdentityUpdate else { - // The user confirmed a destructive action; say why nothing ran. - message = Self.busyMessage - return - } - guard let access = sharedProfileAccess else { - // A read finished while the confirmation was up and shows none. - // Only one for the confirmed wallet and identity says so; another - // one's says nothing about the keys confirmed. - message = readNone(for: shown) - ? ConnectionsScreenMessage( - kind: .success, - text: NSLocalizedString("No DashPay profile key needed revoking.", comment: "DashConnect")) - : Self.sharedProfileAccessChangedMessage - return - } - guard canActOnSharedProfileAccess else { - // A read finished while the confirmation was up and could not - // read the identity or the count: unknown, not none. - message = Self.sharedProfileAccessUncheckedMessage - return - } - // Only the access the user confirmed: a read that finished while the - // confirmation was up may be another wallet's or identity's. - guard access == shown else { - message = Self.sharedProfileAccessChangedMessage - return - } - isDisconnecting = true - Task { [weak self] in - guard let self else { return } - defer { self.isDisconnecting = false } - do { - let disabled = try await self.dataSource.revokeSharedProfileAccess(access) - self.message = ConnectionsScreenMessage( - kind: .success, - text: disabled > 0 - ? String( - format: NSLocalizedString("DashPay profile keys revoked: %d.", comment: "DashConnect"), - disabled) - : NSLocalizedString("No DashPay profile key needed revoking.", comment: "DashConnect")) - } catch { - self.message = ConnectionsScreenMessage( - kind: .error, - text: String( - format: NSLocalizedString("Could not revoke shared profile access: %@", comment: "DashConnect"), - error.localizedDescription)) - } - await self.readSharedProfileAccess() - } - } - - /// Stops counting the shared profile keys shown, on this device, after - /// the PIN prompt: the user recognizes them. A key that is not among them shows the row - /// again. Nothing changes on Platform. - func keepSharedProfileAccess(_ shown: SharedProfileAccess) { - guard canSignIdentityUpdate else { - message = Self.busyMessage - return - } - // Only the keys the user was shown: a read that finished while the - // confirmation was up may count others, or none. - guard let access = sharedProfileAccess else { - // None left for the identity shown: nothing to keep. - if !readNone(for: shown) { message = Self.sharedProfileAccessChangedMessage } - return - } - guard canActOnSharedProfileAccess else { - message = Self.sharedProfileAccessUncheckedMessage - return - } - guard access == shown else { - message = Self.sharedProfileAccessChangedMessage - return - } - // Shares the revoke's busy flag: a revoke confirmed meanwhile would - // otherwise run on the access this keep is taking off the count. - isDisconnecting = true - Task { [weak self] in - guard let self else { return } - defer { self.isDisconnecting = false } - do { - try await self.dataSource.keepSharedProfileAccess(access) + text: String.localizedStringWithFormat( + NSLocalizedString( + "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d.", + comment: "DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off"), + profileKeysOff)) } catch { self.message = ConnectionsScreenMessage( kind: .error, text: String( - format: NSLocalizedString("Could not keep these keys: %@", comment: "DashConnect"), + format: NSLocalizedString("Could not disconnect: %@", comment: "DashConnect"), error.localizedDescription)) } - await self.readSharedProfileAccess() } } - /// Whether the latest read found no shared key for the wallet, network - /// and identity `shown` was read for. - private func readNone(for shown: SharedProfileAccess?) -> Bool { - guard let shown, let read = lastSharedProfileRead, read.keyCount == 0 else { return false } - return read.scope == shown.scope && read.identityId == shown.identityId - } - - private static var busyMessage: ConnectionsScreenMessage { - ConnectionsScreenMessage( - kind: .error, - text: NSLocalizedString( - "Another DashConnect request is in progress. Try again when it finishes.", comment: "DashConnect")) - } - - private static var sharedProfileAccessChangedMessage: ConnectionsScreenMessage { - ConnectionsScreenMessage( - kind: .error, - text: NSLocalizedString("The keys changed. Check them and try again.", comment: "DashConnect")) - } - - private static var sharedProfileAccessUncheckedMessage: ConnectionsScreenMessage { - ConnectionsScreenMessage( - kind: .error, - text: NSLocalizedString( - "DashPay profile access could not be checked. Open Connections again and retry.", - comment: "DashConnect")) - } - func removeConnection(_ connection: DAppConnection) { Task { await dataSource.remove(id: connection.id, scope: connection.scope) diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 368c7810b9..7c2950172b 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 90a3efd6fc..8664c2ed39 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 2b86716e92..f47afbc829 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index f03f2be8c2..3fe4fd9873 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 1479542496..ff7a38b748 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 6504def156..0fcfac4e17 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 2087df62d7..936885d45d 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 8f2d7f7275..d87d83ee1c 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6112,26 +6112,6 @@ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; @@ -6608,3 +6588,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 18c5fe100e..b6fe7f3de0 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 64ae802372..cec97df4f7 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index ec8b2d7e2d..0123aeb187 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 4c1d08a7f1..53386e6afe 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index ad8fb64400..099bd0d8c3 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 9903403a3c..6950da3a08 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 1a7b9bcc55..c75bbe4023 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 556158cac6..3b833564a8 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 4bff990bfe..9d7722db1f 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 48215d312e..ef10a759cc 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 5f1aa854fa..523300ce75 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 3a53cefb0a..7119e9ee01 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 89387f089b..91ef1b8820 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index fc83f4d11b..3e58240dae 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 101a03f701..d6438a2841 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 9fc8ed3661..e0c9053562 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index f86af2d7cf..10b8790bf0 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index cf5936ccec..eb9a53a355 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 2623b9ab65..a836b19a57 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index e73836497d..8ecf4cbd93 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index fb7b55392e..7f743e0cb4 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index a3df164dd9..f06a14ef21 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index ae99f2a9f4..c16b4fa547 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index d34adcbc09..e200ecd813 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index f45dced04c..0d2323a6e3 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index a8db714e09..0cef6d5af5 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index d898ad273c..06c2853b2c 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 1d13ff9ac9..02ed188672 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index dea6120696..2dd51a164f 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 5364e0d1ae..5646b04bfe 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 4fc6e2bda1..7c753eea05 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 9bb27e7708..c1230657bd 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 0904d28f2c..0197d0b69b 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6215,26 +6215,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6832,3 +6812,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index f1aae6075f..ce2b5997fe 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 708e987818..8764ef571e 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6213,26 +6213,6 @@ "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; -"Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access." = "Disconnected. Keys not linked to any connection can still update your DashPay profile: %d. They may belong to this app or another one. You can revoke them under Shared profile access."; -"Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile." = "Disconnected. This wallet could not check whether keys not linked to any connection can still update your DashPay profile."; -"DashPay profile keys revoked: %d." = "DashPay profile keys revoked: %d."; -"No DashPay profile key needed revoking." = "No DashPay profile key needed revoking."; -"Could not revoke shared profile access: %@" = "Could not revoke shared profile access: %@"; -"Another DashConnect request is in progress. Try again when it finishes." = "Another DashConnect request is in progress. Try again when it finishes."; -"Revoke shared profile access?" = "Revoke shared profile access?"; -"Revoke shared profile access" = "Revoke shared profile access"; -"Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again." = "Every app that uses one of these keys, on this or another device, loses access to your DashPay profile and has to ask again."; -"Shared profile access" = "Shared profile access"; -"Keep" = "Keep"; -"Keep shared profile access" = "Keep shared profile access"; -"Keep these keys?" = "Keep these keys?"; -"Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards." = "Keep them only if you recognize every one, for example from an app you connected on another device. This device stops counting them and cannot revoke them afterwards."; -"Could not keep these keys: %@" = "Could not keep these keys: %@"; -"The keys changed. Check them and try again." = "The keys changed. Check them and try again."; -"Keys not linked to a connection that can update your DashPay profile: %d" = "Keys not linked to a connection that can update your DashPay profile: %d"; -"Keys that can update your DashPay profile could not be checked" = "Keys that can update your DashPay profile could not be checked"; -"Revoke" = "Revoke"; -"DashPay profile access could not be checked. Open Connections again and retry." = "DashPay profile access could not be checked. Open Connections again and retry."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; @@ -6830,3 +6810,6 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; + +/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ +"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 0a46b37f17..45e227e9bc 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -441,10 +441,10 @@ final class AppConnectV2LoginTests: XCTestCase { [3], "a CRITICAL HASH160 key the store does not show stops a disconnect too") } - /// Revoking shared profile access takes the live, unexpired DashPay - /// profile keys no confirmed record names, and refuses a view of the - /// identity it cannot trust. - func testRevokingSharedProfileAccessTakesOnlyUnattributedLiveProfileKeys() { + /// A disconnect takes the live, unexpired DashPay profile keys no + /// confirmed record names, and refuses a view of the identity it cannot + /// trust. + func testADisconnectTakesOnlyUnattributedLiveProfileKeys() { let dashPay = Data.identifier(fromBase58: AppConnect.dashPayContractId)! let app = Data(repeating: 0xA1, count: 32) let now: Int64 = 100_000_000 diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index fb75d6ed29..ba671b5064 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1372,245 +1372,24 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertNil(viewModel.message) } - /// A one-QR disconnect that leaves DashPay profile keys no connection - /// accounts for says so, and the screen offers to revoke them; the revoke - /// goes with the access the count was read for and clears the offer. - func testADisconnectThatLeavesSharedProfileKeysOffersToRevokeThem() async { - let spy = PurchaseApprovalSpy() - let access = SharedProfileAccess(keyIds: Array(1 ... 2), scope: "wallet-a t", identityId: "identity-a") - spy.sharedAccess = access - let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - var oneQR = Self.connection - oneQR.loginKind = .oneQR - - viewModel.disconnect(oneQR) - await waitUntil { !viewModel.isDisconnecting && viewModel.message != nil } - - XCTAssertEqual(viewModel.sharedProfileAccess, access) - XCTAssertEqual(viewModel.message?.text.contains("2"), true) - - viewModel.message = nil - viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) - await waitUntil { !viewModel.isDisconnecting && viewModel.message != nil } - - XCTAssertEqual(spy.revoked, [access]) - XCTAssertNil(viewModel.sharedProfileAccess) - XCTAssertEqual(viewModel.message?.kind, .success) - } - - /// A two-QR login gives an app no DashPay profile key, so its disconnect - /// says nothing about them; the row still shows them. - func testATwoQRDisconnectSaysNothingAboutSharedProfileKeys() async { + /// A disconnect that also turned off DashPay profile keys no + /// connection accounted for says how many; one that turned off none says + /// nothing. + func testADisconnectThatTurnedOffProfileKeysSaysHowMany() async { let spy = PurchaseApprovalSpy() - spy.sharedAccess = SharedProfileAccess(keyIds: Array(1 ... 1), scope: "wallet-a t", identityId: "identity-a") + spy.profileKeysOff = 2 let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) viewModel.disconnect(Self.connection) - await waitUntil { !viewModel.isDisconnecting && viewModel.sharedProfileAccess != nil } - - XCTAssertNil(viewModel.message) - XCTAssertEqual(viewModel.sharedProfileAccess?.keyCount, 1) - } - - /// A count that could not be read is shown as unknown, not as none. - func testAnUnreadableCountIsShownAsUnknown() async { - let spy = PurchaseApprovalSpy() - spy.sharedAccess = SharedProfileAccess(keyIds: nil, scope: "wallet-a t", identityId: "identity-a") - let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - var oneQR = Self.connection - oneQR.loginKind = .oneQR - - viewModel.disconnect(oneQR) - await waitUntil { !viewModel.isDisconnecting && viewModel.message != nil } - - XCTAssertNotNil(viewModel.sharedProfileAccess) - XCTAssertNil(viewModel.sharedProfileAccess?.keyCount) - XCTAssertEqual(viewModel.message?.text.contains("could not check"), true) - } - - /// An access whose identity could not be read revokes nothing. - func testAnAccessWithNoIdentityRevokesNothing() async { - let spy = PurchaseApprovalSpy() - spy.sharedAccess = SharedProfileAccess(keyIds: nil, scope: "wallet-a t", identityId: nil) - let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess != nil } - - viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) - - XCTAssertEqual(spy.revoked, []) - XCTAssertFalse(viewModel.isDisconnecting) - } - - /// With none shared there is nothing to offer, and a revoke asks nothing - /// of the data source. - func testWithoutSharedProfileKeysNothingIsOffered() async { - let spy = PurchaseApprovalSpy() - spy.sharedAccess = SharedProfileAccess(keyIds: Array(1 ... 1), scope: "wallet-a t", identityId: "identity-a") - let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess != nil } - XCTAssertNotNil(viewModel.sharedProfileAccess) - spy.sharedAccess = SharedProfileAccess(keyIds: [], scope: "wallet-a t", identityId: "identity-a") - - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess == nil } - - XCTAssertNil(viewModel.sharedProfileAccess) - viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) - XCTAssertEqual(spy.revoked, []) - } - - /// A failed revoke is reported, and the count is read again. - func testAFailedRevokeIsReported() async { - let spy = PurchaseApprovalSpy() - spy.sharedAccess = SharedProfileAccess(keyIds: Array(1 ... 3), scope: "wallet-a t", identityId: "identity-a") - spy.revokeFailure = PurchaseSpyError.refused - let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess != nil } - let reads = spy.sharedAccessReads - - viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) - XCTAssertTrue(viewModel.isDisconnecting) - // A second tap while the first is still out must not start another. - viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) await waitUntil { !viewModel.isDisconnecting } - XCTAssertEqual(spy.revoked.count, 1) - XCTAssertEqual(viewModel.message?.kind, .error) - XCTAssertGreaterThan(spy.sharedAccessReads, reads) - XCTAssertEqual(viewModel.sharedProfileAccess?.keyCount, 3) - } - - /// A count that could not be read offers no revoke and no keep, and a - /// revoke confirmed before the read came back runs nothing. - func testAnUnknownCountOffersNeitherRevokeNorKeep() async { - let spy = PurchaseApprovalSpy() - spy.sharedAccess = SharedProfileAccess(keyIds: nil, scope: "wallet-a t", identityId: "identity-a") - let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess != nil } - - XCTAssertFalse(viewModel.canActOnSharedProfileAccess) - viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) - viewModel.keepSharedProfileAccess(try! XCTUnwrap(viewModel.sharedProfileAccess)) - - XCTAssertEqual(spy.revoked, []) - XCTAssertEqual(spy.kept, []) - XCTAssertEqual(viewModel.message?.kind, .error) - } - - /// An access that went away because nothing could be read is not - /// reported as nothing to revoke. - func testAnAccessLostToAnUnreadableWalletIsNotReportedAsNone() async { - let spy = PurchaseApprovalSpy() - spy.sharedAccess = SharedProfileAccess(keyIds: Array(1 ... 1), scope: "wallet-a t", identityId: "identity-a") - let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess != nil } - spy.sharedAccess = nil - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess == nil } - - viewModel.revokeSharedProfileAccess(viewModel.sharedProfileAccess) - - XCTAssertEqual(spy.revoked, []) - XCTAssertEqual(viewModel.message?.kind, .error) - } - - /// A revoke goes only with the access its confirmation was opened for: - /// one read meanwhile, of another wallet or identity, is not revoked. - func testARevokeIsPinnedToTheAccessItWasConfirmedFor() async { - let spy = PurchaseApprovalSpy() - let shown = SharedProfileAccess(keyIds: [4], scope: "wallet-a t", identityId: "identity-a") - spy.sharedAccess = shown - let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess != nil } - spy.sharedAccess = SharedProfileAccess(keyIds: [9], scope: "wallet-b t", identityId: "identity-b") - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess?.scope == "wallet-b t" } - - viewModel.revokeSharedProfileAccess(shown) - - XCTAssertEqual(spy.revoked, []) - XCTAssertEqual(viewModel.message?.kind, .error) - } - - /// A confirmed revoke whose access a later read replaced with none, of - /// another wallet, is not reported as nothing to revoke. - func testARevokeWhoseAccessWasReadAsNoneElsewhereIsNotReportedAsDone() async { - let spy = PurchaseApprovalSpy() - let shown = SharedProfileAccess(keyIds: [4], scope: "wallet-a t", identityId: "identity-a") - spy.sharedAccess = shown - let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess != nil } - spy.sharedAccess = SharedProfileAccess(keyIds: [], scope: "wallet-b t", identityId: "identity-b") - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess == nil } - - viewModel.revokeSharedProfileAccess(shown) - - XCTAssertEqual(spy.revoked, []) - XCTAssertEqual(viewModel.message?.kind, .error) - } - - /// A read of the confirmed identity that finds none left is reported as - /// such; keeping then has nothing to do, and says nothing. - func testNoneLeftForTheConfirmedIdentityIsReportedAsNone() async { - let spy = PurchaseApprovalSpy() - let shown = SharedProfileAccess(keyIds: [4], scope: "wallet-a t", identityId: "identity-a") - spy.sharedAccess = shown - let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess != nil } - spy.sharedAccess = SharedProfileAccess(keyIds: [], scope: "wallet-a t", identityId: "identity-a") - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess == nil } - - viewModel.keepSharedProfileAccess(shown) - XCTAssertNil(viewModel.message) - viewModel.revokeSharedProfileAccess(shown) - - XCTAssertEqual(spy.revoked, []) - XCTAssertEqual(spy.kept, []) XCTAssertEqual(viewModel.message?.kind, .success) - } - - /// Keeping an access a later read of another wallet replaced is refused. - func testAKeepWhoseAccessWasReadAsNoneElsewhereIsRefused() async { - let spy = PurchaseApprovalSpy() - let shown = SharedProfileAccess(keyIds: [4], scope: "wallet-a t", identityId: "identity-a") - spy.sharedAccess = shown - let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess != nil } - spy.sharedAccess = SharedProfileAccess(keyIds: [], scope: "wallet-b t", identityId: "identity-b") - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess == nil } - - viewModel.keepSharedProfileAccess(shown) - - XCTAssertEqual(spy.kept, []) - XCTAssertEqual(viewModel.message?.kind, .error) - } - - /// Keeping goes with the access shown and reads the count again. - func testKeepingSharedProfileAccessHidesTheKeysShown() async { - let spy = PurchaseApprovalSpy() - let access = SharedProfileAccess(keyIds: [4, 7], scope: "wallet-a t", identityId: "identity-a") - spy.sharedAccess = access - let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - viewModel.refreshSharedProfileAccess() - await waitUntil { viewModel.sharedProfileAccess != nil } - - viewModel.keepSharedProfileAccess(access) - await waitUntil { viewModel.sharedProfileAccess == nil } + XCTAssertEqual(viewModel.message?.text.contains("2"), true) - XCTAssertEqual(spy.kept, [access]) - XCTAssertEqual(spy.revoked, []) + spy.profileKeysOff = 0 + viewModel.message = nil + viewModel.disconnect(Self.connection) + await waitUntil { !viewModel.isDisconnecting && spy.disconnectedIds.count == 2 } XCTAssertNil(viewModel.message) } @@ -1890,73 +1669,26 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { lock.withLock { storedDisconnectedScopes } } - func disconnect(id: String, scope: String?) async throws { - let failure = lock.withLock { () -> Error? in - storedDisconnectedIds.append(id) - storedDisconnectedScopes.append(scope) - return storedDisconnectFailure - } - if let failure { throw failure } - } - - func remove(id: String, scope: String?) async { - XCTFail("remove is not part of the purchase approval flow") - } - - private var storedSharedAccess: SharedProfileAccess? - private var storedSharedAccessReads = 0 - private var storedRevoked: [SharedProfileAccess] = [] - private var storedRevokeFailure: Error? - private var storedKept: [SharedProfileAccess] = [] - - var kept: [SharedProfileAccess] { - lock.withLock { storedKept } - } - - /// What `sharedProfileAccess` reports; a revoke or a keep that succeeds - /// clears it. - var sharedAccess: SharedProfileAccess? { - get { lock.withLock { storedSharedAccess } } - set { lock.withLock { storedSharedAccess = newValue } } - } - - var sharedAccessReads: Int { - lock.withLock { storedSharedAccessReads } - } - - var revoked: [SharedProfileAccess] { - lock.withLock { storedRevoked } - } + private var storedProfileKeysOff = 0 - var revokeFailure: Error? { - get { lock.withLock { storedRevokeFailure } } - set { lock.withLock { storedRevokeFailure = newValue } } + /// How many DashPay profile keys a successful disconnect reports. + var profileKeysOff: Int { + get { lock.withLock { storedProfileKeysOff } } + set { lock.withLock { storedProfileKeysOff = newValue } } } - func sharedProfileAccess() async -> SharedProfileAccess? { - lock.withLock { - storedSharedAccessReads += 1 - return storedSharedAccess - } - } - - func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int { - let (count, failure) = lock.withLock { () -> (Int, Error?) in - storedRevoked.append(access) - if let failure = storedRevokeFailure { return (0, failure) } - let count = storedSharedAccess?.keyCount ?? 0 - storedSharedAccess = nil - return (count, nil) + func disconnect(id: String, scope: String?) async throws -> Int { + let (failure, count) = lock.withLock { () -> (Error?, Int) in + storedDisconnectedIds.append(id) + storedDisconnectedScopes.append(scope) + return (storedDisconnectFailure, storedProfileKeysOff) } if let failure { throw failure } return count } - func keepSharedProfileAccess(_ access: SharedProfileAccess) async throws { - lock.withLock { - storedKept.append(access) - storedSharedAccess = nil - } + func remove(id: String, scope: String?) async { + XCTFail("remove is not part of the purchase approval flow") } } @@ -2017,14 +1749,11 @@ private final class LoginApprovalSpy: DashConnectDataSource { throw PurchaseSpyError.unsupported } - func disconnect(id: String, scope: String?) async throws { + func disconnect(id: String, scope: String?) async throws -> Int { throw PurchaseSpyError.unsupported } func remove(id: String, scope: String?) async {} - func sharedProfileAccess() async -> SharedProfileAccess? { nil } - func revokeSharedProfileAccess(_ access: SharedProfileAccess) async throws -> Int { 0 } - func keepSharedProfileAccess(_ access: SharedProfileAccess) async throws {} } /// The URLs a view model asked to open, in order. @@ -2710,41 +2439,6 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(store.load(), [grant]) } - /// A count read for one wallet does not revoke in another: the revoke is - /// refused before the PIN prompt, and nothing else is touched. - func testARevokeCountedForAnotherWalletIsRefused() async { - let active = ActiveWallet("wallet-a") - let (dataSource, connections) = makeScopedDataSource(active: active, rows: [Self.twoQRRow(status: .active)]) - let scopeA = Self.shownRows(dataSource)[0].scope! - active.idHex = "wallet-b" - let other = Self.twoQRRow(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .approved) - connections.save([other]) - - await Self.expectWalletChanged { - _ = try await dataSource.revokeSharedProfileAccess( - SharedProfileAccess(keyIds: Array(1 ... 1), scope: scopeA, identityId: "identity-a")) - } - await Self.expectWalletChanged { - try await dataSource.keepSharedProfileAccess( - SharedProfileAccess(keyIds: [3], scope: scopeA, identityId: "identity-a")) - } - XCTAssertEqual(connections.load(), [other]) - } - - /// With a wallet whose identity cannot be read (no SDK yet, as at launch) - /// the count is unknown and names no identity, so nothing can be revoked - /// from it. - func testACountWithoutAReadableIdentityIsUnknown() async { - let active = ActiveWallet("wallet-a") - let (dataSource, _) = makeScopedDataSource(active: active) - - let access = await dataSource.sharedProfileAccess() - - XCTAssertNotNil(access) - XCTAssertNil(access?.keyCount) - XCTAssertNil(access?.identityId) - } - func testDisconnectOfARowFromAnotherWalletIsRefusedAndTheListMovesToTheActiveWallet() async { let active = ActiveWallet("wallet-a") let row = Self.twoQRRow(status: .active) From 76860692b43c08171e641a703c23d314d77753bb Mon Sep 17 00:00:00 2001 From: romchornyi Date: Sat, 31 Oct 2026 20:53:38 +0200 Subject: [PATCH 073/108] fix(dashconnect): the app's revoke is never blocked by the profile keys; they go only with a disconnect that ends here - Unattributed DashPay profile keys join a disconnect only when it is of an app this identity holds keys or a grant of and it ends here (not held, or unchecked, on another identity); a retry after a failed later batch still reaches them. - When they cannot be told apart, the app's keys still go and the result says the profile keys were not checked. disconnect returns DashConnectDisconnectResult, which the screen reports. - The kept shared profile keys an earlier build noted are removed once when the data source starts. - The protocol and helper docs say what a disconnect now does. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 6 +- .../DashConnect/DashConnectDataSource.swift | 25 +++-- .../DashConnect/DashConnectModels.swift | 10 ++ .../PlatformDashConnectDataSource.swift | 104 ++++++++++++------ .../UI/DashConnect/ConnectionsViewModel.swift | 29 +++-- DashWallet/ar.lproj/Localizable.strings | 3 + DashWallet/bg.lproj/Localizable.strings | 3 + DashWallet/ca.lproj/Localizable.strings | 3 + DashWallet/cs.lproj/Localizable.strings | 3 + DashWallet/da.lproj/Localizable.strings | 3 + DashWallet/de.lproj/Localizable.strings | 3 + DashWallet/el.lproj/Localizable.strings | 3 + DashWallet/en.lproj/Localizable.strings | 3 + DashWallet/eo.lproj/Localizable.strings | 3 + DashWallet/es.lproj/Localizable.strings | 3 + DashWallet/et.lproj/Localizable.strings | 3 + DashWallet/fa.lproj/Localizable.strings | 3 + DashWallet/fi.lproj/Localizable.strings | 3 + DashWallet/fil.lproj/Localizable.strings | 3 + DashWallet/fr.lproj/Localizable.strings | 3 + DashWallet/hr.lproj/Localizable.strings | 3 + DashWallet/hu.lproj/Localizable.strings | 3 + DashWallet/id.lproj/Localizable.strings | 3 + DashWallet/it.lproj/Localizable.strings | 3 + DashWallet/ja.lproj/Localizable.strings | 3 + DashWallet/ko.lproj/Localizable.strings | 3 + DashWallet/mk.lproj/Localizable.strings | 3 + DashWallet/ms.lproj/Localizable.strings | 3 + DashWallet/nb.lproj/Localizable.strings | 3 + DashWallet/nl.lproj/Localizable.strings | 3 + DashWallet/pl.lproj/Localizable.strings | 3 + DashWallet/pt.lproj/Localizable.strings | 3 + DashWallet/ro.lproj/Localizable.strings | 3 + DashWallet/ru.lproj/Localizable.strings | 3 + DashWallet/sk.lproj/Localizable.strings | 3 + DashWallet/sl.lproj/Localizable.strings | 3 + DashWallet/sl_SI.lproj/Localizable.strings | 3 + DashWallet/sq.lproj/Localizable.strings | 3 + DashWallet/sr.lproj/Localizable.strings | 3 + DashWallet/sv.lproj/Localizable.strings | 3 + DashWallet/th.lproj/Localizable.strings | 3 + DashWallet/tr.lproj/Localizable.strings | 3 + DashWallet/uk.lproj/Localizable.strings | 3 + DashWallet/vi.lproj/Localizable.strings | 3 + DashWallet/zh-Hans.lproj/Localizable.strings | 3 + .../zh-Hant-TW.lproj/Localizable.strings | 3 + DashWallet/zh.lproj/Localizable.strings | 3 + DashWallet/zh_TW.lproj/Localizable.strings | 3 + .../PlatformDashConnectDataSourceTests.swift | 64 ++++++++--- 49 files changed, 289 insertions(+), 78 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index b3c84ba721..5b6db6f56f 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -833,9 +833,9 @@ extension AppConnect { /// The ids of the keys in `keys` bound to a foreign document type v2 /// allows (DashPay `profile`). Every app can be given such a key and the - /// bound does not say which one was, so with no record every disconnect - /// on the identity turns these off, for every app that holds one - /// (`sharedProfileKeyIdsToDisable`). + /// bound does not say which one was, so with no record a disconnect on + /// the identity that ends there turns these off with the app's keys, + /// for every app that holds one (`sharedProfileKeyIdsToDisable`). static func unattributedProfileKeyIds(keys: [(keyId: UInt32, bound: StoredBound)]) -> [UInt32] { keys.filter { _, bound in guard case .documentType(let id, let name) = bound else { return false } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index a153470fba..d41d179d99 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -42,22 +42,25 @@ protocol DashConnectDataSource { /// Turns a connection off. For a one-QR connection this disables the key /// the app was given on the identity and deletes the published response, /// and throws when the key could not be disabled — the connection then - /// stays as it was. Every disconnect that signs an update also disables - /// the live DashPay profile keys of the active identity that no grant - /// record names: their bound does not say which app was given them, so - /// they cannot be left to a later disconnect. Returns how many of those - /// were disabled. The connection also stays, and that is thrown, while + /// stays as it was. A disconnect that disables keys of the app's on the + /// active identity, and is not stopped by another identity holding the + /// app, also disables the live DashPay profile keys of that identity + /// that no grant record names: their bound does not say which app was + /// given them. When those cannot be told apart, none is disabled and the + /// app's own keys still are. The result says which. The connection also stays, and that is thrown, while /// the app holds a key on another identity of the wallet. For a two-QR - /// connection it only changes the local status: that login derives the - /// same key every time and Platform never re-adds a disabled key, so - /// disabling it would lock the app out for good. Turning off a one-QR + /// connection with nothing else of the app's on the identity it only + /// changes the local status: that login derives the same key every time + /// and Platform never re-adds a disabled key, so disabling it would lock + /// the app out for good. A two-QR row whose app also holds a one-QR + /// grant there has that grant's keys disabled. Turning off a one-QR /// connection that replaced a two-QR one does disable those keys too. /// /// `scope` is the `DAppConnection.scope` of the row that was picked: /// both calls act only while it still names the wallet they would act /// on. @discardableResult - func disconnect(id: String, scope: String?) async throws -> Int + func disconnect(id: String, scope: String?) async throws -> DashConnectDisconnectResult func remove(id: String, scope: String?) async } @@ -269,7 +272,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { } @discardableResult - func disconnect(id: String, scope: String?) async throws -> Int { + func disconnect(id: String, scope: String?) async throws -> DashConnectDisconnectResult { let disconnectedAt = Date() persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } @@ -281,7 +284,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { updatedAt: disconnectedAt ) }) - return 0 + return DashConnectDisconnectResult() } func remove(id: String, scope: String?) async { diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 5a1f083208..98627bce8f 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -200,6 +200,16 @@ struct DAppConnection: Identifiable, Equatable, Hashable { var scope: String? = nil } +/// What a disconnect did with the active identity's DashPay profile keys +/// that no grant record names, besides turning off the app's own keys. +struct DashConnectDisconnectResult: Equatable { + /// How many of them it turned off. + var profileKeysTurnedOff = 0 + /// They could not be told apart, so none was turned off; the app's own + /// keys were. + var profileKeysUnchecked = false +} + /// A pending request derived from a scanned login QR code. struct ConnectionRequest: Equatable { let appLabel: String diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 29f59cdda6..8edeeaa646 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -496,6 +496,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private let stateTransitionParser: any DashConnectStateTransitionParsing private let now: () -> Date + /// Prefix of the shared profile keys an earlier build let the user keep. + static let keptSharedProfileKeysPrefix = "DashConnect.keptSharedProfileKeys " + + /// Set once `removeKeptSharedProfileKeys` has run. + static let keptSharedProfileKeysRemovedKey = "DashConnect.keptSharedProfileKeysRemoved" + + /// Removes, once, what an earlier build noted about kept shared profile + /// keys: nothing reads it now that such keys are turned off with a + /// disconnect. + static func removeKeptSharedProfileKeys(from defaults: UserDefaults) { + guard !defaults.bool(forKey: keptSharedProfileKeysRemovedKey) else { return } + for key in defaults.dictionaryRepresentation().keys where key.hasPrefix(keptSharedProfileKeysPrefix) { + defaults.removeObject(forKey: key) + } + defaults.set(true, forKey: keptSharedProfileKeysRemovedKey) + } + /// The DashConnect network matching the app's current network selection — /// what the default data source serves. Mainnet maps to `.mainnet` for /// completeness, but the real data source is never constructed there @@ -518,6 +535,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { networkEndpoint: (() -> String?)? = nil, notificationCenter: NotificationCenter = .default, operationGate: DashConnectOperationGate = .shared, + defaults: UserDefaults = .standard, now: @escaping () -> Date = Date.init ) { assert( @@ -529,6 +547,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { self.authorizer = authorizer self.stateTransitionParser = stateTransitionParser self.now = now + Self.removeKeptSharedProfileKeys(from: defaults) self.activeWalletIdHex = activeWalletIdHex self.operationGate = operationGate // Only a devnet's nodes are configurable. @@ -2325,7 +2344,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } @discardableResult - func disconnect(id: String, scope: String?) async throws -> Int { + func disconnect(id: String, scope: String?) async throws -> DashConnectDisconnectResult { try await gated { try await disconnectInTurn(id: id, scope: scope) } } @@ -2335,7 +2354,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Set(stores.grants.load().filter { $0.identityId == identityId && !$0.isUnconfirmed }.flatMap(\.keyIds)) } - private func disconnectInTurn(id: String, scope: String?) async throws -> Int { + private func disconnectInTurn(id: String, scope: String?) async throws -> DashConnectDisconnectResult { guard let stores = await showActiveWalletRows() else { throw DashConnectPlatformError.noWallet } @@ -2356,7 +2375,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let hasGrants = stores.grants.load().contains { $0.appContractId == id && (!$0.isUnconfirmed || $0.submittedRevision != nil) } - var profileKeysOff = 0 + var result = DashConnectDisconnectResult() if rowIsOneQR || hasGrants { let revocation = try await revokeAppConnectGrants( appContractId: id, rowIsOneQR: rowIsOneQR, stores: stores) @@ -2366,7 +2385,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // while it is the active one, so the row stays to get there, and // the user is told; this identity's keys are off. if let heldElsewhere = revocation.heldElsewhere { throw heldElsewhere } - profileKeysOff = revocation.profileKeysOff + result = revocation.profileKeys if revocation.asOneQR { // The session keys are disabled, and so are the keys of an // earlier two-QR login that were found: the same QR can no @@ -2374,7 +2393,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // for, so the row goes instead of sitting in the two-QR // "approved" state. await updateRows(in: stores) { rows in rows.filter { $0.id != id } } - return profileKeysOff + return result } } @@ -2394,7 +2413,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } } - return profileKeysOff + return result } /// Whether a disconnect of the app takes the one-QR path. A live session @@ -2510,8 +2529,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// registers (`AppConnect.appsV2KeyIds`). Every live DashPay profile key /// no record names goes as well: its bound names no app, so it may be /// another app's, and it is turned off with any app's disconnect - /// (`AppConnect.sharedProfileKeyIdsToDisable`); their number is returned - /// as `profileKeysOff`. A key another wallet gave the app in any other + /// (`AppConnect.sharedProfileKeyIdsToDisable`), only when the disconnect + /// turns off keys of the app's and completes on this identity; what was + /// done with them is returned as `profileKeys`. A key another wallet gave the app in any other /// shape stays. /// TODO(app-connect-orphan-responses): the response behind a key with no /// record stays on Platform. It can only be found by its request hash, @@ -2549,7 +2569,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { appContractId: String, rowIsOneQR: Bool, stores: Stores - ) async throws -> (heldElsewhere: DashConnectPlatformError?, asOneQR: Bool, profileKeysOff: Int) { + ) async throws -> (heldElsewhere: DashConnectPlatformError?, asOneQR: Bool, profileKeys: DashConnectDisconnectResult) { // The row was picked in the wallet `stores` belongs to; another // wallet's identity is not the one the row belongs to. var context = try await requireContext(pinnedTo: stores) @@ -2587,7 +2607,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // an earlier two-QR login can only be looked for after it. if !holdsUnrecordedKey, !rowIsOneQR { if let heldElsewhere = reasonHeldElsewhere() { throw heldElsewhere } - return (heldElsewhere: nil, asOneQR: false, profileKeysOff: 0) + return (heldElsewhere: nil, asOneQR: false, profileKeys: DashConnectDisconnectResult()) } } @@ -2678,12 +2698,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { currentIdentityPublicKeys: currentPublicKeys, twoQRAuthenticationKeyHash160: checksUnrecordedKeys ? nil : twoQRKeys.authenticationPublicKeyHash160 ) + let recordedKeyIds = Self.recordedKeyIds(of: identityId, in: stores) if checksUnrecordedKeys { // The keys of v2 grants whose record is gone. A contract or a // group they are bound to is the app's if the app's owner owns // it, which only the network says; if it cannot be read, // nothing is turned off and the row stays. - let recordedKeyIds = Self.recordedKeyIds(of: identityId, in: stores) let unrecorded = AppConnect.unrecordedV2Keys( recordedKeyIds: recordedKeyIds, bindings: bindings, currentIdentityPublicKeys: currentPublicKeys) // The store keeps every key it was ever given, the fetched view @@ -2704,25 +2724,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { appContractIds: owned.contracts, appGroupIds: owned.groups, keys: unrecorded) keyIds = Array(Set(keyIds).union(liveTwoQRLoginKeyIds).union(unrecordedV2KeyIds)).sorted() } - // The DashPay profile keys no record names go too: their bound does - // not say which app was given them, so they are turned off with - // every disconnect rather than left on for none to reach. A view the - // set cannot be told from (a live key no record names whose bound - // the store cannot read, a stored one the view lacks, a record the - // store cannot read) stops the disconnect. - // TODO(app-connect-v2-pending-record): a v2 approval writes its record - // only once its update is seen to land, so the profile key of one whose - // outcome was unknown when it failed has no record and is turned off - // here like any other. - guard !stores.grants.hasUnreadableRows(identityId: identityId), - let profileKeyIds = AppConnect.sharedProfileKeyIdsToDisable( - recordedKeyIds: Self.recordedKeyIds(of: identityId, in: stores), - bindings: bindings, - currentIdentityPublicKeys: currentPublicKeys, - nowMilliseconds: Int64(AppConnect.milliseconds(now()))) - else { - throw DashConnectPlatformError.identityKeysOutOfDate - } if !mayStillLand.isEmpty, keyIds.isEmpty { // No update would be sent, so nothing settles the registration. // This identity's own state comes first: whatever another @@ -2745,9 +2746,41 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let heldElsewhere = reasonHeldElsewhere(heldOnAnotherIdentity: heldOnAnotherIdentity == true) { throw heldElsewhere } - // Only once this disconnect turns off something of the app's: one - // that stops before signing leaves the profile keys too. - keyIds = Array(Set(keyIds).union(profileKeyIds)).sorted() + // The DashPay profile keys no record names: their bound does not say + // which app was given them, so they go with the disconnect of any + // app rather than being left on for none to reach. Only with a + // disconnect of an app this identity holds keys or a grant of, that + // ends here: one with nothing of the app's here, or that ends with + // the app held on another identity (or not checked there), leaves + // them. A grant whose keys went in an earlier try that then failed + // still counts, so a retry reaches them. When the set cannot be told + // (a live key no record names whose bound the store cannot read, a + // stored one the view lacks, a record the store cannot read), none + // of them is touched, and the app's own keys still go. + // TODO(app-connect-v2-pending-record): a v2 approval writes its record + // only once its update is seen to land, so the profile key of one whose + // outcome was unknown when it failed has no record and is turned off + // here like any other. + let completesHere = (!keyIds.isEmpty || !granted.isEmpty) && heldOnAnotherIdentity == false + && reasonHeldElsewhere(heldOnAnotherIdentity: false) == nil + var profileKeysOff: [UInt32] = [] + var profileKeysUnchecked = false + if completesHere { + let profileKeyIds: [UInt32]? = stores.grants.hasUnreadableRows(identityId: identityId) + ? nil + : AppConnect.sharedProfileKeyIdsToDisable( + recordedKeyIds: recordedKeyIds, + bindings: bindings, + currentIdentityPublicKeys: currentPublicKeys, + nowMilliseconds: Int64(AppConnect.milliseconds(now()))) + if let profileKeyIds { + profileKeysOff = profileKeyIds.filter { !keyIds.contains($0) } + keyIds = Array(Set(keyIds).union(profileKeysOff)).sorted() + } else { + Self.logger.error("🔗 DASHCONNECT :: DashPay profile keys no record names could not be told; none turned off") + profileKeysUnchecked = true + } + } if !keyIds.isEmpty { Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) app key(s)") // Platform takes a limited number of keys per update. A failure @@ -2800,13 +2833,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } if let heldElsewhere = reasonHeldElsewhere(heldOnAnotherIdentity: heldOnAnotherIdentity == true) { - return (heldElsewhere: heldElsewhere, asOneQR: asOneQR, profileKeysOff: profileKeyIds.count) + return (heldElsewhere: heldElsewhere, asOneQR: asOneQR, profileKeys: DashConnectDisconnectResult()) } // This identity's keys are off. Whether another one holds a key of // the app could not be read from the store, so the row stays, with // an error rather than without one. guard heldOnAnotherIdentity != nil else { throw DashConnectPlatformError.otherIdentitiesNotChecked } - return (heldElsewhere: nil, asOneQR: asOneQR, profileKeysOff: profileKeyIds.count) + return (heldElsewhere: nil, asOneQR: asOneQR, profileKeys: DashConnectDisconnectResult( + profileKeysTurnedOff: profileKeysOff.count, profileKeysUnchecked: profileKeysUnchecked)) } /// Disables `keyIds` on the identity, as many per update as Platform diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index d65aab9ac6..e624c7867f 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -387,18 +387,25 @@ final class ConnectionsViewModel: ObservableObject { guard let self else { return } defer { self.isDisconnecting = false } do { - let profileKeysOff = try await self.dataSource.disconnect(id: connection.id, scope: connection.scope) - // The disconnect also turned off the DashPay profile keys no - // connection accounts for; say so, since they may have been + let result = try await self.dataSource.disconnect(id: connection.id, scope: connection.scope) + // What the disconnect did with the DashPay profile keys no + // connection accounts for; said, since they may have been // another app's. - guard profileKeysOff > 0 else { return } - self.message = ConnectionsScreenMessage( - kind: .success, - text: String.localizedStringWithFormat( - NSLocalizedString( - "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d.", - comment: "DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off"), - profileKeysOff)) + if result.profileKeysUnchecked { + self.message = ConnectionsScreenMessage( + kind: .success, + text: NSLocalizedString( + "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off.", + comment: "DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart")) + } else if result.profileKeysTurnedOff > 0 { + self.message = ConnectionsScreenMessage( + kind: .success, + text: String.localizedStringWithFormat( + NSLocalizedString( + "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d.", + comment: "DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off"), + result.profileKeysTurnedOff)) + } } catch { self.message = ConnectionsScreenMessage( kind: .error, diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 7c2950172b..cb1138f005 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 8664c2ed39..0997874e63 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index f47afbc829..fe271fe9ce 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 3fe4fd9873..ea46780ece 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index ff7a38b748..541ef20bd6 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 0fcfac4e17..5efea37d2d 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 936885d45d..f7ed9d59b2 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index d87d83ee1c..a4a0bbfe05 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6591,3 +6591,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index b6fe7f3de0..85e149cdfb 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index cec97df4f7..a9f3fdfa0c 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 0123aeb187..4647c289e1 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 53386e6afe..a2adeaa4b4 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 099bd0d8c3..837e4bc388 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 6950da3a08..ebb45da784 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index c75bbe4023..0abe6dbd2a 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 3b833564a8..09f233575b 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 9d7722db1f..e57a4afc68 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index ef10a759cc..869c1c1056 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 523300ce75..84f1c833bd 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 7119e9ee01..f254730250 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 91ef1b8820..f45ea73914 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 3e58240dae..73c3d17f75 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index d6438a2841..6264633bdc 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index e0c9053562..66c0040f27 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 10b8790bf0..97bcfe25c9 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index eb9a53a355..5412a6055c 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index a836b19a57..4e9bb5f04a 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 8ecf4cbd93..0e8230a88c 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 7f743e0cb4..703eeb7fe7 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index f06a14ef21..a7d6c4a93a 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index c16b4fa547..3bf497d86f 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index e200ecd813..064983e5b7 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 0d2323a6e3..9041bb4e67 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 0cef6d5af5..06e89b8d00 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 06c2853b2c..e447a0a5d6 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 02ed188672..7de13d1468 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 2dd51a164f..ff12c142f1 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 5646b04bfe..371fa76fd0 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 7c753eea05..bff79a1f94 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index c1230657bd..aec64335b4 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 0197d0b69b..911d3caa59 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6815,3 +6815,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index ce2b5997fe..b7a3fb65a3 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 8764ef571e..4f0dda2804 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6813,3 +6813,6 @@ /* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; + +/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ +"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index ba671b5064..051c26be97 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1373,23 +1373,29 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { } /// A disconnect that also turned off DashPay profile keys no - /// connection accounted for says how many; one that turned off none says - /// nothing. - func testADisconnectThatTurnedOffProfileKeysSaysHowMany() async { + /// connection accounted for says how many; one that could not tell them + /// apart says so; one that turned off none says nothing. + func testADisconnectSaysWhatItDidWithTheProfileKeys() async { let spy = PurchaseApprovalSpy() - spy.profileKeysOff = 2 let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + spy.disconnectResult = DashConnectDisconnectResult(profileKeysTurnedOff: 2) viewModel.disconnect(Self.connection) - await waitUntil { !viewModel.isDisconnecting } - + await waitUntil { !viewModel.isDisconnecting && spy.disconnectedIds.count == 1 } XCTAssertEqual(viewModel.message?.kind, .success) XCTAssertEqual(viewModel.message?.text.contains("2"), true) - spy.profileKeysOff = 0 + spy.disconnectResult = DashConnectDisconnectResult(profileKeysUnchecked: true) viewModel.message = nil viewModel.disconnect(Self.connection) await waitUntil { !viewModel.isDisconnecting && spy.disconnectedIds.count == 2 } + XCTAssertEqual(viewModel.message?.kind, .success) + XCTAssertEqual(viewModel.message?.text.contains("could not be checked"), true) + + spy.disconnectResult = DashConnectDisconnectResult() + viewModel.message = nil + viewModel.disconnect(Self.connection) + await waitUntil { !viewModel.isDisconnecting && spy.disconnectedIds.count == 3 } XCTAssertNil(viewModel.message) } @@ -1669,22 +1675,22 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { lock.withLock { storedDisconnectedScopes } } - private var storedProfileKeysOff = 0 + private var storedDisconnectResult = DashConnectDisconnectResult() - /// How many DashPay profile keys a successful disconnect reports. - var profileKeysOff: Int { - get { lock.withLock { storedProfileKeysOff } } - set { lock.withLock { storedProfileKeysOff = newValue } } + /// What a successful disconnect reports about the profile keys. + var disconnectResult: DashConnectDisconnectResult { + get { lock.withLock { storedDisconnectResult } } + set { lock.withLock { storedDisconnectResult = newValue } } } - func disconnect(id: String, scope: String?) async throws -> Int { - let (failure, count) = lock.withLock { () -> (Error?, Int) in + func disconnect(id: String, scope: String?) async throws -> DashConnectDisconnectResult { + let (failure, result) = lock.withLock { () -> (Error?, DashConnectDisconnectResult) in storedDisconnectedIds.append(id) storedDisconnectedScopes.append(scope) - return (storedDisconnectFailure, storedProfileKeysOff) + return (storedDisconnectFailure, storedDisconnectResult) } if let failure { throw failure } - return count + return result } func remove(id: String, scope: String?) async { @@ -1749,7 +1755,7 @@ private final class LoginApprovalSpy: DashConnectDataSource { throw PurchaseSpyError.unsupported } - func disconnect(id: String, scope: String?) async throws -> Int { + func disconnect(id: String, scope: String?) async throws -> DashConnectDisconnectResult { throw PurchaseSpyError.unsupported } @@ -3106,11 +3112,33 @@ final class AppConnectLoginTests: XCTestCase { activeWalletIdHex: { active.idHex }, networkEndpoint: { endpoint.url }, notificationCenter: notificationCenter, - operationGate: operationGate + operationGate: operationGate, + defaults: defaults ) return (dataSource, connections) } + /// What an earlier build noted about kept shared profile keys is removed + /// once, when the data source starts; nothing else in the defaults is + /// touched, and a later start scans nothing. + func testKeptSharedProfileKeysAreRemovedWhenTheDataSourceStarts() { + defaults.set([4, 7], forKey: "DashConnect.keptSharedProfileKeys wallet-a t identity-a") + defaults.set([9], forKey: "DashConnect.keptSharedProfileKeys wallet-b t identity-b") + defaults.set("x", forKey: "DashConnect.other") + + _ = makeScopedDataSource(active: ActiveWallet("wallet-a")) + + XCTAssertNil(defaults.object(forKey: "DashConnect.keptSharedProfileKeys wallet-a t identity-a")) + XCTAssertNil(defaults.object(forKey: "DashConnect.keptSharedProfileKeys wallet-b t identity-b")) + XCTAssertEqual(defaults.string(forKey: "DashConnect.other"), "x") + XCTAssertTrue(defaults.bool(forKey: PlatformDashConnectDataSource.keptSharedProfileKeysRemovedKey)) + + defaults.set([5], forKey: "DashConnect.keptSharedProfileKeys wallet-c t identity-c") + _ = makeScopedDataSource(active: ActiveWallet("wallet-a")) + XCTAssertNotNil( + defaults.object(forKey: "DashConnect.keptSharedProfileKeys wallet-c t identity-c"), "it runs once") + } + private static func twoQRRow( id: String = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: ConnectionStatus From 3415560d1b6dabe1007294ac0336c7ed0a6d314c Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 3 Nov 2026 13:53:48 +0200 Subject: [PATCH 074/108] refactor(dashconnect): derive App Connect rows from the identity and a recorded intent Replace the App Connect grant lifecycle with a projection: one identity snapshot plus the intents this wallet recorded before each update give every row, status and unrecorded key. An intent is written before the identity update is submitted and is closed, not deleted, when it is done. - v2 only: a v1 dash-key login is refused at protocol version 14. - Disconnect adds a wallet-owned fence key at each id an unlanded intent would take, so a late update can no longer land, then disables it. - A read behind the newest revision seen throws instead of overwriting state. - Keys this wallet did not record are turned off only on an explicit confirm. - Two-QR login keys are never offered for turning off. - New "Confirming" status for an approval whose update may still land. Co-Authored-By: Claude Opus 5.5 --- DashWallet.xcodeproj/project.pbxproj | 4 + .../Models/DashConnect/AppConnectLogin.swift | 578 +--- .../DashConnect/AppConnectProjection.swift | 483 ++++ .../DashConnect/AppConnectV2Login.swift | 250 -- .../DashConnect/DashConnectDataSource.swift | 41 +- .../DashConnect/DashConnectModels.swift | 46 +- .../Models/DashConnect/DashConnectStore.swift | 2 +- .../PlatformDashConnectDataSource.swift | 2410 ++++++----------- .../DashConnect/ApproveConnectionSheet.swift | 67 +- .../Components/ConnectionRow.swift | 17 +- .../Components/ConnectionStatusBadge.swift | 7 +- .../UI/DashConnect/ConnectionsScreen.swift | 19 +- .../UI/DashConnect/ConnectionsViewModel.swift | 75 +- DashWallet/ar.lproj/Localizable.strings | 54 +- DashWallet/bg.lproj/Localizable.strings | 54 +- DashWallet/ca.lproj/Localizable.strings | 54 +- DashWallet/cs.lproj/Localizable.strings | 54 +- DashWallet/da.lproj/Localizable.strings | 54 +- DashWallet/de.lproj/Localizable.strings | 54 +- DashWallet/el.lproj/Localizable.strings | 54 +- DashWallet/en.lproj/Localizable.strings | 54 +- DashWallet/eo.lproj/Localizable.strings | 54 +- DashWallet/es.lproj/Localizable.strings | 54 +- DashWallet/et.lproj/Localizable.strings | 54 +- DashWallet/fa.lproj/Localizable.strings | 54 +- DashWallet/fi.lproj/Localizable.strings | 54 +- DashWallet/fil.lproj/Localizable.strings | 54 +- DashWallet/fr.lproj/Localizable.strings | 54 +- DashWallet/hr.lproj/Localizable.strings | 54 +- DashWallet/hu.lproj/Localizable.strings | 54 +- DashWallet/id.lproj/Localizable.strings | 54 +- DashWallet/it.lproj/Localizable.strings | 54 +- DashWallet/ja.lproj/Localizable.strings | 54 +- DashWallet/ko.lproj/Localizable.strings | 54 +- DashWallet/mk.lproj/Localizable.strings | 54 +- DashWallet/ms.lproj/Localizable.strings | 54 +- DashWallet/nb.lproj/Localizable.strings | 54 +- DashWallet/nl.lproj/Localizable.strings | 54 +- DashWallet/pl.lproj/Localizable.strings | 54 +- DashWallet/pt.lproj/Localizable.strings | 54 +- DashWallet/ro.lproj/Localizable.strings | 54 +- DashWallet/ru.lproj/Localizable.strings | 54 +- DashWallet/sk.lproj/Localizable.strings | 54 +- DashWallet/sl.lproj/Localizable.strings | 54 +- DashWallet/sl_SI.lproj/Localizable.strings | 54 +- DashWallet/sq.lproj/Localizable.strings | 54 +- DashWallet/sr.lproj/Localizable.strings | 54 +- DashWallet/sv.lproj/Localizable.strings | 54 +- DashWallet/th.lproj/Localizable.strings | 54 +- DashWallet/tr.lproj/Localizable.strings | 54 +- DashWallet/uk.lproj/Localizable.strings | 54 +- DashWallet/vi.lproj/Localizable.strings | 54 +- DashWallet/zh-Hans.lproj/Localizable.strings | 54 +- .../zh-Hant-TW.lproj/Localizable.strings | 54 +- DashWallet/zh.lproj/Localizable.strings | 54 +- DashWallet/zh_TW.lproj/Localizable.strings | 54 +- .../AppConnectProjectionTests.swift | 533 ++++ .../DashConnect/AppConnectV2LoginTests.swift | 377 +-- .../DashConnect/DashConnectStoreTests.swift | 2 +- .../PlatformDashConnectDataSourceTests.swift | 1013 +------ 60 files changed, 3923 insertions(+), 4323 deletions(-) create mode 100644 DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift create mode 100644 DashWalletTests/DashConnect/AppConnectProjectionTests.swift diff --git a/DashWallet.xcodeproj/project.pbxproj b/DashWallet.xcodeproj/project.pbxproj index 14f9cd61b1..9860704612 100644 --- a/DashWallet.xcodeproj/project.pbxproj +++ b/DashWallet.xcodeproj/project.pbxproj @@ -1181,6 +1181,7 @@ AA04A0012FF4000000000001 /* DashConnectDataSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA04A0032FF4000000000003 /* DashConnectDataSourceTests.swift */; }; AA05A0012FF5000000000001 /* DashConnectStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA05A0032FF5000000000003 /* DashConnectStoreTests.swift */; }; AA06A0112FF6000000000011 /* AppConnectV2LoginTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA06A0132FF6000000000013 /* AppConnectV2LoginTests.swift */; }; + AA06A0F12FF60000000000F1 /* AppConnectProjectionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA06A0F32FF60000000000F3 /* AppConnectProjectionTests.swift */; }; AA06A0212FF6000000000021 /* AppConnectEncryptionRotationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA06A0232FF6000000000023 /* AppConnectEncryptionRotationTests.swift */; }; AA06A0012FF6000000000001 /* PlatformDashConnectDataSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA06A0032FF6000000000003 /* PlatformDashConnectDataSourceTests.swift */; }; AA22BB33CC44DD55EE66FF78 /* BuyReceiveFlowUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA22BB33CC44DD55EE66FF77 /* BuyReceiveFlowUITests.swift */; }; @@ -3367,6 +3368,7 @@ AA04A0032FF4000000000003 /* DashConnectDataSourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DashConnectDataSourceTests.swift; path = DashConnect/DashConnectDataSourceTests.swift; sourceTree = ""; }; AA05A0032FF5000000000003 /* DashConnectStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DashConnectStoreTests.swift; path = DashConnect/DashConnectStoreTests.swift; sourceTree = ""; }; AA06A0132FF6000000000013 /* AppConnectV2LoginTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppConnectV2LoginTests.swift; path = DashConnect/AppConnectV2LoginTests.swift; sourceTree = ""; }; + AA06A0F32FF60000000000F3 /* AppConnectProjectionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppConnectProjectionTests.swift; path = DashConnect/AppConnectProjectionTests.swift; sourceTree = ""; }; AA06A0232FF6000000000023 /* AppConnectEncryptionRotationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppConnectEncryptionRotationTests.swift; path = DashConnect/AppConnectEncryptionRotationTests.swift; sourceTree = ""; }; AA06A0032FF6000000000003 /* PlatformDashConnectDataSourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PlatformDashConnectDataSourceTests.swift; path = DashConnect/PlatformDashConnectDataSourceTests.swift; sourceTree = ""; }; AA22BB33CC44DD55EE66FF77 /* BuyReceiveFlowUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuyReceiveFlowUITests.swift; sourceTree = ""; }; @@ -7577,6 +7579,7 @@ AA04A0032FF4000000000003 /* DashConnectDataSourceTests.swift */, AA05A0032FF5000000000003 /* DashConnectStoreTests.swift */, AA06A0132FF6000000000013 /* AppConnectV2LoginTests.swift */, + AA06A0F32FF60000000000F3 /* AppConnectProjectionTests.swift */, AA06A0232FF6000000000023 /* AppConnectEncryptionRotationTests.swift */, AA06A0032FF6000000000003 /* PlatformDashConnectDataSourceTests.swift */, 47976E492987772700612988 /* AmountObjectTests.swift */, @@ -10911,6 +10914,7 @@ AA04A0012FF4000000000001 /* DashConnectDataSourceTests.swift in Sources */, AA05A0012FF5000000000001 /* DashConnectStoreTests.swift in Sources */, AA06A0112FF6000000000011 /* AppConnectV2LoginTests.swift in Sources */, + AA06A0F12FF60000000000F1 /* AppConnectProjectionTests.swift in Sources */, AA06A0212FF6000000000021 /* AppConnectEncryptionRotationTests.swift in Sources */, AA06A0012FF6000000000001 /* PlatformDashConnectDataSourceTests.swift in Sources */, 47976E4A2987772700612988 /* AmountObjectTests.swift in Sources */, diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 6e6741912e..b2ab7d3ec2 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -3,14 +3,15 @@ import Foundation import os import SwiftDashSDK -/// The one-QR login (DashConnect v2): the wallet derives a session key for -/// the request, registers it on the identity, and only then publishes the -/// encrypted key to the App Connect system contract. There is no `dash-st:` +/// App Connect (DashConnect from protocol version 14): the wallet registers +/// the keys a request asks for on the identity, then publishes them, +/// encrypted, to the App Connect system contract. There is no `dash-st:` /// step. /// /// `AppConnect` holds the rules and is pure; `PlatformDashConnectDataSource` -/// owns the Platform calls and their order. The grant records and their -/// `UserDefaults` store are at the end of the file. +/// owns the Platform calls and their order. The intent store is at the end +/// of the file; the v2 rules are in `AppConnectV2Login.swift` and the +/// projection in `AppConnectProjection.swift`. enum AppConnect { /// The protocol version that registers the App Connect system contract. /// Below it the contract does not exist and the two-QR login is the only @@ -22,28 +23,6 @@ enum AppConnect { static let contractId = "H8F9mP1BM55TE1ShsxPZHzhyinaMdY9bMmP85mkDhcJJ" static let documentType = PlatformDashConnectDataSource.loginKeyExchangeDocumentType - /// Limits put on every session key. - /// TODO(app-connect-limits): the protocol leaves both values to the - /// wallet and nothing has fixed them yet; they are not user-selectable. - static let sessionKeyBudgetCredits: UInt64 = 5_000_000_000 // 0.05 DASH - static let sessionKeyLifetime: TimeInterval = 90 * 24 * 60 * 60 - - /// What a one-QR approval gives the app: how many of the identity's - /// credits its key may spend and for how long the key works. The approval - /// sheet shows these values and the key is registered with them. - struct SessionKeyTerms: Equatable { - let budgetCredits: UInt64 - let lifetime: TimeInterval - - static let current = SessionKeyTerms( - budgetCredits: sessionKeyBudgetCredits, - lifetime: sessionKeyLifetime) - - func expiresAt(from now: Date) -> UInt64 { - UInt64((now.addingTimeInterval(lifetime).timeIntervalSince1970 * 1000).rounded()) - } - } - static func isAvailable(protocolVersion: UInt32) -> Bool { protocolVersion >= minimumProtocolVersion } @@ -56,19 +35,12 @@ enum AppConnect { case unresolved /// Registers no key at approval. case twoQR - /// Registers a session key with these terms. - case oneQR(SessionKeyTerms) /// An App Connect request v2: registers the keys of this plan. case appConnect(GrantPlan) /// An App Connect request v2 the wallet will not answer; there is /// nothing to approve. case refused(Refusal) - var sessionKeyTerms: SessionKeyTerms? { - if case .oneQR(let terms) = self { return terms } - return nil - } - var grantPlan: GrantPlan? { if case .appConnect(let plan) = self { return plan } return nil @@ -77,182 +49,42 @@ enum AppConnect { /// Whether the sheet has something to approve. var isApprovable: Bool { switch self { - case .twoQR, .oneQR, .appConnect: return true + case .twoQR, .appConnect: return true case .unresolved, .refused: return false } } } - /// The login a network at `protocolVersion` gets. + /// The login a `dash-key:` v1 request gets on a network at + /// `protocolVersion`. From the version that registers the App Connect + /// system contract only a v2 request is answered: a v1 request has no + /// way to say what it asks for. static func login(protocolVersion: UInt32) -> Login { - isAvailable(protocolVersion: protocolVersion) ? .oneQR(.current) : .twoQR - } - - /// The DIP-13 leaf of the session key: `hash256` of the app's ephemeral - /// public key. Not the lookup key of the response, which is `hash160` of - /// the same bytes. - static func requestId(appEphemeralPubKey: Data) -> Data { - Data(SHA256.hash(data: Data(SHA256.hash(data: appEphemeralPubKey)))) - } - - /// What the identity already holds for a derived session key. - enum SessionKeyState: Equatable { - /// Not on the identity: register it. - case absent - /// Registered, able to sign, and shown to be this app's key within - /// the approved terms: publish without an identity update. - case usable(keyId: UInt32) - /// Registered but disabled or expired, or not shown to be this app's - /// key within the approved terms. Platform never re-adds a key, so - /// this request cannot be answered; the app has to ask again. - case unusable - } - - /// How far the device clock may have moved back since a key was - /// registered before that key's expiry counts as later than the terms - /// allow. Without it a clock correction between two tries of one request - /// would turn the wallet's own key away. - static let clockTolerance: TimeInterval = 60 * 60 - - /// The session key is derived from the identity and the request's - /// ephemeral key, not from the app's contract, so a request that repeats - /// another app's ephemeral key derives that app's key. A registered key - /// is therefore reused only when it is bound to `appContractId` and - /// carries limits no wider than `terms`. - /// - /// The fetched key list carries no bounds. The bound is read from - /// `bindings`; a key the store cannot place counts as this app's only - /// when `grantedKeyIds` holds it — the keys this wallet recorded giving - /// this app for this request. - static func sessionKeyState( - publicKeyHash160: Data, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], - appContractId: Data, - bindings: [KeyBinding], - grantedKeyIds: Set, - terms: SessionKeyTerms, - now: Date - ) -> SessionKeyState { - guard let key = currentIdentityPublicKeys.first(where: { - $0.keyType == .ecdsaHash160 && $0.data == publicKeyHash160 - }) else { - return .absent - } - let nowMilliseconds = Int64((now.timeIntervalSince1970 * 1000).rounded()) - guard key.purpose == .authentication, - key.securityLevel == .high, - key.disabledAt == nil, - let totalBudget = key.totalBudget, - totalBudget <= terms.budgetCredits, - let expiresAt = key.expiresAt, - expiresAt > nowMilliseconds, - UInt64(expiresAt) <= terms.expiresAt(from: now.addingTimeInterval(clockTolerance)) else { - return .unusable - } - let keyId = UInt32(bitPattern: key.keyId) - let stored = bindings.first { $0.keyId == keyId && $0.data == key.data && !$0.hasUnreadableBound } - guard stored.map({ $0.singleContractId == appContractId }) ?? grantedKeyIds.contains(keyId) else { - return .unusable - } - return .usable(keyId: keyId) - } - - /// `count` ids that no key of the identity has, for one update that - /// adds `count` keys: above the highest id while they fit, then the - /// lowest gaps. Nil when the identity cannot take that many. - static func freeKeyIds( - count: Int, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] - ) -> [UInt32]? { - let taken = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) - let highest = taken.max() - var ids: [UInt32] = [] - var next = highest.map { $0 == .max ? nil : $0 + 1 } ?? 0 - while ids.count < count, let id = next { - ids.append(id) - next = id == .max ? nil : id + 1 - } - // The identity holds far fewer keys than there are ids, so this - // stops within a few steps of the lowest gaps. - var gap: UInt32 = 0 - while ids.count < count { - if !taken.contains(gap) && !ids.contains(gap) { ids.append(gap) } - guard gap < .max else { return nil } - gap += 1 - } - return ids - } - - /// The id for a new key: one above the highest on the identity, disabled - /// keys included. Platform only refuses an id the identity already has, - /// so when the highest is the last id a key can have (a key an app - /// registered can be given it) the lowest id no key has is taken - /// instead. `nil` only when every id is taken. - static func nextKeyId( - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] - ) -> UInt32? { - let taken = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) - let highest = taken.max() ?? 0 - guard highest == .max else { return highest + 1 } - // The identity holds far fewer keys than there are ids, so this - // stops within a few steps of the lowest gap. - return (0 ... UInt32.max).first { !taken.contains($0) } - } - - /// The key an app is given: it can only sign for the contract the request - /// named, spend up to `totalBudget`, and stops working at `expiresAt`. - static func sessionIdentityPubkey( - keyId: UInt32, - publicKeyHash160: Data, - appContractId: Data, - totalBudget: UInt64, - expiresAt: UInt64 - ) -> ManagedPlatformWallet.IdentityPubkey { - ManagedPlatformWallet.IdentityPubkey( - keyId: keyId, - keyType: .ecdsaHash160, - purpose: .authentication, - securityLevel: .high, - pubkeyBytes: publicKeyHash160, - contractBounds: .singleContract(id: appContractId), - totalBudget: totalBudget, - expiresAt: expiresAt - ) + guard isAvailable(protocolVersion: protocolVersion) else { return .twoQR } + return .refused(Refusal(.unsupported, NSLocalizedString( + "This app uses an older sign-in that this network no longer takes. Ask the app for a new code.", + comment: "DashConnect App Connect v1"))) } /// What the wallet's store of identity keys says about one key: its /// payload, whether it is disabled there, and the contract it is bound to /// when the bound is a whole single contract. The fetched key list - /// carries no bounds, so for a key without a grant record this is where - /// its app is read from. + /// carries no bounds, so this is where a key's bound is read from. struct KeyBinding: Equatable { let keyId: UInt32 let data: Data let singleContractId: Data? var isDisabled = false - /// The stored key has the type, purpose, level and limits of a key - /// this login registers. - var isSessionKeyShaped = false /// The store has a bound for the key that this build cannot read, so /// the key's app is unknown rather than "another one". var hasUnreadableBound = false - /// The stored key has the type, purpose and level of the two-QR - /// login's authentication key, or of its encryption key. - var isTwoQRAuthenticationKeyShaped = false - var isTwoQREncryptionKeyShaped = false /// The key's bound as the store holds it; nil for a key with no /// bound, or one this build cannot read (`hasUnreadableBound`). var bound: StoredBound? = nil - /// The stored key has the shape of an App Connect v2 auth key: - /// HASH160 authentication at HIGH or CRITICAL, with an expiry. - var isV2AuthKeyShaped = false - /// When the stored key stops working, in milliseconds since 1970; - /// nil for a key with no expiry. - var expiresAt: Int64? = nil } /// A key's contract bound, as the wallet's store records it. - enum StoredBound: Equatable { + enum StoredBound: Codable, Equatable { case singleContract(Data) case documentType(contractId: Data, name: String) case contractGroup(Data) @@ -272,27 +104,6 @@ enum AppConnect { } } - /// Whether the store shows either key of the two-QR login, not disabled, - /// in the kind that login registers it. A two-QR login leaves no grant - /// record, so on an identity that is not the active one this is how its - /// keys are recognised. - static func holdsLiveTwoQRLoginKey( - authenticationPublicKeyHash160: Data, - encryptionPublicKey: Data, - bindings: [KeyBinding] - ) -> Bool { - bindings.contains { - !$0.isDisabled - && (($0.isTwoQRAuthenticationKeyShaped && $0.data == authenticationPublicKeyHash160) - || ($0.isTwoQREncryptionKeyShaped && $0.data == encryptionPublicKey)) - } - } - - /// Whether the store shows a live session key bound to `appContractId`. - static func holdsLiveSessionKey(appContractId: Data, bindings: [KeyBinding]) -> Bool { - bindings.contains { $0.singleContractId == appContractId && !$0.isDisabled && $0.isSessionKeyShaped } - } - /// The most keys one identity update may disable (Platform consensus). static let maxKeysDisabledPerUpdate = 10 @@ -315,183 +126,6 @@ enum AppConnect { return id } - /// A live key in a shape App Connect registers for an app: HASH160 - /// authentication at HIGH (a v1 session key, most v2 keys) or CRITICAL - /// (a v2 contract-group key). - static func isLiveAppConnectAuthKey(_ key: ManagedIdentity.IdentityPublicKeyInfo) -> Bool { - key.keyType == .ecdsaHash160 && key.purpose == .authentication - && (key.securityLevel == .high || key.securityLevel == .critical) && key.disabledAt == nil - } - - private static func isLiveSessionKey(_ key: ManagedIdentity.IdentityPublicKeyInfo) -> Bool { - key.keyType == .ecdsaHash160 - && key.purpose == .authentication - && key.securityLevel == .high - && key.disabledAt == nil - } - - /// The keys a disconnect has to disable: the live ones behind `grants`, - /// plus every live key of the same kind that `bindings` shows bound to - /// `appContractId` and that carries a budget and an expiry, as every key - /// this login registers does. That covers the keys a reinstalled wallet - /// has no grant record for. A key that is gone, already disabled, or of - /// another shape is left alone, including one another wallet gave the - /// app with a document-type bound, a single limit or another key type. - /// A key without a grant record whose payload is - /// `twoQRAuthenticationKeyHash160` is left alone as well: the two-QR - /// login's authentication key has the same kind and bound, and a - /// `dash-st:` registration may have put limits on it. The caller passes - /// it when that key is to stay. - static func sessionKeyIdsToDisable( - for grants: [AppConnectGrant], - appContractId: Data, - bindings: [KeyBinding], - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], - twoQRAuthenticationKeyHash160: Data? = nil - ) -> [UInt32] { - let granted = Set(grants.flatMap(\.keyIds)) - let grantedByV2 = Set(grants.filter { $0.additionalKeyIds != nil || $0.connectionId != nil }.flatMap(\.keyIds)) - return currentIdentityPublicKeys - .filter { key in - let keyId = UInt32(bitPattern: key.keyId) - // A recorded id is disabled only while the key under it has - // the shape the grant registered: the id of a registration - // that never landed may belong to another key since. A v1 - // session key is HIGH; a v2 grant's keys may also be a - // CRITICAL group key, which the store has to show bound to a - // group. - if granted.contains(keyId) { - if isLiveSessionKey(key) { return true } - guard grantedByV2.contains(keyId), isLiveAppConnectAuthKey(key), - key.securityLevel == .critical else { return false } - return bindings.contains { - guard $0.keyId == keyId, $0.data == key.data, case .contractGroup = $0.bound else { return false } - return true - } - } - guard isLiveSessionKey(key) else { return false } - guard key.totalBudget != nil, key.expiresAt != nil, - key.data != twoQRAuthenticationKeyHash160 else { return false } - return bindings.contains { - $0.keyId == keyId && $0.data == key.data && $0.singleContractId == appContractId - } - } - .map { UInt32(bitPattern: $0.keyId) } - .sorted() - } - - /// Live keys in a shape App Connect registers (`isLiveAppConnectAuthKey`) - /// whose bound is unknown: not behind `grants`, and either absent from - /// `bindings` or stored with a bound that cannot be read. Any of them - /// could belong to the app being disconnected, so a disconnect must stop - /// on these instead of reporting every key as turned off. - static func sessionKeyIdsWithUnknownBinding( - for grants: [AppConnectGrant], - bindings: [KeyBinding], - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] - ) -> [UInt32] { - let granted = Set(grants.flatMap(\.keyIds)) - return currentIdentityPublicKeys - .filter { key in - guard isLiveAppConnectAuthKey(key) else { return false } - let keyId = UInt32(bitPattern: key.keyId) - return !granted.contains(keyId) && !bindings.contains { - $0.keyId == keyId && $0.data == key.data && !$0.hasUnreadableBound - } - } - .map { UInt32(bitPattern: $0.keyId) } - .sorted() - } - - /// Keys the store holds as live and bound to `appContractId` that the - /// given view of the identity does not contain. As with a missing granted - /// key, the view is out of date and a disconnect must stop. - static func boundKeyIdsMissing( - from currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], - appContractId: Data, - bindings: [KeyBinding] - ) -> [UInt32] { - let known = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) - return bindings - .filter { $0.singleContractId == appContractId && !$0.isDisabled && !known.contains($0.keyId) } - .map(\.keyId) - .sorted() - } - - /// Whether the identity holds, live, the key a record names. For an - /// unconfirmed record that is the key it was going to register, with - /// everything that key was given: the data, the kind, the limits, and the - /// bound to the record's app as the wallet's store reads it. A bound the - /// store does not show is not taken on trust. - static func holdsRecordedKey( - _ grant: AppConnectGrant, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], - bindings: [KeyBinding] - ) -> Bool { - guard let hash = grant.unconfirmedKeyHash160 else { - // A confirmed record: any of its keys (a v2 grant has several). - return currentIdentityPublicKeys.contains { - grant.keyIds.contains(UInt32(bitPattern: $0.keyId)) && $0.disabledAt == nil - } - } - return currentIdentityPublicKeys.contains { key in - guard UInt32(bitPattern: key.keyId) == grant.sessionKeyId, key.disabledAt == nil else { return false } - guard let appContractId = Data.identifier(fromBase58: grant.appContractId) else { return false } - return key.keyType == .ecdsaHash160 && key.data.toHexString() == hash - && key.purpose == .authentication && key.securityLevel == .high - && key.totalBudget == grant.totalBudget - && key.expiresAt.map({ UInt64(max(0, $0)) }) == grant.expiresAt - && bindings.contains { - $0.keyId == grant.sessionKeyId && $0.data == key.data && !$0.hasUnreadableBound - && $0.singleContractId == appContractId - } - } - } - - /// Confirms the unconfirmed records of `identityId` whose key the - /// identity now holds, and returns them. A record whose key is not there - /// stays as it is: the update may still land, and nothing is taken from - /// a view that may be behind. - static func confirmRegistrations( - in grants: inout [AppConnectGrant], - identityId: String, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], - bindings: [KeyBinding] - ) -> [AppConnectGrant] { - var confirmed: [AppConnectGrant] = [] - for index in grants.indices - where grants[index].identityId == identityId && grants[index].isUnconfirmed - && holdsRecordedKey( - grants[index], currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings) { - grants[index].unconfirmedKeyHash160 = nil - confirmed.append(grants[index]) - } - return confirmed - } - - /// Granted session keys the given view of the identity does not contain. - /// Platform never removes a key, it only disables it, so a missing id - /// means the view is out of date — not that the key is gone. A disconnect - /// must stop on these instead of treating them as dealt with. - static func sessionKeyIdsMissing( - from currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], - for grants: [AppConnectGrant] - ) -> [UInt32] { - let known = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) - return Set(grants.flatMap(\.keyIds)).subtracting(known).sorted() - } - - /// What a disconnect leaves of the matching records once their keys are - /// disabled. A record whose response is known to be gone is done; the - /// rest stay, marked, until their response is deleted, or found if its - /// publish never confirmed. - static func markKeysDisabled(in grants: inout [AppConnectGrant], where matches: (AppConnectGrant) -> Bool) { - grants.removeAll { matches($0) && $0.responseDeleted == true } - for index in grants.indices where matches(grants[index]) { - grants[index].keyDisabled = true - } - } - /// The query for one identity's response to one request, in the order of /// the contract's only index. A byte-array value travels as base64. static func responseLookupWhereClause(appEphemeralPubKeyHash: Data, ownerIdentityId: Data) -> String { @@ -584,8 +218,8 @@ enum AppConnect { } /// A 32-byte key encrypted to an app's ephemeral key, with what the app - /// needs to find and open it. Shared by both logins: the two-QR response - /// carries the login key, the one-QR response the session private key. + /// needs to find and open it. The two-QR response carries the login key + /// sealed this way. struct SealedKey: Equatable { let appEphemeralPubKeyHash: Data let walletEphemeralPublicKey: Data @@ -623,99 +257,6 @@ enum AppConnect { } } -/// A session key this wallet registered for an app, and the response that -/// carried it. Kept until the key is disabled and the response is gone. -/// -/// The response type is index-only on Platform: there is no lookup by app and -/// a delete has to carry the original values, so this record is the only way -/// back to the entry. It also names the key; without it a disconnect finds -/// the key by its contract bound, and the entry not at all. -struct AppConnectGrant: Codable, Equatable { - /// Base58 ids. - let identityId: String - let appContractId: String - /// `nil` until Platform confirmed the response: the grant is recorded - /// before publishing, so a publish whose outcome is unknown still leaves - /// a key that can be disabled. - var documentId: String? - /// Replaced only by values read back from Platform. - var values: AppConnect.ResponseValues - let sessionKeyId: UInt32 - /// The limits the key was registered with; `nil` for one without. - let totalBudget: UInt64? - let expiresAt: UInt64? - let publishedAt: Date - /// Set once the response is known to be gone from Platform while the key - /// stays live: deleted by a later login to the same app, or never there - /// after a publish that did not land. Absent means not known to be gone. - var responseDeleted: Bool? - /// Set once a disconnect disabled the key while its response could not - /// be deleted, or could not be shown to be absent; the record then only - /// waits for that. - var keyDisabled: Bool? - /// App Connect v2: the grant's other auth keys, in request order after - /// `sessionKeyId` (the primary binding's key). The identity's encryption - /// key for the app is shared by every device and is not part of a grant. - var additionalKeyIds: [UInt32]? = nil - /// App Connect v2: the request's `CONNECTION_ID` (hex). A later login - /// with the same one replaces this grant's keys. - var connectionId: String? = nil - /// App Connect v2: the ids of the identity's encryption keys the - /// response carries, in slot order. A retry sends the recorded response - /// only while it would carry the same ones. - var encryptionKeyIds: [UInt32]? = nil - - /// Every auth key of the grant. - var keyIds: [UInt32] { - [sessionKeyId] + (additionalKeyIds ?? []) - } - - /// The hex hash160 of the session key, set from just before its - /// registration is submitted until the key is seen on the identity. - /// While set, the key may be there or not: an update can land without - /// confirming. Such a record has no row and no response; it is kept so - /// the key, if it lands, is found and confirmed, until a disconnect - /// finds that the update can no longer land. - var unconfirmedKeyHash160: String? = nil - /// The identity revision the registration's update was submitted with, - /// set with `unconfirmedKeyHash160`. Platform takes an identity update - /// only at one above the identity's revision, so once the identity is at - /// this revision or past it without the key live, the update can never - /// land. - /// `nil` on a record from a build that did not note it. - var submittedRevision: UInt64? = nil - - var isUnconfirmed: Bool { unconfirmedKeyHash160 != nil } - - /// What makes two records the same grant: one session key given for one - /// request. Records are matched on this, never on whole-value equality — - /// `publishedAt` does not survive the store's millisecond round trip bit - /// for bit. - var key: String { - [identityId, appContractId, String(sessionKeyId), values.appEphemeralPubKeyHash].joined(separator: "|") - } - - /// Call before a publish is submitted. Until Platform confirms it, the - /// response may be there or not, whatever the record said before: a - /// response an earlier login deleted is published again when its request - /// comes back. - mutating func markPublishStarted() { - documentId = nil - responseDeleted = nil - } - - /// Whether there is a response on Platform this record can still delete. - var hasDeletableResponse: Bool { - documentId != nil && responseDeleted != true - } - - /// A publish was started and never confirmed: the response may be on - /// Platform or not. - var hasUnconfirmedResponse: Bool { - documentId == nil && responseDeleted != true - } -} - /// Lets one DashConnect operation at a time run for a wallet, across every /// data source in the process. A screen that is opened again gets a new data /// source over the same stores while an approval started on the old one is @@ -768,30 +309,36 @@ actor DashConnectOperationGate { } } -protocol AppConnectResponseStore { - /// Whether `save` keeps anything. A login must not register a key the - /// store cannot record: its response could not be found again. +protocol AppConnectIntentStore { + /// Whether `save` keeps anything. An approval must not submit keys the + /// store cannot record: nothing would then name them. var canPersist: Bool { get } /// Whether the store holds a row `load` leaves out because it cannot be - /// read, and that may be a record of `identityId`: one naming another - /// identity is not. - func hasUnreadableRows(identityId: String) -> Bool - func load() -> [AppConnectGrant] - func save(_ grants: [AppConnectGrant]) + /// read, and that may be an intent of `identityId`: one naming another + /// identity is not. Such a row may name key ids that are still to land. + func hasUnreadableRows(identityId: Data) -> Bool + func load() -> [AppConnect.ConnectionIntent] + func save(_ intents: [AppConnect.ConnectionIntent]) /// This store fixed to one wallet, and to the network scope it has now, /// like `DashConnectStore.pinned(toWalletIdHex:)`. - func pinned(toWalletIdHex walletIdHex: String) -> any AppConnectResponseStore + func pinned(toWalletIdHex walletIdHex: String) -> any AppConnectIntentStore } -extension AppConnectResponseStore { +extension AppConnectIntentStore { var canPersist: Bool { true } - func hasUnreadableRows(identityId: String) -> Bool { false } + func hasUnreadableRows(identityId: Data) -> Bool { false } } /// Wallet- and network-scoped, like `UserDefaultsDashConnectStore`, whose -/// scope it borrows. Nothing stored is secret: the values are public on -/// chain and the key ids are visible on the identity. -final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { +/// scope it borrows. Nothing stored is secret: the public keys and the +/// response, which is sealed to the app's ephemeral key, are what goes on +/// chain. +/// +/// It replaces the grant records (`app-connect-responses.v1`) that internal +/// TestFlight builds of the DashConnect release branch wrote; no App Store +/// build wrote them, and they are not read. Keys those builds gave show as +/// keys no intent names, and can be turned off from Connections. +final class UserDefaultsAppConnectIntentStore: AppConnectIntentStore { private let defaults: UserDefaults private let scope: Scope private let encoder: JSONEncoder @@ -839,19 +386,19 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { case .connections(let connections): scopeKey = connections.storageKey case .key(let provider): scopeKey = provider() } - return scopeKey.map { "\($0).app-connect-responses.v1" } + return scopeKey.map { "\($0).app-connect-intents.v1" } } - func pinned(toWalletIdHex walletIdHex: String) -> any AppConnectResponseStore { + func pinned(toWalletIdHex walletIdHex: String) -> any AppConnectIntentStore { switch scope { case .connections(let connections): - return UserDefaultsAppConnectResponseStore( + return UserDefaultsAppConnectIntentStore( defaults: defaults, scope: .connections(connections.pinnedStore(toWalletIdHex: walletIdHex))) case .key(let provider): // A handed-in scope names no wallet to replace: it is fixed to // the value it has now. let scopeKey = provider() - return UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .key { scopeKey }) + return UserDefaultsAppConnectIntentStore(defaults: defaults, scope: .key { scopeKey }) } } @@ -859,72 +406,69 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { /// leaves such a value alone, so nothing new would be kept. var canPersist: Bool { storageKey != nil && !readRows().isNotRowList } - func hasUnreadableRows(identityId: String) -> Bool { + func hasUnreadableRows(identityId: Data) -> Bool { let rows = readRows() return rows.isNotRowList || rows.unreadable.contains { guard let named = ($0 as? [String: Any])?["identityId"] as? String else { return true } - return named == identityId + return named == identityId.base64EncodedString() } } - func load() -> [AppConnectGrant] { - readRows().grants + func load() -> [AppConnect.ConnectionIntent] { + readRows().intents } - func save(_ grants: [AppConnectGrant]) { + func save(_ intents: [AppConnect.ConnectionIntent]) { guard let storageKey else { return } let stored = readRows() // A value that is not a list of rows is not this build's to replace: // nothing is written until it is gone. guard !stored.isNotRowList else { - Self.logger.error("AppConnectResponseStore: stored value is not a JSON array; grants not saved") + Self.logger.error("AppConnectIntentStore: stored value is not a JSON array; intents not saved") return } - // Rows this build cannot read are written back untouched: each one is - // the only record of a response on Platform, and dropping it would - // leave that response impossible to find. + // Rows this build cannot read are written back untouched: each may + // name keys that are still to land. let unreadable = stored.unreadable - guard !grants.isEmpty || !unreadable.isEmpty else { + guard !intents.isEmpty || !unreadable.isEmpty else { defaults.removeObject(forKey: storageKey) return } do { - let encoded = try grants.map { try JSONSerialization.jsonObject(with: encoder.encode($0)) } + let encoded = try intents.map { try JSONSerialization.jsonObject(with: encoder.encode($0)) } defaults.set( try JSONSerialization.data(withJSONObject: encoded + unreadable), forKey: storageKey) } catch { Self.logger.error( - "AppConnectResponseStore: failed to encode grants: \(error.localizedDescription, privacy: .public)") + "AppConnectIntentStore: failed to encode intents: \(error.localizedDescription, privacy: .public)") } } /// Decodes row by row, like `UserDefaultsDashConnectStore`, so one /// unreadable row costs one record instead of all of them. - private func readRows() -> (grants: [AppConnectGrant], unreadable: [Any], isNotRowList: Bool) { + private func readRows() -> (intents: [AppConnect.ConnectionIntent], unreadable: [Any], isNotRowList: Bool) { guard let storageKey, let stored = defaults.object(forKey: storageKey) else { return ([], [], false) } - // A value of another kind is as much not this build's to replace as - // data that is not a list. guard let data = stored as? Data, let rows = (try? JSONSerialization.jsonObject(with: data)) as? [Any] else { - Self.logger.error("AppConnectResponseStore: stored value is not a JSON array; left in place") + Self.logger.error("AppConnectIntentStore: stored value is not a JSON array; left in place") return ([], [], true) } - var grants: [AppConnectGrant] = [] + var intents: [AppConnect.ConnectionIntent] = [] var unreadable: [Any] = [] for row in rows { if JSONSerialization.isValidJSONObject(row), let rowData = try? JSONSerialization.data(withJSONObject: row), - let grant = try? decoder.decode(AppConnectGrant.self, from: rowData) { - grants.append(grant) + let intent = try? decoder.decode(AppConnect.ConnectionIntent.self, from: rowData) { + intents.append(intent) } else { unreadable.append(row) } } if !unreadable.isEmpty { Self.logger.warning( - "AppConnectResponseStore: \(unreadable.count, privacy: .public) stored grant(s) could not be read; kept as stored") + "AppConnectIntentStore: \(unreadable.count, privacy: .public) stored intent(s) could not be read; kept as stored") } - return (grants, unreadable, false) + return (intents, unreadable, false) } } diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift new file mode 100644 index 0000000000..cebc9c7df6 --- /dev/null +++ b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift @@ -0,0 +1,483 @@ +import CryptoKit +import Foundation +import SwiftDashSDK + +/// App Connect as one projection. The wallet stores only what Platform cannot +/// tell it: the intents, which name the keys an approval submits. Every +/// connection, its status and its expiry are computed from one read of the +/// identity and those intents; nothing computed is stored. +/// +/// Platform takes an identity update whole or not at all, and refuses one +/// that adds a key id the identity already holds. So an intent's keys either +/// all appear as submitted, or one of their ids is held by another key and the +/// update can never land. Nothing else settles an intent: a key that is absent +/// may still arrive, whatever the revision or the time. +extension AppConnect { + // MARK: Stored + + /// One key an intent submits, exactly as it is submitted. + struct IntendedKey: Codable, Equatable { + let id: UInt32 + let purpose: KeyPurpose + let securityLevel: SecurityLevel + let keyType: KeyType + let data: Data + let readOnly: Bool + let bound: StoredBound? + let totalBudget: UInt64? + /// Block time in milliseconds. + let expiresAt: UInt64? + + var isAuthentication: Bool { purpose == .authentication } + } + + /// What the wallet writes before it submits an identity update for an + /// app, and the only App Connect state it keeps. It is never removed + /// automatically: an intent whose keys are all off, or whose update can + /// never land, stays as the connection's history. Its rows are decoded + /// one by one and a row a build cannot read blocks approvals on its + /// identity, so a field added later has to be optional. + struct ConnectionIntent: Codable, Equatable, Identifiable { + let id: UUID + let identityId: Data + let appId: Data + /// The app's name and website as the approval sheet showed them. + let appLabel: String + let appUrl: String + /// `hash160(appEphPub)` of the request. + let requestHash: Data + let connectionId: Data? + /// The keys the update adds, auth and encryption. + let keys: [IntendedKey] + /// The identity's encryption keys the response carries without adding + /// them, in slot order. + let sentEncryptionKeyIds: [UInt32] + /// The ids of earlier auth keys the same update turns off. + let disables: [UInt32] + /// The response, sealed before the submit, so a retry publishes the + /// same values and a disconnect deletes them by those values. + let response: ResponseValues + /// Set once the response is known to be on Platform. + var responseDocumentId: Data? + /// Set once the response is known to be gone from Platform, or never + /// to have got there. + var responseRemoved: Bool + let createdAt: Date + /// When the intent was done with: the user disconnected the app, or a + /// later approval on the same connection replaced it. + var closedAt: Date? + + var authKeys: [IntendedKey] { keys.filter(\.isAuthentication) } + } + + // MARK: Read + + /// One key of the identity as Platform shows it. Bounds come from the + /// wallet's key store, which may not know a key yet: `bound` is nil then, + /// and `boundKnown` false. + struct PlatformKey: Equatable { + let id: UInt32 + let purpose: KeyPurpose + let securityLevel: SecurityLevel + let keyType: KeyType + let data: Data + let readOnly: Bool + let bound: StoredBound? + let boundKnown: Bool + let totalBudget: UInt64? + /// Block time in milliseconds. + let expiresAt: UInt64? + let disabledAt: UInt64? + } + + /// A key as the SDK fetched it, with its bound from the wallet's key + /// store (`binding`, nil when the store does not hold the key). + static func platformKey(_ key: ManagedIdentity.IdentityPublicKeyInfo, binding: KeyBinding?) -> PlatformKey { + let known = binding.map { $0.data == key.data && !$0.hasUnreadableBound } ?? false + return PlatformKey( + id: UInt32(bitPattern: key.keyId), purpose: key.purpose, securityLevel: key.securityLevel, + keyType: key.keyType, data: key.data, readOnly: key.readOnly, + bound: known ? binding?.bound : nil, boundKnown: known, + // Protocol timestamps are unsigned; the SDK hands them over in an + // Int64 bit for bit. + totalBudget: key.totalBudget, expiresAt: key.expiresAt.map { UInt64(bitPattern: $0) }, + disabledAt: key.disabledAt.map { UInt64(bitPattern: $0) }) + } + + /// One read of an identity. + struct IdentitySnapshot: Equatable { + let identityId: Data + let revision: UInt64 + let keys: [PlatformKey] + /// Platform's block time in milliseconds, proved with the read; nil + /// when the read carries none. Without it no key is judged expired. + let platformTime: UInt64? + + /// Whether this read may replace `newest`. A revision only grows, so + /// a read below one already seen comes from a node that is behind. + func mayReplace(_ newest: IdentitySnapshot?) -> Bool { + guard let newest, newest.identityId == identityId else { return true } + return revision >= newest.revision + } + } + + // MARK: One key against the identity + + enum KeyPresence: Equatable { + /// No key under the id: the update may still land. + case missing + /// Another key holds the id: the update can never land. + case conflicting + case live + case expired + case disabled + } + + /// The same key: id, type, purpose, level, payload and access. Limits + /// are left out, since an authorized limits update changes them, and so + /// is a bound the store does not know yet. + static func isSameKey(_ actual: PlatformKey, as intended: IntendedKey) -> Bool { + actual.id == intended.id && actual.keyType == intended.keyType && actual.purpose == intended.purpose + && actual.securityLevel == intended.securityLevel && actual.data == intended.data + && actual.readOnly == intended.readOnly + && (!actual.boundKnown || actual.bound == intended.bound) + } + + static func isLive(_ key: PlatformKey, at platformTime: UInt64?) -> Bool { + guard key.disabledAt == nil else { return false } + guard let expiresAt = key.expiresAt, let platformTime else { return true } + return expiresAt > platformTime + } + + static func presence(of intended: IntendedKey, in snapshot: IdentitySnapshot) -> KeyPresence { + guard let actual = snapshot.keys.first(where: { $0.id == intended.id }) else { return .missing } + guard isSameKey(actual, as: intended) else { return .conflicting } + if actual.disabledAt != nil { return .disabled } + return isLive(actual, at: snapshot.platformTime) ? .live : .expired + } + + // MARK: One intent + + enum IntentStatus: Equatable { + /// An auth key is live; `expiresAt` is the earliest expiry among them. + case active(expiresAt: UInt64?) + /// No auth key is there yet and none is taken: the update may land. + case confirming + /// Every auth key is there and none is live; some expired. + case expired + /// Every auth key is off. + case disconnected + /// Another key holds one of its ids: the update never landed and + /// never will. + case neverLanded + } + + static func status(of intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> IntentStatus { + // One key of the update held by another, encryption keys included, + // and the whole update never lands. + if intent.keys.contains(where: { presence(of: $0, in: snapshot) == .conflicting }) { return .neverLanded } + let auth = intent.authKeys.map { ($0, presence(of: $0, in: snapshot)) } + let live = auth.filter { $0.1 == .live } + if !live.isEmpty { + let expiries = live.compactMap { key, _ in + snapshot.keys.first { $0.id == key.id }?.expiresAt + } + return .active(expiresAt: expiries.min()) + } + if auth.contains(where: { $0.1 == .missing }) { return .confirming } + if auth.contains(where: { $0.1 == .expired }) { return .expired } + return .disconnected + } + + // MARK: The connections + + struct ProjectedConnection: Equatable, Identifiable { + let appId: Data + let status: IntentStatus + /// The app's intents, newest first. + let intents: [ConnectionIntent] + /// Live auth keys bound to one of the app's contracts that no intent + /// names: granted on another device, or before a restore. Keyed by + /// identity. + let unrecordedKeyIds: [Data: [UInt32]] + + var id: Data { appId } + } + + struct Projection: Equatable { + let connections: [ProjectedConnection] + /// Live keys bound to the DashPay profile that no intent names, by + /// identity. They are not any one app's. + let unrecordedProfileKeyIds: [Data: [UInt32]] + /// Live App Connect keys no intent names whose bound the wallet's + /// key store does not hold yet, by identity. + var unplacedKeyIds: [Data: [UInt32]] = [:] + } + + /// One app's status from those of its intents: the one the user can act + /// on first. Live keys come first, then an update that may still land. + private static func rank(_ status: IntentStatus) -> Int { + switch status { + case .active: return 0 + case .confirming: return 1 + case .expired: return 2 + case .disconnected: return 3 + case .neverLanded: return 4 + } + } + + /// The contract a bound is on. + static func contractId(of bound: StoredBound) -> Data { + switch bound { + case .singleContract(let id), .contractGroup(let id): return id + case .documentType(let contractId, _): return contractId + } + } + + /// A live key in a shape App Connect registers for an app: HASH160 + /// authentication at HIGH or CRITICAL, with an expiry (every key an + /// approval gives has one). Anything else on the identity (the wallet's + /// own keys, keys of other tools) is never counted as an app's. + static func isAppConnectAuthKey(_ key: PlatformKey) -> Bool { + key.purpose == .authentication && key.keyType == .ecdsaHash160 + && (key.securityLevel == .high || key.securityLevel == .critical) + && key.expiresAt != nil && key.disabledAt == nil + } + + static func isProfileBound(_ bound: StoredBound) -> Bool { + guard case .documentType(let contractId, let name) = bound else { return false } + return contractId.toBase58String() == dashPayContractId && name == "profile" + } + + /// Every connection the wallet can show for these identities. An app + /// with no intent appears when one of its contracts carries a live auth + /// key no intent names. Keys whose payload is in `protected` are never + /// counted as unrecorded: the two-QR login derives its keys again every + /// time, and Platform never re-adds one that was turned off. + static func project( + _ snapshots: [IdentitySnapshot], intents: [ConnectionIntent], protected: Set = [] + ) -> Projection { + let byIdentity = Dictionary(snapshots.map { ($0.identityId, $0) }, uniquingKeysWith: { a, b in + b.revision >= a.revision ? b : a + }) + // An id an intent names is that intent's only while the key under + // it is the one the intent submits: one held by another key is that + // key's. + let named = Set(intents.flatMap { intent in + intent.keys.filter { key in + byIdentity[intent.identityId].map { presence(of: key, in: $0) != .conflicting } ?? true + }.map { IdentityKey(intent.identityId, $0.id) } + }) + + // The contracts each app's intents bind keys to. + var contractsOfApp: [Data: Set] = [:] + for intent in intents { + contractsOfApp[intent.appId, default: [intent.appId]] + .formUnion(intent.authKeys.compactMap(\.bound).filter { !isProfileBound($0) }.map(contractId(of:))) + } + + var unrecorded: [Data: [Data: [UInt32]]] = [:] + var profile: [Data: [UInt32]] = [:] + var unplaced: [Data: [UInt32]] = [:] + for snapshot in snapshots { + for key in snapshot.keys where isAppConnectAuthKey(key) + && !named.contains(IdentityKey(snapshot.identityId, key.id)) && !protected.contains(key.data) { + guard let bound = key.bound else { + // The store does not hold the key's bound yet: whose it + // is cannot be told, and it is reported as such. + if !key.boundKnown { unplaced[snapshot.identityId, default: []].append(key.id) } + continue + } + if isProfileBound(bound) { + profile[snapshot.identityId, default: []].append(key.id) + continue + } + // A key bound to a system contract is no app's; one bound to + // a contract the intents of several apps bind cannot be + // told to be any one of theirs. Neither is shown or offered. + let contract = contractId(of: bound) + guard !systemContractIds.contains(contract.toBase58String()) else { continue } + let apps = contractsOfApp.filter { $0.value.contains(contract) }.map(\.key) + guard apps.count <= 1 else { continue } + let app = apps.first ?? contract + unrecorded[app, default: [:]][snapshot.identityId, default: []].append(key.id) + } + } + + let apps = Set(intents.map(\.appId)).union(unrecorded.keys) + let connections: [ProjectedConnection] = apps.compactMap { app in + let own = intents.filter { $0.appId == app }.sorted { $0.createdAt > $1.createdAt } + var statuses = own.compactMap { intent in byIdentity[intent.identityId].map { status(of: intent, in: $0) } } + let others = unrecorded[app] ?? [:] + if !others.isEmpty { statuses.append(.active(expiresAt: nil)) } + // An app this read says nothing about (its intents are on + // identities not read) has no connection here. + guard let best = statuses.min(by: { rank($0) < rank($1) }) else { return nil } + return ProjectedConnection(appId: app, status: best, intents: own, unrecordedKeyIds: others) + } + return Projection( + connections: connections.sorted { $0.appId.lexicographicallyPrecedes($1.appId) }, + unrecordedProfileKeyIds: profile, + unplacedKeyIds: unplaced) + } + + private struct IdentityKey: Hashable { + let identityId: Data + let keyId: UInt32 + init(_ identityId: Data, _ keyId: UInt32) { + self.identityId = identityId + self.keyId = keyId + } + } + + // MARK: Plans + + /// The ids for `count` new keys that no key on the identity and no + /// intent on it holds, so a key that may still land is never given to + /// another: above the highest while they fit, then the lowest free ones + /// (a `dash-st:` registration picks its own ids). Nil when the ids run + /// out. + static func newKeyIds(count: Int, snapshot: IdentitySnapshot, intents: [ConnectionIntent]) -> [UInt32]? { + let taken = Set(snapshot.keys.map(\.id) + + intents.filter { $0.identityId == snapshot.identityId }.flatMap { $0.keys.map(\.id) }) + let first = taken.max().map { UInt64($0) + 1 } ?? 0 + if first + UInt64(count) <= UInt64(UInt32.max) + 1 { + return (0 ..< count).map { UInt32(first + UInt64($0)) } + } + var ids: [UInt32] = [] + var id: UInt32 = 0 + // The identity holds far fewer keys than there are ids. + while ids.count < count { + if !taken.contains(id) { ids.append(id) } + guard ids.count < count else { break } + guard id < .max else { return nil } + id += 1 + } + return ids + } + + /// Whether a retry of a request may carry on with its intent: its keys + /// are live or may still land, and the user has not disconnected it. + static func mayResume(_ intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> Bool { + guard intent.closedAt == nil else { return false } + switch status(of: intent, in: snapshot) { + case .active, .confirming: return true + case .expired, .disconnected, .neverLanded: return false + } + } + + /// Whether the app's intents gave it a DashPay profile key. Only then are + /// the profile keys no intent names offered with its disconnect. + static func usesProfileAccess(_ intents: [ConnectionIntent], appId: Data) -> Bool { + intents.contains { $0.appId == appId && $0.authKeys.contains { $0.bound.map(isProfileBound) ?? false } } + } + + /// What a disconnect of one app submits on one identity. + struct DisconnectPlan: Equatable { + /// The app's auth keys still enabled: live or expired. Platform still + /// lets an authorized limits update revive an expired one. + var disable: [UInt32] = [] + /// One missing auth key id per intent whose update may still land. A + /// key of the wallet's own under that id means the update never can. + var fence: [UInt32] = [] + /// Intents whose response may be on Platform. + var deleteResponses: [UUID] = [] + + var isEmpty: Bool { disable.isEmpty && fence.isEmpty && deleteResponses.isEmpty } + } + + /// `includeUnrecorded`: also turn off the app's live keys no intent + /// names; the user confirms that separately. + static func disconnectPlan( + appId: Data, snapshot: IdentitySnapshot, intents: [ConnectionIntent], includeUnrecorded: Bool, + protected: Set = [] + ) -> DisconnectPlan { + var plan = DisconnectPlan() + let own = intents.filter { $0.appId == appId && $0.identityId == snapshot.identityId } + for intent in own { + let auth = intent.authKeys.map { ($0, presence(of: $0, in: snapshot)) } + plan.disable += auth.filter { [.live, .expired].contains($0.1) }.map(\.0.id) + if status(of: intent, in: snapshot) != .neverLanded, + let missing = auth.first(where: { $0.1 == .missing })?.0.id { + plan.fence.append(missing) + } + if !intent.responseRemoved { plan.deleteResponses.append(intent.id) } + } + if includeUnrecorded { + let projection = project([snapshot], intents: intents, protected: protected) + let others = projection.connections.first { $0.appId == appId }?.unrecordedKeyIds[snapshot.identityId] ?? [] + plan.disable += others + } + plan.disable = Array(Set(plan.disable)).sorted() + plan.fence = Array(Set(plan.fence)).sorted() + return plan + } + + // MARK: Submitting + + /// The most keys one identity update may add (Platform consensus). + static let maxKeysAddedPerUpdate = 6 + + /// The key `intended` is submitted as. + static func identityPubkey(of intended: IntendedKey) -> ManagedPlatformWallet.IdentityPubkey { + ManagedPlatformWallet.IdentityPubkey( + keyId: intended.id, + keyType: intended.keyType, + purpose: intended.purpose, + securityLevel: intended.securityLevel, + pubkeyBytes: intended.data, + readOnly: intended.readOnly, + contractBounds: intended.bound.map(contractBounds(of:)), + totalBudget: intended.totalBudget, + expiresAt: intended.expiresAt) + } + + static func contractBounds(of bound: StoredBound) -> ManagedPlatformWallet.ContractBounds { + switch bound { + case .singleContract(let id): return .singleContract(id: id) + case .documentType(let id, let name): return .singleContractDocumentType(id: id, documentTypeName: name) + case .contractGroup(let id): return .contractGroup(id: id) + } + } + + /// Whether a retry of a request may submit `intent` again under what + /// the user approved now: the same keys, each with the level, bound and + /// budget the plan grants, and an expiry no later than the plan's. + static func isWithinPlan(_ intent: ConnectionIntent, _ plan: GrantPlan) -> Bool { + let auth = intent.authKeys + guard intent.appId == plan.appId, auth.count == plan.auth.count else { return false } + return zip(auth, plan.auth).allSatisfy { key, grant in + key.securityLevel == grant.securityLevel && key.bound == grant.storedBound + && key.totalBudget == grant.totalBudget + && (key.expiresAt ?? .max) <= grant.expiresAt + } + } + + // MARK: Fence + + /// The leaf a fence key is derived at: one per identity and key id, so + /// the same fence is built on every try. + static func fenceKeyLeaf(identityId: Data, keyId: UInt32) -> Data { + var input = Data("dashconnect-fence".utf8) + identityId + withUnsafeBytes(of: keyId.bigEndian) { input.append(contentsOf: $0) } + return Data(SHA256.hash(data: Data(SHA256.hash(data: input)))) + } + + /// A key of the wallet's own under `keyId`, which an intent may still + /// land on. Platform refuses an update that adds an id the identity + /// holds, so once this key is there that intent's update never lands. + /// It can spend one credit and has no expiry: an expiry would have to be + /// ahead of Platform's block time, which the wallet does not read. + static func fenceKey(keyId: UInt32, publicKeyHash160: Data) -> ManagedPlatformWallet.IdentityPubkey { + ManagedPlatformWallet.IdentityPubkey( + keyId: keyId, + keyType: .ecdsaHash160, + purpose: .authentication, + securityLevel: .high, + pubkeyBytes: publicKeyHash160, + readOnly: false, + contractBounds: nil, + totalBudget: 1, + expiresAt: nil) + } +} diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 5b6db6f56f..9410b5d004 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -756,200 +756,6 @@ extension AppConnect { return mayBeBehind ? .notThisWalletsIfSettled : .notThisWallets } - /// Wallet rule 8: the live auth keys of this wallet's earlier grants to - /// the app on the same connection, which the new grant replaces in the - /// same identity update. None without a connection id. `keeping` holds - /// the keys the new grant sends again (a retry of the same request). - static func supersededKeyIds( - grants: [AppConnectGrant], - identityId: String, - appId: String, - connectionId: String?, - keeping: Set, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] - ) -> [UInt32] { - guard let connectionId else { return [] } - let previous = Set(grants - .filter { $0.identityId == identityId && $0.appContractId == appId && $0.connectionId == connectionId } - .flatMap(\.keyIds)) - .subtracting(keeping) - return currentIdentityPublicKeys - .filter { - previous.contains(UInt32(bitPattern: $0.keyId)) && isLiveGrantedKey($0) - } - .map { UInt32(bitPattern: $0.keyId) } - .sorted() - } - - /// The contracts and contract groups that v2-shaped keys no record names - /// are bound to (`unrecordedV2Keys`), other than `appContractId`, the - /// allowlisted foreign document types and Platform's system contracts - /// (never a binding's target): a disconnect looks each one up to tell - /// whether the app's owner owns it. - static func unrecordedV2KeyBoundIds( - appContractId: Data, - keys: [(keyId: UInt32, bound: StoredBound)] - ) -> (contracts: Set, groups: Set) { - var contracts: Set = [] - var groups: Set = [] - for (_, bound) in keys { - switch bound { - case .singleContract(let id): - if id != appContractId, !systemContractIds.contains(id.toBase58String()) { contracts.insert(id) } - case .documentType(let id, let name): - if id != appContractId, !systemContractIds.contains(id.toBase58String()), - !allowedForeignDocumentTypes.contains("\(id.toBase58String())/\(name)") { - contracts.insert(id) - } - case .contractGroup(let id): - groups.insert(id) - } - } - return (contracts, groups) - } - - /// The ids of the keys in `keys` that belong to the app's v2 grants: - /// bound to a contract the app's owner owns (`appContractIds`, the app's - /// own among them), a document type on one, or a contract group that - /// owner owns (`appGroupIds`). A key bound to a foreign document type v2 - /// allows (DashPay `profile`) is not among them: that bound names no - /// app, so with no record it may be any app's, and a disconnect takes it - /// through `unattributedProfileKeyIds` instead. - static func appsV2KeyIds( - appContractIds: Set, - appGroupIds: Set, - keys: [(keyId: UInt32, bound: StoredBound)] - ) -> [UInt32] { - keys.filter { _, bound in - switch bound { - case .singleContract(let id): return appContractIds.contains(id) - case .documentType(let id, _): return appContractIds.contains(id) - case .contractGroup(let id): return appGroupIds.contains(id) - } - } - .map(\.keyId) - .sorted() - } - - /// The ids of the keys in `keys` bound to a foreign document type v2 - /// allows (DashPay `profile`). Every app can be given such a key and the - /// bound does not say which one was, so with no record a disconnect on - /// the identity that ends there turns these off with the app's keys, - /// for every app that holds one (`sharedProfileKeyIdsToDisable`). - static func unattributedProfileKeyIds(keys: [(keyId: UInt32, bound: StoredBound)]) -> [UInt32] { - keys.filter { _, bound in - guard case .documentType(let id, let name) = bound else { return false } - return allowedForeignDocumentTypes.contains("\(id.toBase58String())/\(name)") - } - .map(\.keyId) - .sorted() - } - - /// Whether a v2 key with this expiry may still work at `nowMilliseconds`. - /// A key that expired stays live on Platform but can no longer sign. - /// Platform goes by block time, so a device clock up to `clockTolerance` - /// fast does not count a working key as expired. Every v2 auth key has an - /// expiry; a key with none is not one, and counts as false here. - /// `expiresAt` carries the protocol's unsigned timestamp in an `Int64`'s - /// bits, so it is compared as unsigned: an expiry past `Int64.max` is far - /// in the future, not in the past. - static func isUnexpired(_ expiresAt: Int64?, nowMilliseconds: Int64) -> Bool { - guard let expiresAt else { return false } - let earliest = max(0, nowMilliseconds - Int64(clockTolerance * 1000)) - return UInt64(bitPattern: expiresAt) > UInt64(earliest) - } - - /// The unattributed profile keys the wallet's store shows as live and - /// not yet expired. - static func storedSharedProfileKeyIds( - recordedKeyIds: Set, - bindings: [KeyBinding], - nowMilliseconds: Int64 - ) -> [UInt32] { - let unexpired = Set(bindings.filter { isUnexpired($0.expiresAt, nowMilliseconds: nowMilliseconds) }.map(\.keyId)) - return unattributedProfileKeyIds(keys: unrecordedV2Keys(recordedKeyIds: recordedKeyIds, bindings: bindings)) - .filter(unexpired.contains) - } - - /// Whether the store shows a live, unexpired v2-shaped key that no record - /// names and whose bound this build cannot read: it may be an - /// unattributed profile key, so the set a disconnect turns off cannot be - /// trusted. - static func hasUnplacedStoredKey(recordedKeyIds: Set, bindings: [KeyBinding], nowMilliseconds: Int64) -> Bool { - bindings.contains { - $0.isV2AuthKeyShaped && $0.hasUnreadableBound && !$0.isDisabled - && isUnexpired($0.expiresAt, nowMilliseconds: nowMilliseconds) && !recordedKeyIds.contains($0.keyId) - } - } - - /// The unattributed profile keys a disconnect disables, from a fresh view - /// of the identity: live, not yet expired, bound to an allowlisted - /// foreign document type, and not in `recordedKeyIds` (the keys confirmed - /// records name). - /// `nil` when the view cannot be trusted: a live v2-shaped key no record - /// names, in the view or in the store, has no readable stored bound, so - /// it may be one of them; or the store holds one of them that the view - /// lacks, so the node is behind. - static func sharedProfileKeyIdsToDisable( - recordedKeyIds: Set, - bindings: [KeyBinding], - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], - nowMilliseconds: Int64 - ) -> [UInt32]? { - let hasUnplacedKey = currentIdentityPublicKeys.contains { key in - let keyId = UInt32(bitPattern: key.keyId) - return isLiveAppConnectAuthKey(key) && isUnexpired(key.expiresAt, nowMilliseconds: nowMilliseconds) - && !recordedKeyIds.contains(keyId) - && !bindings.contains { $0.keyId == keyId && $0.data == key.data && !$0.hasUnreadableBound } - } - let fetchedKeyIds = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) - // The store's own copy counts too: a fetched view that lacks such a - // key does not show it is off. One the view shows off is. - let offInView = Set(currentIdentityPublicKeys.filter { $0.disabledAt != nil }.map { UInt32(bitPattern: $0.keyId) }) - guard !hasUnplacedKey, - !hasUnplacedStoredKey( - recordedKeyIds: recordedKeyIds.union(offInView), bindings: bindings, nowMilliseconds: nowMilliseconds), - storedSharedProfileKeyIds( - recordedKeyIds: recordedKeyIds, bindings: bindings, nowMilliseconds: nowMilliseconds - ).allSatisfy(fetchedKeyIds.contains) else { return nil } - let unexpired = Set(currentIdentityPublicKeys - .filter { isUnexpired($0.expiresAt, nowMilliseconds: nowMilliseconds) }.map { UInt32(bitPattern: $0.keyId) }) - return unattributedProfileKeyIds(keys: unrecordedV2Keys( - recordedKeyIds: recordedKeyIds, bindings: bindings, currentIdentityPublicKeys: currentIdentityPublicKeys)) - .filter(unexpired.contains) - } - - /// The live v2-shaped keys on the identity that no grant record of it - /// names, as a reinstall or a lost record leaves them: HASH160 - /// authentication keys at HIGH or CRITICAL with an expiry (every v2 - /// auth key has one) and a bound the store can read. - static func unrecordedV2Keys( - recordedKeyIds: Set, - bindings: [KeyBinding], - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] - ) -> [(keyId: UInt32, bound: StoredBound)] { - currentIdentityPublicKeys.compactMap { key in - let keyId = UInt32(bitPattern: key.keyId) - guard isLiveAppConnectAuthKey(key), key.expiresAt != nil, !recordedKeyIds.contains(keyId), - let stored = bindings.first(where: { $0.keyId == keyId && $0.data == key.data }), - !stored.hasUnreadableBound, let bound = stored.bound else { return nil } - return (keyId, bound) - } - } - - /// `unrecordedV2Keys` from the store alone, for an identity that is not - /// the active one: its keys as last loaded. - static func unrecordedV2Keys( - recordedKeyIds: Set, - bindings: [KeyBinding] - ) -> [(keyId: UInt32, bound: StoredBound)] { - bindings.compactMap { binding in - guard binding.isV2AuthKeyShaped, !binding.isDisabled, !binding.hasUnreadableBound, - !recordedKeyIds.contains(binding.keyId), let bound = binding.bound else { return nil } - return (binding.keyId, bound) - } - } - /// The stored form of a bound the wallet registers a key with. static func storedBound(of bounds: ManagedPlatformWallet.ContractBounds) -> StoredBound { switch bounds { @@ -959,62 +765,6 @@ extension AppConnect { } } - /// Whether `key`, found on the identity after an update reported a - /// failure, is the key the update added (`added`): the same id and - /// payload, live, and everything it was registered with — type, - /// purpose, level, read-only flag, limits, and the bound as the store - /// reads it - /// (`binding`). A key with the same payload but another bound came from - /// another request that repeated the ephemeral key, and is not taken. - static func isAddedKey( - _ key: ManagedIdentity.IdentityPublicKeyInfo, - added: ManagedPlatformWallet.IdentityPubkey, - binding: KeyBinding? - ) -> Bool { - guard UInt32(bitPattern: key.keyId) == added.keyId, key.data == added.pubkeyBytes, key.disabledAt == nil, - key.keyType == added.keyType, key.purpose == added.purpose, key.securityLevel == added.securityLevel, - key.readOnly == added.readOnly, - key.totalBudget == added.totalBudget, - key.expiresAt.map({ UInt64(max(0, $0)) }) == added.expiresAt else { return false } - guard let bounds = added.contractBounds else { return binding == nil || binding?.bound == nil } - guard let binding, binding.keyId == added.keyId, binding.data == key.data, !binding.hasUnreadableBound else { - return false - } - return binding.bound == storedBound(of: bounds) - } - - /// A live auth key a login could have granted: HASH160 and never MASTER, - /// so a damaged record cannot get the identity's own keys disabled. - static func isLiveGrantedKey(_ key: ManagedIdentity.IdentityPublicKeyInfo) -> Bool { - key.purpose == .authentication && key.keyType == .ecdsaHash160 - && key.securityLevel != .master && key.disabledAt == nil - } - - /// Whether a key already on the identity at this binding's derived - /// payload can be sent again for it: an earlier answer to the same - /// request (a retry, or an update that landed without confirming). It - /// still has to be live, bound as the binding asks (`binding`, the - /// store's record of the key; a key the store does not show, or shows - /// with another bound, is not sent), carry the level the plan grants, - /// and limits no wider than the plan's (`clockTolerance` covers a clock - /// moved back between two tries). The payload alone proves nothing: a - /// request that repeats another's ephemeral key derives the same one. - /// A grant recorded for this request, when there is one, must name - /// exactly the keys sent again; the caller checks that. - static func canResendAuthKey( - _ key: ManagedIdentity.IdentityPublicKeyInfo, - for grant: AuthGrant, - binding: KeyBinding?, - now: Date - ) -> Bool { - guard let binding, binding.keyId == UInt32(bitPattern: key.keyId), binding.data == key.data, - !binding.isDisabled, !binding.hasUnreadableBound, binding.bound == grant.storedBound else { return false } - guard isLiveGrantedKey(key), key.securityLevel == grant.securityLevel, - key.totalBudget == grant.totalBudget, - let expiresAt = key.expiresAt, expiresAt > Int64(milliseconds(now)) else { return false } - return UInt64(expiresAt) <= grant.expiresAt + UInt64(clockTolerance * 1000) - } - /// `callback` with `ac=` appended, keeping its query. static func callbackURL(_ callback: URL, status: CallbackStatus) -> URL? { guard var components = URLComponents(url: callback, resolvingAgainstBaseURL: false) else { return nil } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index d41d179d99..fa34f4cd5c 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -39,29 +39,34 @@ protocol DashConnectDataSource { /// transition could already have reached Platform — the caller must not /// offer a retry when it could have. func approveTokenPurchase(_ request: DashConnectTokenPurchaseRequest) async throws - /// Turns a connection off. For a one-QR connection this disables the key - /// the app was given on the identity and deletes the published response, - /// and throws when the key could not be disabled — the connection then - /// stays as it was. A disconnect that disables keys of the app's on the - /// active identity, and is not stopped by another identity holding the - /// app, also disables the live DashPay profile keys of that identity - /// that no grant record names: their bound does not say which app was - /// given them. When those cannot be told apart, none is disabled and the - /// app's own keys still are. The result says which. The connection also stays, and that is thrown, while - /// the app holds a key on another identity of the wallet. For a two-QR - /// connection with nothing else of the app's on the identity it only - /// changes the local status: that login derives the same key every time - /// and Platform never re-adds a disabled key, so disabling it would lock - /// the app out for good. A two-QR row whose app also holds a one-QR - /// grant there has that grant's keys disabled. Turning off a one-QR - /// connection that replaced a two-QR one does disable those keys too. + /// Turns a connection off. For an App Connect connection this turns off + /// every key the wallet's approvals of the app gave on the active + /// identity, puts a key of the wallet's own under each id an approval + /// may still land on so it never does, and deletes the published + /// responses; it throws when a key could not be shown off, and the + /// connection then stays. Keys no approval of this wallet names (the + /// app's from another device or from before a restore, DashPay profile + /// keys no app can be told to hold) are turned off only with + /// `includingUnrecorded`; the result says how many are left. The + /// connection also stays, and that is thrown, while an approval of the + /// app on another identity of the wallet is not done. For a two-QR + /// connection it only changes the local status: that login derives the + /// same key every time and Platform never re-adds a disabled key, so + /// disabling it would lock the app out for good. /// /// `scope` is the `DAppConnection.scope` of the row that was picked: /// both calls act only while it still names the wallet they would act /// on. @discardableResult - func disconnect(id: String, scope: String?) async throws -> DashConnectDisconnectResult + func disconnect(id: String, scope: String?, includingUnrecorded: Bool) async throws -> DashConnectDisconnectResult func remove(id: String, scope: String?) async + /// Puts the App Connect rows in step with the active identity's keys on + /// Platform. Best effort: a failed read leaves the rows as they were. + func refreshConnections() async +} + +extension DashConnectDataSource { + func refreshConnections() async {} } /// Why a token purchase failed, and — the part that decides what the UI may @@ -272,7 +277,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { } @discardableResult - func disconnect(id: String, scope: String?) async throws -> DashConnectDisconnectResult { + func disconnect(id: String, scope: String?, includingUnrecorded: Bool) async throws -> DashConnectDisconnectResult { let disconnectedAt = Date() persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 98627bce8f..b9c106a470 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -150,13 +150,14 @@ extension DashConnectTokenPurchaseRequest { /// the user locally turned the connection off from the wallet UI. /// /// `active` means the app's login keys are registered on the identity and the -/// wallet has already published the matching `loginKeyResponse`. For a one-QR -/// connection it means the app holds a session key on an identity of this -/// wallet that this wallet has not disabled: the row is made once the key is -/// seen on the identity, before its response is published, and stays -/// whether or not the publish is confirmed. +/// wallet has already published the matching `loginKeyResponse`. For an App +/// Connect connection it means an approval's keys are live on an identity of +/// this wallet, whether or not its response was published; `confirming` means +/// its identity update may still land. enum ConnectionStatus: String, Codable, CaseIterable { case approved + /// An App Connect approval whose identity update may still land. + case confirming case active init(from decoder: Decoder) throws { @@ -178,8 +179,8 @@ enum ConnectionStatus: String, Codable, CaseIterable { } /// Which login made a connection. It decides what turning it off means: -/// a one-QR connection has a session key on the identity to disable, a -/// two-QR connection does not (see `DashConnectDataSource.disconnect`). +/// an App Connect connection (`oneQR`) has keys on the identity to turn +/// off, a two-QR connection does not (see `DashConnectDataSource.disconnect`). enum DashConnectLoginKind: String, Codable { case twoQR case oneQR @@ -200,14 +201,19 @@ struct DAppConnection: Identifiable, Equatable, Hashable { var scope: String? = nil } -/// What a disconnect did with the active identity's DashPay profile keys -/// that no grant record names, besides turning off the app's own keys. +/// What a disconnect left on the active identity besides the app's keys it +/// turned off. struct DashConnectDisconnectResult: Equatable { - /// How many of them it turned off. - var profileKeysTurnedOff = 0 - /// They could not be told apart, so none was turned off; the app's own - /// keys were. - var profileKeysUnchecked = false + /// How many of the app's keys it turned off. + var keysTurnedOff = 0 + /// Live keys no approval of this wallet names that a disconnect turns + /// off only when the user asks: keys bound to the app's contracts, given + /// on another device or before a restore, and DashPay profile keys no + /// app can be told to hold. + var unrecordedKeysLeft = 0 + /// Live App Connect keys whose app the wallet could not tell yet: its key + /// store does not hold their bound. None of them was turned off. + var keysNotChecked = 0 } /// A pending request derived from a scanned login QR code. @@ -277,15 +283,3 @@ extension ConnectionRequest { walletIdentityId == identityId && self.scope == scope } } - -extension AppConnect.SessionKeyTerms { - /// The budget as DASH at full credit precision, e.g. "0.05 DASH". - var budgetText: String { - PlatformCreditsFormatter.dashString(budgetCredits) - } - - /// The lifetime in whole days. - var lifetimeDays: Int { - Int(lifetime / (24 * 60 * 60)) - } -} diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift index 0bd2b0cc1a..abcb457cdb 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift @@ -192,7 +192,7 @@ final class UserDefaultsDashConnectStore: DashConnectStore { let status: ConnectionStatus let updatedAt: Date /// Absent for a two-QR connection, which is every row written before - /// the one-QR login existed. + /// App Connect existed. let loginKind: DashConnectLoginKind? } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 8edeeaa646..0f0378b8f8 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -84,17 +84,18 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case loginUnresolved case grantNotRecorded case noFreeKeyId - case otherIdentitiesNotChecked - case registrationPending case appConnectEncryptionKeyChanged case appConnectKeysOutOfDate case appConnectKeysUnreadable - case registrationPendingOnAnotherIdentity case walletChanged case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured case loginContractUnavailable + case tooManyKeysToReplace + case tooManyKeysToAdd + case intentsUnreadable + case identityReadBehind var errorDescription: String? { switch self { @@ -152,19 +153,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { comment: "DashConnect") case .grantNotRecorded: return NSLocalizedString( - "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key.", - comment: "DashConnect") - case .otherIdentitiesNotChecked: - return NSLocalizedString( - "The app's keys on this identity are off, but this wallet could not check its other identities. Try again.", - comment: "DashConnect") - case .registrationPending: - return NSLocalizedString( - "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again.", - comment: "DashConnect") - case .registrationPendingOnAnotherIdentity: - return NSLocalizedString( - "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it.", + "This wallet could not save the approval, so nothing was sent. Try again.", comment: "DashConnect") case .appConnectKeysOutOfDate: return NSLocalizedString( @@ -206,6 +195,22 @@ enum DashConnectPlatformError: LocalizedError, Equatable { comment: "DashConnect") case .loginContractUnavailable: return "The DashConnect login contract is not available on this network." + case .identityReadBehind: + return NSLocalizedString( + "The network answered with an older copy of your identity. Try again in a moment.", + comment: "DashConnect") + case .intentsUnreadable: + return NSLocalizedString( + "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again.", + comment: "DashConnect") + case .tooManyKeysToAdd: + return NSLocalizedString( + "This app asks for more keys than one approval can add. Ask the app to ask for fewer.", + comment: "DashConnect App Connect v2") + case .tooManyKeysToReplace: + return NSLocalizedString( + "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again.", + comment: "DashConnect App Connect v2") } } @@ -418,14 +423,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { var stores: Stores } - /// The connection rows and grant records of one wallet. A context carries + /// The connection rows and App Connect intents of one wallet. A context carries /// the pair fixed to its own wallet: the stores follow the active wallet, /// and an operation that waits on the network or a PIN prompt must still /// write to the wallet whose identity it changed. private struct Stores { let walletIdHex: String let connections: any DashConnectStore - let grants: any AppConnectResponseStore + let intents: any AppConnectIntentStore /// Where the network is reached, as configured when the pair was /// made; `nil` on a network with one fixed set of nodes. let endpoint: String? @@ -485,7 +490,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private let supportedNetwork: DashConnectNetwork private let store: any DashConnectStore - private let responseStore: any AppConnectResponseStore + private let intentStore: any AppConnectIntentStore + /// The newest read of each identity this process has seen; a read + /// behind it is not used (`AppConnect.IdentitySnapshot.mayReplace`). + private static let newestSnapshots = OSAllocatedUnfairLock<[Data: AppConnect.IdentitySnapshot]>(initialState: [:]) private let subject: CurrentValueSubject<[DAppConnection], Never> private let shownRows: ShownRows private let operationGate: DashConnectOperationGate @@ -528,7 +536,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { init( supportedNetwork: DashConnectNetwork = PlatformDashConnectDataSource.currentEnvironmentNetwork(), store: (any DashConnectStore)? = nil, - responseStore: (any AppConnectResponseStore)? = nil, + intentStore: (any AppConnectIntentStore)? = nil, activeWalletIdHex: @escaping () -> String? = { WalletEnvironment.activeWalletIdHex as String? }, authorizer: DWIdentityAuthorizer = DWIdentityAuthorizer(), stateTransitionParser: any DashConnectStateTransitionParsing = PlatformWalletDashConnectStateTransitionParser(), @@ -543,7 +551,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { "DashConnect Platform publish runs on testnet and devnet only.") self.supportedNetwork = supportedNetwork self.store = store ?? UserDefaultsDashConnectStore(network: supportedNetwork) - self.responseStore = responseStore ?? UserDefaultsAppConnectResponseStore(network: supportedNetwork) + self.intentStore = intentStore ?? UserDefaultsAppConnectIntentStore(network: supportedNetwork) self.authorizer = authorizer self.stateTransitionParser = stateTransitionParser self.now = now @@ -555,7 +563,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ?? (supportedNetwork == .devnet ? { DevnetConfiguration.quorumURL } : { nil }) self.networkEndpoint = networkEndpoint let active = Self.pinnedStores( - walletIdHex: activeWalletIdHex(), store: self.store, responseStore: self.responseStore, + walletIdHex: activeWalletIdHex(), store: self.store, intentStore: self.intentStore, endpoint: networkEndpoint()) self.shownRows = ShownRows(scope: active?.scope) self.subject = CurrentValueSubject(active.map { $0.published($0.connections.load()) } ?? []) @@ -735,49 +743,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - /// The ids among `contractIds` and `groupIds` of the contracts and the - /// contract groups whose owner is the owner of `contractId`, which is - /// itself among the contracts returned. One the network proves absent - /// is not; any other failure to read throws, and so does a contract - /// with no readable owner: nothing can then be said of what it owns. - /// TODO(app-connect-v2-owner-lookup): a contract this build can never - /// read (a format newer than its SDK) fails the same way on every try, - /// so a disconnect that has to look it up keeps the row until the app - /// is updated. - private static func ownedByOwner( - of contractId: Data, - contractIds: Set, - groupIds: Set, - sdk: SDK - ) async throws -> (contracts: Set, groups: Set) { - guard !contractIds.isEmpty || !groupIds.isEmpty else { return ([contractId], []) } - func ownerId(_ object: [String: Any]) -> Data? { - (object["ownerId"] as? String ?? object["$ownerId"] as? String).flatMap(decodeIdentifier) - } - guard let appOwnerId = ownerId(try await sdk.dataContractGetOffMain(id: contractId.toBase58String())) else { - throw DashConnectPlatformError.loginContractUnavailable - } - var contracts: Set = [contractId] - for id in contractIds { - do { - if ownerId(try await sdk.dataContractGetOffMain(id: id.toBase58String())) == appOwnerId { contracts.insert(id) } - } catch SDKError.notFound { - continue - } - } - var groups: Set = [] - for id in groupIds { - do { - if ownerId(try await sdk.getContractGroupInfo(contractGroupId: id.toBase58String())) == appOwnerId { - groups.insert(id) - } - } catch SDKError.notFound { - continue - } - } - return (contracts, groups) - } - /// Reads the owners wallet rule 3 compares from Platform. A group the /// network proves absent counts as not the app's; any other failure to /// read throws, so the sheet offers to try again. The reads run off the @@ -900,9 +865,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") throw DashConnectPlatformError.loginUnresolved } - // The sheet showed the login `makeConnectionRequest` resolved, with - // its terms for the one-QR login. If the network now gets the other - // one, what was approved is not what would run. + // The sheet showed the login `makeConnectionRequest` resolved. If the + // network now gets another one, what was approved is not what would + // run. let login = AppConnect.login(protocolVersion: protocolVersion) // A v2 request was approved with the plan the sheet showed. It has // to be the plan for this request, and the network has to still take @@ -940,10 +905,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: authorized; App Connect request v2") return try await approveAppConnectV2Login(appConnect, plan: plan, consent: consent, context: context) } - if let terms = login.sessionKeyTerms { - Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") - return try await approveAppConnectLogin(request, consent: consent, terms: terms, context: context) - } Self.logger.info("🔗 DASHCONNECT :: authorized; deriving login key") // `deriveIdentityAuthKeyAtSlot` is main-actor isolated in the SDK. @@ -1050,342 +1011,191 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return try await DashConnectPlatformQueries.currentEpochProtocolVersion(sdk: sdk) } - /// The one-QR login: derive the request's session key, register it on the - /// identity with its bounds and limits, and only then publish the - /// encrypted key, so the app finds a live key on its first check. - /// - /// A new key's grant is recorded, unconfirmed, before its registration - /// is submitted, so a key that lands without the update confirming is - /// still found later. Once the key is known to be on the identity the - /// grant is confirmed and the connection row recorded, from what the - /// approved sheet showed and with no network read between the two, before - /// the publish: whatever happens to the publish, the key stays visible in - /// Connections and can be disabled. A row lost between the two writes is - /// put back by the next one-QR approval with this identity, or by a - /// disconnect of one of its apps once the PIN is entered. - /// TODO(dashconnect-lost-row): nothing puts it back at launch or when - /// Connections opens, so until then the key is live with no row. - /// - /// Approving the same QR again finds the key registered and does not - /// register it twice; if the response is already recorded as published it - /// does nothing more. - private func approveAppConnectLogin( - _ request: DashKeyRequest, - consent: ConnectionRequest, - terms: AppConnect.SessionKeyTerms, + /// One read of the active identity: its keys from Platform, their bounds + /// from the wallet's key store. A read behind one already seen in this + /// process comes from a node that is behind, and throws + /// `identityReadBehind`. + private func identitySnapshot( context: Context - ) async throws -> DAppConnection { - guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { - throw DashConnectPlatformError.loginContractUnavailable - } - let stores = context.stores - guard stores.grants.canPersist else { - throw DashConnectPlatformError.grantStoreUnavailable - } - - let requestId = AppConnect.requestId(appEphemeralPubKey: request.appEphemeralPubKey) - // `deriveConnectKey` is main-actor isolated in the SDK. Only the two - // buffers leave the closure, so the private key below is the sole - // owner of its storage and the deferred wipe reaches the real bytes. - var (sessionPublicKey, sessionPrivateKey) = try await MainActor.run { - let key = try context.wallet.deriveConnectKey( - subFeature: .sessionAuthentication, - identityId: context.identityId, - leaf: requestId, - network: context.network - ) - return (key.publicKeyData, key.privateKeyData) - } - defer { Self.zero(&sessionPrivateKey) } - let sessionKeyHash160 = try KeyExchangeCrypto.hash160(sessionPublicKey) - - var walletEphemeralPrivateKey = try Self.generateEphemeralPrivateKey() - let sealed = try AppConnect.seal( - sessionPrivateKey, - appEphemeralPubKey: request.appEphemeralPubKey, - walletEphemeralPrivateKey: &walletEphemeralPrivateKey - ) - - let identityId = context.identityId.toBase58String() - let appContractId = request.contractId.toBase58String() - let requestHash = sealed.appEphemeralPubKeyHash.toHexString() - let signer = KeychainSigner(modelContainer: context.modelContainer) - let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) - await confirmRegistrations( - identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, - modelContainer: context.modelContainer, in: stores) - func isGrantForRequest(_ grant: AppConnectGrant) -> Bool { - grant.identityId == identityId && grant.appContractId == appContractId - && grant.values.appEphemeralPubKeyHash == requestHash - } - - // Read only for a key that is already on the identity. If the store - // cannot be read, such a key needs a grant record instead. - var bindings: [AppConnect.KeyBinding] = [] - var grantedKeyIds: Set = [] - if currentPublicKeys.contains(where: { $0.keyType == .ecdsaHash160 && $0.data == sessionKeyHash160 }) { - bindings = (try? Self.storedKeyBindings( - identityId: identityId, modelContainer: context.modelContainer)) ?? [] - // An unconfirmed record is not evidence of the key's bound: it - // only says what was submitted. - grantedKeyIds = Set(stores.grants.load() - .filter { isGrantForRequest($0) && !$0.isUnconfirmed }.map(\.sessionKeyId)) - } - - let sessionKeyId: UInt32 - var totalBudget: UInt64? - var expiresAt: UInt64? - switch AppConnect.sessionKeyState( - publicKeyHash160: sessionKeyHash160, - currentIdentityPublicKeys: currentPublicKeys, - appContractId: request.contractId, - bindings: bindings, - grantedKeyIds: grantedKeyIds, - terms: terms, - now: now() - ) { - case .unusable: - throw DashConnectPlatformError.sessionKeyUnusable - case .usable(let keyId): - Self.logger.info("🔗 DASHCONNECT :: session key already registered") - sessionKeyId = keyId - let registered = currentPublicKeys.first { UInt32(bitPattern: $0.keyId) == keyId } - totalBudget = registered?.totalBudget - expiresAt = registered?.expiresAt.map { UInt64(max(0, $0)) } - case .absent: - guard let keyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) else { - throw DashConnectPlatformError.noFreeKeyId - } - let budget = terms.budgetCredits - let expiry = terms.expiresAt(from: now()) - let key = AppConnect.sessionIdentityPubkey( - keyId: keyId, - publicKeyHash160: sessionKeyHash160, - appContractId: request.contractId, - totalBudget: budget, - expiresAt: expiry - ) - // Recorded before the update is submitted: an update can land - // and still report a failure, and a key with no record could not - // be found again. The record stays unconfirmed, with no row, - // until the key is seen on the identity. - var pending = AppConnectGrant( - identityId: identityId, - appContractId: appContractId, - documentId: nil, - values: AppConnect.ResponseValues(sealed), - sessionKeyId: keyId, - totalBudget: budget, - expiresAt: expiry, - publishedAt: now() - ) - pending.unconfirmedKeyHash160 = sessionKeyHash160.toHexString() - // The update is built at one above the revision the wallet holds - // for the identity, read again from Platform above. - let revisionBefore = try context.wallet.managedIdentity(identityId: context.identityId).getRevision() - pending.submittedRevision = revisionBefore == .max ? nil : revisionBefore + 1 - // A confirmed record for this request means its key is on the - // identity, and a view without it is behind: registering again - // would be refused, and the record must keep its values. - guard !stores.grants.load().contains(where: { - isGrantForRequest($0) && !$0.isUnconfirmed && $0.keyDisabled != true - }) else { - throw DashConnectPlatformError.identityKeysOutOfDate - } - updateGrants(in: stores) { grants in - grants.removeAll { $0.key == pending.key } - grants.append(pending) - } - guard stores.grants.load().contains(where: { $0.key == pending.key }) else { - Self.logger.error("🔗 DASHCONNECT :: the session key could not be recorded; not registering it") - throw DashConnectPlatformError.grantStoreUnavailable - } - Self.logger.info("🔗 DASHCONNECT :: registering session key") - do { - try await signer.withAdditionalSigningKeys([ - (publicKey: sessionKeyHash160, privateKey: sessionPrivateKey), - ]) { - try await context.wallet.updateIdentity( - identityId: context.identityId, - addPublicKeys: [key], - signer: signer - ) - } - } catch { - // Another update of the identity that landed meanwhile moved - // the wallet's revision, and this one may have been built on - // it: the record names the higher of the two, which only - // makes a disconnect wait longer for the outcome. - if let revisionAfter = try? context.wallet - .managedIdentity(identityId: context.identityId).getRevision(), - revisionAfter > revisionBefore, revisionAfter < .max { - updateGrants(in: stores) { grants in - guard let index = grants.firstIndex(where: { $0.key == pending.key }) else { return } - grants[index].submittedRevision = revisionAfter + 1 - } - pending.submittedRevision = revisionAfter + 1 - } - // The update may have landed all the same. If the key is on - // the identity, the login goes on; otherwise the failure - // stands and the record stays unconfirmed, to be confirmed if - // the key turns up later, or dropped by a disconnect once the - // update can no longer land. - guard let keys = try? await refreshedIdentityPublicKeys(context: context), - let bindings = try? Self.storedKeyBindings( - identityId: identityId, modelContainer: context.modelContainer), - AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: keys, bindings: bindings) else { - Self.logger.error("🔗 DASHCONNECT :: session key registration failed or is unconfirmed — \(error.localizedDescription, privacy: .public)") - throw error - } - Self.logger.info("🔗 DASHCONNECT :: session key is on the identity although the update reported a failure") - } - Self.logger.info("🔗 DASHCONNECT :: session key registered") - sessionKeyId = keyId - totalBudget = budget - expiresAt = expiry - } - - // From here the app-side key exists on the identity. Confirm its - // record, and show the connection, before anything else can fail. A - // grant already recorded for this request keeps its values: if an - // earlier publish landed without confirming, those are the ones on - // Platform. - let grant = updateGrants(in: stores) { grants -> AppConnectGrant in - if let index = grants.firstIndex(where: { isGrantForRequest($0) && $0.sessionKeyId == sessionKeyId }) { - // The key is on the identity now. - grants[index].unconfirmedKeyHash160 = nil - return grants[index] - } - let new = AppConnectGrant( - identityId: identityId, - appContractId: appContractId, - documentId: nil, - values: AppConnect.ResponseValues(sealed), - sessionKeyId: sessionKeyId, - totalBudget: totalBudget, - expiresAt: expiresAt, - publishedAt: now() - ) - grants.append(new) - return new - } - - let connection = Self.makeConnection( - preview: consent, status: .active, updatedAt: now(), loginKind: .oneQR) - await updateRows(in: stores) { rows in - rows.filter { $0.id != connection.id } + [connection] - } - - try await publishAppConnectResponse( - grant: grant, - appEphemeralPubKeyHash: sealed.appEphemeralPubKeyHash, - responseContractId: responseContractId, - context: context, - signer: signer - ) - return connection - } - - /// Publishes the response a grant records, once its keys are on the - /// identity and the grant and its connection row are recorded. Shared by - /// the one-QR login and App Connect request v2. - private func publishAppConnectResponse( - grant: AppConnectGrant, - appEphemeralPubKeyHash: Data, - responseContractId: Data, - context: Context, - signer: KeychainSigner - ) async throws { - let stores = context.stores - let identityId = grant.identityId - let appContractId = grant.appContractId - let requestHash = grant.values.appEphemeralPubKeyHash - - // The store was writable when the login started. If the record did - // not land all the same, a response published now could not be found - // again. The key is live, so the row above stays: a disconnect finds - // the key by its contract bound. - guard stores.grants.load().contains(where: { $0.key == grant.key }) else { - Self.logger.error("🔗 DASHCONNECT :: the session key was registered but its record could not be saved") - throw DashConnectPlatformError.grantNotRecorded - } - - // A response deleted by a later login to this app is published again - // when its own request comes back. - guard !grant.hasDeletableResponse else { - Self.logger.info("🔗 DASHCONNECT :: response already published for this request") - return - } - - // Besides this app's earlier responses, this takes whatever an earlier - // disconnect of any app left behind for this identity: its row is - // gone, so a login is the only moment left to finish that cleanup. - await deleteAppConnectResponses( - where: { - guard $0.identityId == identityId else { return false } - return $0.keyDisabled == true - || ($0.appContractId == appContractId && $0.values.appEphemeralPubKeyHash != requestHash) + ) async throws -> (snapshot: AppConnect.IdentitySnapshot, keys: [ManagedIdentity.IdentityPublicKeyInfo]) { + let (keys, revision) = try await refreshedIdentityKeysAndRevision(context: context) + let bindings = try Self.storedKeyBindings( + identityId: context.identityId.toBase58String(), modelContainer: context.modelContainer) + let read = AppConnect.IdentitySnapshot( + identityId: context.identityId, + revision: revision, + keys: keys.map { key in + AppConnect.platformKey(key, binding: bindings.first { $0.keyId == UInt32(bitPattern: key.keyId) }) }, - responseContractId: responseContractId, - context: context, - signer: signer - ) - - // Recorded before the publish is submitted: a response this record - // had as deleted may be back on Platform after a publish that fails - // to confirm, and a disconnect must then look for it. - updateGrants(in: stores) { grants in - guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } - grants[index].markPublishStarted() - } + // TODO(dashconnect-platform-time): proved block time arrives with + // dashpay/platform#5715; until the app pins it no key is judged + // expired. + platformTime: nil) + let newest = Self.newestSnapshots.withLock { $0[context.identityId] } + guard read.mayReplace(newest) else { + // The SDK's copy of the identity is now that older one too, so + // nothing is built on it: the user tries again. + Self.logger.error("🔗 DASHCONNECT :: the identity read is behind one already seen") + throw DashConnectPlatformError.identityReadBehind + } + Self.newestSnapshots.withLock { $0[context.identityId] = read } + return (read, keys) + } + + /// Reads, changes and writes the intents in one step, from the store each + /// time. Every caller runs inside `gated`, so no other operation of this + /// wallet writes them in between. + @discardableResult + private func updateIntents(in stores: Stores, _ change: (inout [AppConnect.ConnectionIntent]) -> T) -> T { + var intents = stores.intents.load() + let result = change(&intents) + stores.intents.save(intents) + return result + } - Self.logger.info("🔗 DASHCONNECT :: publishing loginKeyResponse") - let documentId: Data - var publishedValues = grant.values + /// The payloads of the two-QR login's keys, and the apps whose two-QR keys + /// are live, for every app this read concerns: one with an intent of the + /// identity or an App Connect row, and every contract a live App Connect + /// key no intent names is bound to. A key the two-QR login registered + /// must never be offered for turning off: that login derives the same key + /// every time. When they cannot be derived, every such key bound to that + /// contract is kept out the same way. + private func twoQRKeys( + _ snapshot: AppConnect.IdentitySnapshot, + intents: [AppConnect.ConnectionIntent], + context: Context + ) async -> (protected: Set, liveApps: Set) { + // Named as `AppConnect.project` names them: an id held by another key + // is that key's. + let named = Set(intents.filter { $0.identityId == snapshot.identityId }.flatMap { intent in + intent.keys.filter { AppConnect.presence(of: $0, in: snapshot) != .conflicting }.map(\.id) + }) + var candidates: [Data: [Data]] = [:] + for intent in intents where intent.identityId == snapshot.identityId { + candidates[intent.appId, default: []] += [] + } + for row in rows(in: context.stores) where row.loginKind == .oneQR { + if let appId = Self.decodeIdentifier(row.id) { candidates[appId, default: []] += [] } + } + for key in snapshot.keys where AppConnect.isAppConnectAuthKey(key) && !named.contains(key.id) { + guard let bound = key.bound, !AppConnect.isProfileBound(bound) else { continue } + candidates[AppConnect.contractId(of: bound), default: []].append(key.data) + } + let live = Set(snapshot.keys.filter { $0.disabledAt == nil }.map(\.data)) + var protected: Set = [] + var liveApps: Set = [] + // The chain key is derived once (a keychain read and an FFI call on + // the main actor); each app's keys follow from it. + var chainKey: Data? do { - (documentId, _) = try await context.wallet.createDocument( - ownerIdentityId: context.identityId, - contractId: responseContractId, - documentType: AppConnect.documentType, - propertiesJSON: try grant.values.propertiesJSON(), - signer: signer - ) - Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse published") + chainKey = try await MainActor.run { + try context.wallet.deriveIdentityAuthKeyAtSlot( + identityIndex: context.identityIndex, + keyId: UInt32(LoginKeyDerivation.defaultKeyIndex), + network: context.network + ).privateKeyData + } } catch { - // A publish can land without confirming, and the response is - // unique per request and identity, so the retry is then refused. - // If the response is there, this login is complete; if it is not, - // or that cannot be told, the failure stands. - guard let published = try? await findAppConnectResponse( - ownerIdentityId: context.identityId, - appEphemeralPubKeyHash: appEphemeralPubKeyHash, - responseContractId: responseContractId, - sdk: context.sdk - ) else { - throw error + // Without them no unrecorded key can be told from a two-QR key: + // none is offered. + Self.logger.error("🔗 DASHCONNECT :: two-QR keys not derived; unrecorded keys are left alone") + for key in snapshot.keys where AppConnect.isAppConnectAuthKey(key) && !named.contains(key.id) { + protected.insert(key.data) + } + } + defer { if chainKey != nil { Self.zero(&chainKey!) } } + for (contract, payloads) in candidates { + guard let chainKey, + var material = try? Self.deriveKeyRegistrationMaterial( + chainKeyPrivateBytes: chainKey, identityId: snapshot.identityId, appContractId: contract) else { + protected.formUnion(payloads) + continue } - Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse was already published") - documentId = published.documentId - publishedValues = published.values + Self.zero(&material.loginKey) + Self.zero(&material.authenticationPrivateKey) + Self.zero(&material.encryptionPrivateKey) + let derived: Set = [material.authenticationPublicKeyHash160, material.encryptionPublicKey] + protected.formUnion(derived) + if !derived.isDisjoint(with: live) { liveApps.insert(contract.toBase58String()) } } + return (protected, liveApps) + } - updateGrants(in: stores) { grants in - guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } - grants[index].documentId = documentId.toBase58String() - grants[index].values = publishedValues + /// Puts the App Connect rows of `stores` in step with what `snapshot` + /// and the intents show. A two-QR row stays unless the app has an App + /// Connect connection to show instead. + private func refreshRows(from snapshot: AppConnect.IdentitySnapshot, context: Context) async { + let stores = context.stores + let all = stores.intents.load() + let twoQR = await twoQRKeys(snapshot, intents: all, context: context) + let projection = AppConnect.project([snapshot], intents: all, protected: twoQR.protected) + let elsewhere = all.filter { $0.identityId != snapshot.identityId && $0.closedAt == nil } + let updatedAt = now() + await updateRows(in: stores) { rows in + Self.rows(rows, after: projection, intents: elsewhere, twoQRApps: twoQR.liveApps, at: updatedAt) + } + } + + /// `rows` with the App Connect connections of `projection`: an app with + /// live keys or an update that may still land has a row; one whose keys + /// are all off, or whose update never landed, has none, unless its + /// two-QR keys are live (`twoQRApps`): then it has its two-QR row back. + static func rows( + _ rows: [DAppConnection], + after projection: AppConnect.Projection, + intents elsewhere: [AppConnect.ConnectionIntent], + twoQRApps: Set = [], + at updatedAt: Date + ) -> [DAppConnection] { + func shownStatus(_ status: AppConnect.IntentStatus) -> ConnectionStatus? { + switch status { + case .active, .expired: return .active + case .confirming: return .confirming + case .disconnected, .neverLanded: return nil + } + } + let shownIds = Set(projection.connections.filter { shownStatus($0.status) != nil }.map { $0.appId.toBase58String() }) + // An App Connect row stands for intents: it stays only while another + // identity's intents hold it, since this read says nothing of them. + let heldElsewhere = Set(elsewhere.map { $0.appId.toBase58String() }) + var result = rows.filter { + !shownIds.contains($0.id) && ($0.loginKind == .twoQR || heldElsewhere.contains($0.id)) + } + for connection in projection.connections { + let id = connection.appId.toBase58String() + guard let status = shownStatus(connection.status) else { continue } + let existing = rows.first { $0.id == id } + let latest = connection.intents.first + let fallback = DashConnectFallbackAppMetadata.resolve(contractId: id, unauthenticatedLabel: "") + let name = latest?.appLabel ?? existing?.name ?? fallback.name + result.removeAll { $0.id == id } + result.append(DAppConnection( + id: id, + name: name.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : name, + url: latest?.appUrl ?? existing?.url ?? fallback.url, + status: status, + updatedAt: existing?.status == status ? existing?.updatedAt ?? updatedAt : updatedAt, + loginKind: .oneQR)) + } + for id in twoQRApps.subtracting(shownIds) where !result.contains(where: { $0.id == id }) { + guard let existing = rows.first(where: { $0.id == id }) else { continue } + result.append(DAppConnection( + id: id, name: existing.name, url: existing.url, status: .active, updatedAt: updatedAt, loginKind: .twoQR)) } + return result } /// App Connect request v2 (Yappr `docs/APP_CONNECT_PROFILE.md`): one key /// per auth binding, the identity's encryption key for the app, and the /// previous grant on the same connection disabled, all in one - /// MASTER-signed identity update; then the grant and the connection row - /// are recorded and the sealed response is published, as for the one-QR - /// login. + /// MASTER-signed identity update; then the sealed response is published + /// once the keys show. /// - /// Approving the same request again finds its keys registered and - /// recorded, registers nothing and publishes the recorded response if it - /// is not on Platform yet. + /// The intent is written before the update is submitted and names every + /// key it adds, so whatever happens to the update, the keys are found + /// and can be turned off. Approving the same request again finds its + /// intent, submits what has not landed and publishes the recorded + /// response. private func approveAppConnectV2Login( _ uri: AppConnectUri, plan: AppConnect.GrantPlan, @@ -1396,9 +1206,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.loginContractUnavailable } let stores = context.stores - guard stores.grants.canPersist else { + guard stores.intents.canPersist else { throw DashConnectPlatformError.grantStoreUnavailable } + guard !stores.intents.hasUnreadableRows(identityId: context.identityId) else { + throw DashConnectPlatformError.intentsUnreadable + } // The app stops looking for an answer ten minutes after it asked. guard uri.request.age(now: now()) == .fresh else { throw AppConnect.Refusal(.stale, NSLocalizedString( @@ -1406,126 +1219,262 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { comment: "DashConnect App Connect v2")) } let request = uri.request - let identityId = context.identityId.toBase58String() - let appId = plan.appId.toBase58String() - let requestHash = plan.appEphemeralPubKeyHash.toHexString() - let connectionId = plan.connectionId?.toHexString() - func isGrantForRequest(_ grant: AppConnectGrant) -> Bool { - grant.identityId == identityId && grant.appContractId == appId - && grant.values.appEphemeralPubKeyHash == requestHash - } - - // `deriveConnectKey` is main-actor isolated in the SDK. Only the two - // buffers leave the closure, so the arrays below own the private keys - // and the deferred wipe reaches the real bytes. - var authKeys: [(publicKeyHash160: Data, privateKey: Data)] = [] - // Per encryption grant, every key this wallet derives for it - // (`AppConnect.derivableEncryptionKeys`): rotation 0' first. - var encryptionKeys: [[AppConnect.DerivedEncryptionKey]] = [] - defer { - for index in authKeys.indices { Self.zero(&authKeys[index].privateKey) } - for grant in encryptionKeys.indices { - for index in encryptionKeys[grant].indices { Self.zero(&encryptionKeys[grant][index].privateKey) } + let signer = KeychainSigner(modelContainer: context.modelContainer) + let (snapshot, currentPublicKeys) = try await identitySnapshot(context: context) + + let intent: AppConnect.ConnectionIntent + if let earlier = stores.intents.load().first(where: { + $0.identityId == context.identityId && $0.appId == plan.appId + && $0.requestHash == plan.appEphemeralPubKeyHash + }) { + // A retry: the same keys and response, within what was approved + // now, and only while the identity still has the encryption keys + // the response carries. + guard AppConnect.isWithinPlan(earlier, plan) else { throw DashConnectPlatformError.approvalOutOfDate } + // Turned off, expired, or never to land: Platform never adds a key + // twice, so the app has to ask again. + guard AppConnect.mayResume(earlier, in: snapshot) else { + throw DashConnectPlatformError.sessionKeyUnusable + } + guard earlier.sentEncryptionKeyIds.allSatisfy({ id in + snapshot.keys.contains { $0.id == id && AppConnect.isLive($0, at: snapshot.platformTime) } + }) else { + throw DashConnectPlatformError.appConnectEncryptionKeyChanged + } + intent = earlier + } else { + intent = try await newAppConnectIntent( + request: request, plan: plan, consent: consent, snapshot: snapshot, + currentPublicKeys: currentPublicKeys, context: context) + updateIntents(in: stores) { $0.append(intent) } + guard stores.intents.load().contains(where: { $0.id == intent.id }) else { + throw DashConnectPlatformError.grantNotRecorded } } - for grant in plan.auth { - let leaf = AppConnect.authKeyLeaf( - appEphemeralPubKey: request.appEphemeralPubKey, bindingIndex: grant.bindingIndex) - let (publicKey, privateKey) = try await MainActor.run { - let key = try context.wallet.deriveConnectKey( - subFeature: .sessionAuthentication, - identityId: context.identityId, - leaf: leaf, - network: context.network - ) - return (key.publicKeyData, key.privateKeyData) + // The row goes with the intent, before anything is submitted: however + // the update ends, the user can turn the connection off. + await refreshRows(from: snapshot, context: context) + + try await submitIntent(intent, request: request, plan: plan, snapshot: snapshot, context: context, signer: signer) + guard stores.intents.load().first(where: { $0.id == intent.id })?.closedAt == nil else { + throw DashConnectPlatformError.sessionKeyUnusable + } + try await publishResponse(of: intent, responseContractId: responseContractId, context: context, signer: signer) + if let read = try? await identitySnapshot(context: context).snapshot { + // The earlier grants of this connection are done once their keys + // are off; their responses go with them. + let superseded = intent.connectionId.map { connectionId in + stores.intents.load().filter { + $0.id != intent.id && $0.identityId == context.identityId && $0.appId == intent.appId + && $0.connectionId == connectionId + && $0.closedAt == nil && [.disconnected, .neverLanded].contains(AppConnect.status(of: $0, in: read)) + } + } ?? [] + if !superseded.isEmpty { + let closedAt = now() + let ids = Set(superseded.map(\.id)) + updateIntents(in: stores) { intents in + for index in intents.indices where ids.contains(intents[index].id) { intents[index].closedAt = closedAt } + } + await deleteResponses( + of: Array(ids), responseContractId: responseContractId, context: context, signer: signer) } - authKeys.append((try KeyExchangeCrypto.hash160(publicKey), privateKey)) + await refreshRows(from: read, context: context) + } else { + // The row is put right by the next read, at the latest when + // Connections opens. + Self.logger.info("🔗 DASHCONNECT :: identity not read after the approval; its row is refreshed later") } + return Self.makeConnection(preview: consent, status: .active, updatedAt: now(), loginKind: .oneQR) + } - let signer = KeychainSigner(modelContainer: context.modelContainer) - // The app's current encryption keys are a second read, from Platform. - // Wallet rule 3 puts every encryption key on the app's contract. The - // first read runs while the identity's keys are fetched, in a task of - // its own, so a login that fails before it is needed does not wait - // for it. - let encryptionPurposes = Set(plan.encryption.map(\.keyPurpose)).sorted { $0.rawValue < $1.rawValue } - let sdk = context.sdk - func readCurrentKeys() async throws -> [KeyPurpose: AppConnect.CurrentContractKey] { - guard !encryptionPurposes.isEmpty else { return [:] } - let response = try await DashConnectPlatformQueries.identityContractKeys( - sdk: sdk, identityId: identityId, contractId: appId, purposes: encryptionPurposes) - var keys: [KeyPurpose: AppConnect.CurrentContractKey] = [:] - for purpose in encryptionPurposes { - keys[purpose] = try AppConnect.currentContractKey( - from: response, identityId: identityId, purpose: purpose) + /// The intent of a new approval: the keys it adds under ids no key or + /// intent of the identity holds, the earlier keys of the same connection + /// it turns off, and the response, sealed now. + private func newAppConnectIntent( + request: AppConnectRequest, + plan: AppConnect.GrantPlan, + consent: ConnectionRequest, + snapshot: AppConnect.IdentitySnapshot, + currentPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + context: Context + ) async throws -> AppConnect.ConnectionIntent { + let stores = context.stores + var authKeys = try await deriveAuthKeys(request: request, plan: plan, context: context) + defer { for index in authKeys.indices { Self.zero(&authKeys[index].privateKey) } } + // A derived key already on the identity with no intent of this + // request: an answer this wallet no longer has a record of. Platform + // never adds a key twice, so the app has to ask again. + guard !authKeys.contains(where: { key in currentPublicKeys.contains { $0.data == key.publicKeyHash160 } }) else { + throw DashConnectPlatformError.sessionKeyUnusable + } + var encryption = try await encryptionSlots(plan: plan, currentPublicKeys: currentPublicKeys, context: context) + defer { for index in encryption.indices { Self.zero(&encryption[index].privateKey) } } + + // Wallet rule 8: this connection's earlier grants go in the same + // update. More than one update can turn off is refused before + // anything is written. An earlier grant whose update may still land + // is fenced first, so it cannot add keys this one replaces. + let intents = stores.intents.load() + let supersession = plan.connectionId.map { connectionId in + AppConnect.disconnectPlan( + appId: plan.appId, snapshot: snapshot, + intents: intents.filter { $0.connectionId == connectionId }, + includeUnrecorded: false) + } ?? AppConnect.DisconnectPlan() + let superseded = supersession.disable + guard superseded.count <= AppConnect.maxKeysDisabledPerUpdate else { + throw DashConnectPlatformError.tooManyKeysToReplace + } + let newCount = authKeys.count + encryption.filter { $0.keyId == nil }.count + guard newCount <= AppConnect.maxKeysAddedPerUpdate else { + throw DashConnectPlatformError.tooManyKeysToAdd + } + var snapshot = snapshot + if !supersession.fence.isEmpty { + try await fenceAndDisable( + AppConnect.DisconnectPlan(fence: supersession.fence), context: context, + signer: KeychainSigner(modelContainer: context.modelContainer)) + snapshot = try await identitySnapshot(context: context).snapshot + let fenced = snapshot + let closedAt = now() + updateIntents(in: stores) { intents in + for index in intents.indices where intents[index].closedAt == nil + && intents[index].identityId == context.identityId + && AppConnect.status(of: intents[index], in: fenced) == .neverLanded { + intents[index].closedAt = closedAt + } } - return keys } - let firstCurrentKeysRead = Task { try await readCurrentKeys() } - defer { firstCurrentKeysRead.cancel() } - let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) - let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) - // Which rotations to derive depends on the keys the identity has. - for grant in plan.encryption { - encryptionKeys.append(try await MainActor.run { - try Self.derivableEncryptionKeys( - for: grant, wallet: context.wallet, identityId: context.identityId, - network: context.network, currentIdentityPublicKeys: currentPublicKeys) - }) + + guard var ids = AppConnect.newKeyIds(count: newCount, snapshot: snapshot, intents: intents)?.makeIterator() else { + throw DashConnectPlatformError.noFreeKeyId + } + var keys: [AppConnect.IntendedKey] = [] + for (grant, key) in zip(plan.auth, authKeys) { + guard let id = ids.next() else { throw DashConnectPlatformError.noFreeKeyId } + keys.append(AppConnect.IntendedKey( + id: id, purpose: .authentication, securityLevel: grant.securityLevel, keyType: .ecdsaHash160, + data: key.publicKeyHash160, readOnly: false, bound: grant.storedBound, + totalBudget: grant.totalBudget, expiresAt: grant.expiresAt)) + } + for index in encryption.indices where encryption[index].keyId == nil { + guard let id = ids.next() else { throw DashConnectPlatformError.noFreeKeyId } + let grant = plan.encryption[encryption[index].grantIndex] + let pubkey = AppConnect.encryptionIdentityPubkey(grant, keyId: id, publicKey: encryption[index].publicKey) + keys.append(AppConnect.IntendedKey( + id: id, purpose: pubkey.purpose, securityLevel: pubkey.securityLevel, keyType: pubkey.keyType, + data: pubkey.pubkeyBytes, readOnly: pubkey.readOnly, + bound: pubkey.contractBounds.map(AppConnect.storedBound(of:)), + totalBudget: nil, expiresAt: nil)) + encryption[index].keyId = id } - // An auth key already on the identity at a binding's derived payload - // is this request answered before: the payload comes from the - // request's ephemeral key and the binding's index, and the store - // has to show the key bound exactly as the binding asks, within the - // plan's terms. It is sent again, sealed to that ephemeral key, so - // only the app holding its private key can read it. A key bound - // otherwise fails closed; Platform never re-adds a key, so the app - // then has to ask again. A key may be live without a record: an - // update that landed after this wallet stopped waiting for it. - var authKeyIds: [UInt32?] = try zip(plan.auth, authKeys).map { grant, key in - guard let existing = currentPublicKeys.first(where: { - $0.keyType == .ecdsaHash160 && $0.data == key.publicKeyHash160 - }) else { return nil } - let keyId = UInt32(bitPattern: existing.keyId) - guard AppConnect.canResendAuthKey( - existing, for: grant, - binding: bindings.first { $0.keyId == keyId && $0.data == existing.data }, - now: now() - ) else { - throw DashConnectPlatformError.sessionKeyUnusable + // Slots: the auth keys in request order, then the encryption keys + // that are sent. + var slots = authKeys.map(\.privateKey) + encryption.map(\.privateKey) + defer { for index in slots.indices { Self.zero(&slots[index]) } } + var walletEphemeralPrivateKey = try Self.generateEphemeralPrivateKey() + defer { Self.zero(&walletEphemeralPrivateKey) } + let response = AppConnect.ResponseValues( + appEphemeralPubKeyHash: plan.appEphemeralPubKeyHash.toHexString(), + walletEphemeralPubKey: try Secp256k1.compressedPublicKey(privateKey: walletEphemeralPrivateKey).toHexString(), + encryptedPayload: try KeyExchangeCrypto.encryptAppConnectSlots( + slots, + walletEphemeralPriv: walletEphemeralPrivateKey, + appEphemeralPub: request.appEphemeralPubKey, + ownerId: context.identityId + ).toHexString() + ) + let added = Set(keys.map(\.id)) + return AppConnect.ConnectionIntent( + id: UUID(), + identityId: context.identityId, + appId: plan.appId, + appLabel: consent.appLabel, + appUrl: consent.appUrl, + requestHash: plan.appEphemeralPubKeyHash, + connectionId: plan.connectionId, + keys: keys, + sentEncryptionKeyIds: encryption.compactMap(\.keyId).filter { !added.contains($0) }, + disables: superseded, + response: response, + responseDocumentId: nil, + responseRemoved: false, + createdAt: now(), + closedAt: nil) + } + + /// The auth keys of `plan`, derived from the request: the same keys on + /// every try of one request. + private func deriveAuthKeys( + request: AppConnectRequest, + plan: AppConnect.GrantPlan, + context: Context + ) async throws -> [(publicKeyHash160: Data, privateKey: Data)] { + var keys: [(publicKeyHash160: Data, privateKey: Data)] = [] + do { + for grant in plan.auth { + let leaf = AppConnect.authKeyLeaf( + appEphemeralPubKey: request.appEphemeralPubKey, bindingIndex: grant.bindingIndex) + // `deriveConnectKey` is main-actor isolated in the SDK. Only + // the two buffers leave the closure. + let (publicKey, derivedPrivateKey) = try await MainActor.run { + let key = try context.wallet.deriveConnectKey( + subFeature: .sessionAuthentication, identityId: context.identityId, leaf: leaf, network: context.network) + return (key.publicKeyData, key.privateKeyData) + } + var privateKey = derivedPrivateKey + defer { Self.zero(&privateKey) } + keys.append((try KeyExchangeCrypto.hash160(publicKey), privateKey)) } - return keyId + } catch { + for index in keys.indices { Self.zero(&keys[index].privateKey) } + throw error } - // A grant already recorded for this request must name exactly these - // keys: its response carries them. A key recorded for another app or - // request is that one's, and must not be taken over. - let reused = Set(authKeyIds.compactMap { $0 }) - if !reused.isEmpty { - let grants = stores.grants.load().filter { $0.identityId == identityId } - if let recorded = grants.first(where: isGrantForRequest), - Set(recorded.keyIds) != reused || authKeyIds.contains(nil) { - throw DashConnectPlatformError.sessionKeyUnusable - } - if grants.contains(where: { !isGrantForRequest($0) && !reused.isDisjoint(with: $0.keyIds) }) { - throw DashConnectPlatformError.sessionKeyUnusable + return keys + } + + /// One encryption slot of a response: the grant it answers, the key it + /// carries and that key's id, nil until the update that adds it is + /// built. + private struct EncryptionSlotKey { + let grantIndex: Int + let publicKey: Data + var privateKey: Data + var keyId: UInt32? + } + + /// Wallet rule 7 (DIP "Encryption Keys"): re-send the identity's current + /// key for the app when this wallet derives it, at any rotation or + /// (testnet and devnet) the path without one; register rotation 0' only + /// when the identity has no key for the app at all; leave the slot out + /// otherwise. Which key is current is Platform's to say: the app's + /// verifier checks the slot against the same proved read. + private func encryptionSlots( + plan: AppConnect.GrantPlan, + currentPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + context: Context + ) async throws -> [EncryptionSlotKey] { + guard !plan.encryption.isEmpty else { return [] } + let identityId = context.identityId.toBase58String() + let appId = plan.appId.toBase58String() + let sdk = context.sdk + let purposes = Set(plan.encryption.map(\.keyPurpose)).sorted { $0.rawValue < $1.rawValue } + func readCurrentKeys() async throws -> [KeyPurpose: AppConnect.CurrentContractKey] { + let response = try await DashConnectPlatformQueries.identityContractKeys( + sdk: sdk, identityId: identityId, contractId: appId, purposes: purposes) + var keys: [KeyPurpose: AppConnect.CurrentContractKey] = [:] + for purpose in purposes { + keys[purpose] = try AppConnect.currentContractKey(from: response, identityId: identityId, purpose: purpose) } + return keys } - - // Wallet rule 7 (DIP "Encryption Keys"): re-send the identity's - // current key for the app when this wallet derives it, at any - // rotation or (testnet and devnet) the path without one; register - // rotation 0' only when the identity has no key for the app at all; - // leave the slot out otherwise. Which key is current is Platform's to say: - // the app's verifier checks the slot against the same proved read. // An answer this build cannot read reads the same on every try. func isUnreadableAnswer(_ error: Error) -> Bool { if let sdkError = error as? SDKError, case .serializationError = sdkError { return true } return false } - // An answer this build cannot read is a refusal the app hears as - // `unsupported`, like a contract it cannot read. func failedRead(_ error: Error) -> Error { Self.logger.error("🔗 DASHCONNECT :: the app's current encryption keys could not be read — \(error.localizedDescription, privacy: .public)") guard isUnreadableAnswer(error) else { return DashConnectPlatformError.appConnectKeysUnreadable } @@ -1533,29 +1482,35 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet.", comment: "DashConnect App Connect v2")) } - // A node one block behind has usually caught up within a second; - // one that has not gets longer. + // A node one block behind has usually caught up within a second; one + // that has not gets longer. func pause(_ attempt: Int) async { try? await Task.sleep(nanoseconds: attempt == 1 ? 1_000_000_000 : 3_000_000_000) } - // A first read that fails is tried again, as a later one would be. - var firstRead: [KeyPurpose: AppConnect.CurrentContractKey]? - var firstReadFailure: Error? - do { - firstRead = try await firstCurrentKeysRead.value - } catch { - firstReadFailure = error - } - for attempt in 1 ... 2 where firstRead == nil && !(firstReadFailure.map(isUnreadableAnswer) ?? false) { - await pause(attempt) - do { - firstRead = try await readCurrentKeys() - } catch { - firstReadFailure = error + + var derived: [[AppConnect.DerivedEncryptionKey]] = [] + defer { + for grant in derived.indices { + for index in derived[grant].indices { Self.zero(&derived[grant][index].privateKey) } } } + for grant in plan.encryption { + derived.append(try await MainActor.run { + try Self.derivableEncryptionKeys( + for: grant, wallet: context.wallet, identityId: context.identityId, + network: context.network, currentIdentityPublicKeys: currentPublicKeys) + }) + } + let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + + var firstRead: [KeyPurpose: AppConnect.CurrentContractKey]? + var failure: Error? + for attempt in 0 ... 2 where firstRead == nil && !(failure.map(isUnreadableAnswer) ?? false) { + if attempt > 0 { await pause(attempt) } + do { firstRead = try await readCurrentKeys() } catch { failure = error } + } guard let currentKeys = firstRead else { - throw failedRead(firstReadFailure ?? DashConnectPlatformError.appConnectKeysUnreadable) + throw failedRead(failure ?? DashConnectPlatformError.appConnectKeysUnreadable) } func states(_ currentKeys: [KeyPurpose: AppConnect.CurrentContractKey]) throws -> [AppConnect.EncryptionKeyState] { try plan.encryption.enumerated().map { index, grant in @@ -1563,7 +1518,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.approvalOutOfDate } return AppConnect.encryptionKeyState( - derivedPublicKeys: encryptionKeys[index].map(\.publicKey), + derivedPublicKeys: derived[index].map(\.publicKey), purpose: grant.keyPurpose, contractId: grant.binding.contractId, rule: rule, @@ -1573,15 +1528,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } // A state that holds only if Platform's read is not behind holds - // once a read a few seconds later says the same, and one that is out - // of date may be Platform's read catching up. + // once a read a few seconds later says the same. let keyStates: [AppConnect.EncryptionKeyState] do { keyStates = try await AppConnect.settle( - currentKeys: currentKeys, - states: states, - reread: readCurrentKeys, - pause: pause, + currentKeys: currentKeys, states: states, reread: readCurrentKeys, pause: pause, isFinal: isUnreadableAnswer) } catch let error as DashConnectPlatformError { throw error @@ -1590,19 +1541,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } catch { throw failedRead(error) } - // `keyIndex` is the grant, `derivedIndex` the key among its - // derivable keys that the slot sends. - var encryptionSlots: [(keyIndex: Int, derivedIndex: Int, keyId: UInt32?)] = [] + var slots: [EncryptionSlotKey] = [] for (index, state) in keyStates.enumerated() { switch AppConnect.encryptionSlot( - for: state, - derivedPublicKeys: encryptionKeys[index].map(\.publicKey), - currentIdentityPublicKeys: currentPublicKeys + for: state, derivedPublicKeys: derived[index].map(\.publicKey), currentIdentityPublicKeys: currentPublicKeys ) { case .send(let keyId, let derivedIndex): - encryptionSlots.append((index, derivedIndex, keyId)) + slots.append(EncryptionSlotKey( + grantIndex: index, publicKey: derived[index][derivedIndex].publicKey, + privateKey: derived[index][derivedIndex].privateKey, keyId: keyId)) case .register: - encryptionSlots.append((index, 0, nil)) + slots.append(EncryptionSlotKey( + grantIndex: index, publicKey: derived[index][0].publicKey, + privateKey: derived[index][0].privateKey, keyId: nil)) case .omit: Self.logger.info("🔗 DASHCONNECT :: the app's encryption key on this identity is not this wallet's, or none is live; slot left out") case nil: @@ -1610,180 +1561,194 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.appConnectKeysOutOfDate } } - // The keys no slot carries are wiped now, not after the update and - // the publish. - for grant in encryptionKeys.indices { - let sent = encryptionSlots.first { $0.keyIndex == grant }?.derivedIndex - for index in encryptionKeys[grant].indices where index != sent { - Self.zero(&encryptionKeys[grant][index].privateKey) - } - } - - // A response recorded for this request carries the encryption keys - // the identity had then, and a retry sends that response again. If - // one of them has been disabled or replaced since, it would hand the - // app a key that is no longer the identity's: the retry stops here, - // before anything is registered. A record from before the ids were - // noted cannot be checked, and is refused the same way. - if let recorded = stores.grants.load().first(where: { isGrantForRequest($0) && !$0.isUnconfirmed }), - encryptionSlots.contains(where: { $0.keyId == nil }) - || recorded.encryptionKeyIds != encryptionSlots.compactMap(\.keyId) { - Self.logger.error("🔗 DASHCONNECT :: the recorded App Connect response carries encryption keys the identity no longer has") - throw DashConnectPlatformError.appConnectEncryptionKeyChanged - } + return slots + } - // Wallet rule 8: this connection's previous grant goes in the same - // update. A key of it the fetched list lacks means the list is - // behind, and it could not be shown to be off. - func isSuperseded(_ grant: AppConnectGrant) -> Bool { - connectionId != nil && grant.identityId == identityId && grant.appContractId == appId - && grant.connectionId == connectionId && !isGrantForRequest(grant) - } - let superseded = stores.grants.load().filter(isSuperseded) - guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: superseded).isEmpty else { - throw DashConnectPlatformError.identityKeysOutOfDate + /// Submits what of `intent` is not on the identity yet, and returns once + /// every key it adds shows. An update that reports a failure may still + /// have landed: the identity is read again, and if the keys are not + /// there the intent stays, shown as confirming, and the failure stands. + private func submitIntent( + _ intent: AppConnect.ConnectionIntent, + request: AppConnectRequest, + plan: AppConnect.GrantPlan, + snapshot: AppConnect.IdentitySnapshot, + context: Context, + signer: KeychainSigner + ) async throws { + func allShow(_ snapshot: AppConnect.IdentitySnapshot) -> Bool { + intent.keys.allSatisfy { [.live, .expired, .disabled].contains(AppConnect.presence(of: $0, in: snapshot)) } } - let disable = Array(AppConnect.supersededKeyIds( - grants: superseded, - identityId: identityId, - appId: appId, - connectionId: connectionId, - keeping: reused, - currentIdentityPublicKeys: currentPublicKeys - ).prefix(AppConnect.maxKeysDisabledPerUpdate)) - // The grants whose every key is off once the update lands. - let liveAfterUpdate = Set(currentPublicKeys.filter(AppConnect.isLiveGrantedKey) - .map { UInt32(bitPattern: $0.keyId) }).subtracting(disable) - let retiredGrantKeys = Set(superseded.filter { !$0.keyIds.contains(where: liveAfterUpdate.contains) }.map(\.key)) - - let newKeyCount = authKeyIds.filter { $0 == nil }.count + encryptionSlots.filter { $0.keyId == nil }.count - guard var freeKeyIds = AppConnect.freeKeyIds(count: newKeyCount, currentIdentityPublicKeys: currentPublicKeys)? - .makeIterator() else { - throw DashConnectPlatformError.noFreeKeyId + guard !allShow(snapshot) else { + await refreshRows(from: snapshot, context: context) + return } - var add: [ManagedPlatformWallet.IdentityPubkey] = [] + let missing = intent.keys.filter { AppConnect.presence(of: $0, in: snapshot) == .missing } + let disable = intent.disables.filter { id in snapshot.keys.contains { $0.id == id && $0.disabledAt == nil } } + + // The private keys of the auth keys to add, derived again from the + // request, and of the encryption keys, from the wallet. var signingKeys: [(publicKey: Data, privateKey: Data)] = [] - for (index, grant) in plan.auth.enumerated() where authKeyIds[index] == nil { - guard let keyId = freeKeyIds.next() else { throw DashConnectPlatformError.noFreeKeyId } - add.append(AppConnect.authIdentityPubkey( - grant, keyId: keyId, publicKeyHash160: authKeys[index].publicKeyHash160)) - signingKeys.append((authKeys[index].publicKeyHash160, authKeys[index].privateKey)) - authKeyIds[index] = keyId - } - for slot in encryptionSlots.indices where encryptionSlots[slot].keyId == nil { - guard let keyId = freeKeyIds.next() else { throw DashConnectPlatformError.noFreeKeyId } - let key = encryptionKeys[encryptionSlots[slot].keyIndex][encryptionSlots[slot].derivedIndex] - add.append(AppConnect.encryptionIdentityPubkey( - plan.encryption[encryptionSlots[slot].keyIndex], keyId: keyId, publicKey: key.publicKey)) - signingKeys.append((key.publicKey, key.privateKey)) - encryptionSlots[slot].keyId = keyId - } defer { for index in signingKeys.indices { Self.zero(&signingKeys[index].privateKey) } } - - if !add.isEmpty || !disable.isEmpty { - Self.logger.info( - "🔗 DASHCONNECT :: registering \(add.count, privacy: .public) key(s), disabling \(disable.count, privacy: .public)") - do { - try await signer.withAdditionalSigningKeys(signingKeys) { - try await context.wallet.updateIdentity( - identityId: context.identityId, - addPublicKeys: add, - disablePublicKeyIds: disable, - signer: signer - ) - } - } catch { - // An update can land without confirming, and the node asked - // next may not have it yet. If every new key shows up and - // every replaced key is off, it went through. - // Each new key has to be there as it was added, bound as the - // store reads it: a key under its id with the same payload - // but another bound is another request's, and is not sent. - func landed(_ keys: [ManagedIdentity.IdentityPublicKeyInfo], _ bindings: [AppConnect.KeyBinding]) -> Bool { - add.allSatisfy { new in keys.contains { key in - AppConnect.isAddedKey( - key, added: new, - binding: bindings.first { $0.keyId == new.keyId && $0.data == key.data }) - } } && disable.allSatisfy { id in keys.contains { - UInt32(bitPattern: $0.keyId) == id && $0.disabledAt != nil - } } - } - var confirmed = false - for attempt in 0 ..< 3 where !confirmed { - if attempt > 0 { try? await Task.sleep(nanoseconds: 3_000_000_000) } - if let refreshed = try? await refreshedIdentityPublicKeys(context: context), - let refreshedBindings = try? Self.storedKeyBindings( - identityId: identityId, modelContainer: context.modelContainer) { - confirmed = landed(refreshed, refreshedBindings) - } - } - guard confirmed else { throw error } - Self.logger.info("🔗 DASHCONNECT :: the identity update landed without confirming") + // Intent auth keys are in the order of the plan's bindings + // (`isWithinPlan`). + let bindingIndexes = Dictionary(uniqueKeysWithValues: zip(intent.authKeys.map(\.id), plan.auth.map(\.bindingIndex))) + for key in missing where key.isAuthentication { + guard let index = bindingIndexes[key.id] else { throw DashConnectPlatformError.approvalOutOfDate } + let leaf = AppConnect.authKeyLeaf(appEphemeralPubKey: request.appEphemeralPubKey, bindingIndex: index) + let (publicKey, derivedPrivateKey) = try await MainActor.run { + let derived = try context.wallet.deriveConnectKey( + subFeature: .sessionAuthentication, identityId: context.identityId, leaf: leaf, network: context.network) + return (derived.publicKeyData, derived.privateKeyData) + } + var privateKey = derivedPrivateKey + defer { Self.zero(&privateKey) } + guard try KeyExchangeCrypto.hash160(publicKey) == key.data else { throw DashConnectPlatformError.approvalOutOfDate } + signingKeys.append((key.data, privateKey)) + } + for key in missing where !key.isAuthentication { + guard let grant = plan.encryption.first(where: { + $0.keyPurpose == key.purpose && key.bound.map(AppConnect.contractId(of:)) == $0.binding.contractId + }) else { + throw DashConnectPlatformError.approvalOutOfDate + } + var candidates = try await MainActor.run { + try Self.derivableEncryptionKeys( + for: grant, wallet: context.wallet, identityId: context.identityId, + network: context.network, currentIdentityPublicKeys: try context.wallet + .managedIdentity(identityId: context.identityId).getPublicKeys()) } - Self.logger.info("🔗 DASHCONNECT :: identity updated") + defer { for index in candidates.indices { Self.zero(&candidates[index].privateKey) } } + guard let match = candidates.first(where: { $0.publicKey == key.data }) else { + throw DashConnectPlatformError.approvalOutOfDate + } + signingKeys.append((key.data, match.privateKey)) } - // Slots: the auth keys in request order, then the encryption keys - // that are sent. - var slots = authKeys.map(\.privateKey) + encryptionSlots.map { encryptionKeys[$0.keyIndex][$0.derivedIndex].privateKey } - defer { for index in slots.indices { Self.zero(&slots[index]) } } - var walletEphemeralPrivateKey = try Self.generateEphemeralPrivateKey() - defer { Self.zero(&walletEphemeralPrivateKey) } - let values = AppConnect.ResponseValues( - appEphemeralPubKeyHash: requestHash, - walletEphemeralPubKey: try Secp256k1.compressedPublicKey(privateKey: walletEphemeralPrivateKey).toHexString(), - encryptedPayload: try KeyExchangeCrypto.encryptAppConnectSlots( - slots, - walletEphemeralPriv: walletEphemeralPrivateKey, - appEphemeralPub: request.appEphemeralPubKey, - ownerId: context.identityId - ).toHexString() - ) + Self.logger.info("🔗 DASHCONNECT :: registering \(missing.count, privacy: .public) key(s), disabling \(disable.count, privacy: .public)") + do { + try await signer.withAdditionalSigningKeys(signingKeys) { + try await context.wallet.updateIdentity( + identityId: context.identityId, + addPublicKeys: missing.map(AppConnect.identityPubkey(of:)), + disablePublicKeyIds: disable, + signer: signer) + } + } catch { + // The update may have landed without confirming. Its keys + // decide; nothing else does. + for attempt in 0 ..< 3 { + if attempt > 0 { try? await Task.sleep(nanoseconds: 3_000_000_000) } + guard let read = try? await identitySnapshot(context: context).snapshot else { continue } + if allShow(read) { + Self.logger.info("🔗 DASHCONNECT :: the identity update landed without confirming") + await refreshRows(from: read, context: context) + return + } + if attempt == 2 { await refreshRows(from: read, context: context) } + } + throw error + } + Self.logger.info("🔗 DASHCONNECT :: identity updated") + } - // From here the keys are on the identity. Record them, and show the - // connection, before anything else can fail. The grants this one - // replaces are done: their keys are off. A grant already recorded - // for this request keeps its values: if an earlier publish landed - // without confirming, those are the ones on Platform. - let grantedKeyIds = authKeyIds.compactMap { $0 } - let sentEncryptionKeyIds = encryptionSlots.compactMap(\.keyId) - let primary = plan.auth[0] - let grant = updateGrants(in: stores) { grants -> AppConnectGrant in - AppConnect.markKeysDisabled(in: &grants) { retiredGrantKeys.contains($0.key) } - if let existing = grants.first(where: { isGrantForRequest($0) && $0.sessionKeyId == grantedKeyIds[0] }) { - return existing - } - let new = AppConnectGrant( - identityId: identityId, - appContractId: appId, - documentId: nil, - values: values, - sessionKeyId: grantedKeyIds[0], - totalBudget: primary.totalBudget, - expiresAt: primary.expiresAt, - publishedAt: now(), - additionalKeyIds: Array(grantedKeyIds.dropFirst()), - connectionId: connectionId, - encryptionKeyIds: sentEncryptionKeyIds - ) - grants.append(new) - return new + /// Publishes the response `intent` sealed, unless it is already there. + /// A publish can land without confirming, and the response is unique per + /// request and identity, so a refused retry is checked against Platform. + private func publishResponse( + of intent: AppConnect.ConnectionIntent, + responseContractId: Data, + context: Context, + signer: KeychainSigner + ) async throws { + guard intent.responseDocumentId == nil else { + Self.logger.info("🔗 DASHCONNECT :: response already published for this request") + return } + Self.logger.info("🔗 DASHCONNECT :: publishing loginKeyResponse") + let documentId: Data + do { + (documentId, _) = try await context.wallet.createDocument( + ownerIdentityId: context.identityId, + contractId: responseContractId, + documentType: AppConnect.documentType, + propertiesJSON: try intent.response.propertiesJSON(), + signer: signer) + Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse published") + } catch { + guard let published = try? await findAppConnectResponse( + ownerIdentityId: context.identityId, + appEphemeralPubKeyHash: intent.requestHash, + responseContractId: responseContractId, + sdk: context.sdk + ) else { + throw error + } + Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse was already published") + documentId = published.documentId + } + updateIntents(in: context.stores) { intents in + guard let index = intents.firstIndex(where: { $0.id == intent.id }) else { return } + intents[index].responseDocumentId = documentId + intents[index].responseRemoved = false + } + } - let connection = Self.makeConnection( - preview: consent, status: .active, updatedAt: now(), loginKind: .oneQR) - await updateRows(in: stores) { rows in - rows.filter { $0.id != connection.id } + [connection] + /// Deletes, by its original values, the response of each intent in `ids` + /// that may be on Platform. Best effort: one that cannot be deleted now + /// stays marked and is tried again by the next disconnect of its app. + private func deleteResponses( + of ids: [UUID], + responseContractId: Data, + context: Context, + signer: KeychainSigner + ) async { + for intent in context.stores.intents.load() where ids.contains(intent.id) && !intent.responseRemoved { + do { + // Deleted by the values it has on Platform, which are this + // intent's unless another install answered the same request. + guard let found = try await findAppConnectResponse( + ownerIdentityId: context.identityId, + appEphemeralPubKeyHash: intent.requestHash, + responseContractId: responseContractId, + sdk: context.sdk + ) else { + markResponseRemoved(intent.id, in: context.stores) + continue + } + let signingKeyId = try selectDocumentSigningKeyId(wallet: context.wallet, identityId: context.identityId) + _ = try await context.wallet.deleteDocument( + ownerIdentityId: context.identityId, + contractId: responseContractId, + documentType: AppConnect.documentType, + documentId: found.documentId, + propertiesJSON: try found.values.propertiesJSON(), + signingKeyId: signingKeyId, + signer: signer) + markResponseRemoved(intent.id, in: context.stores) + } catch { + Self.logger.error("🔗 DASHCONNECT :: loginKeyResponse not deleted — \(error.localizedDescription, privacy: .public)") + // A delete can land without confirming; only Platform says. + // A lookup that fails says nothing. + do { + let remaining = try await findAppConnectResponse( + ownerIdentityId: context.identityId, + appEphemeralPubKeyHash: intent.requestHash, + responseContractId: responseContractId, + sdk: context.sdk) + if remaining == nil { markResponseRemoved(intent.id, in: context.stores) } + } catch { + continue + } + } } + } - try await publishAppConnectResponse( - grant: grant, - appEphemeralPubKeyHash: plan.appEphemeralPubKeyHash, - responseContractId: responseContractId, - context: context, - signer: signer - ) - return connection + private func markResponseRemoved(_ id: UUID, in stores: Stores) { + updateIntents(in: stores) { intents in + guard let index = intents.firstIndex(where: { $0.id == id }) else { return } + intents[index].responseRemoved = true + } } /// This identity's response to one request, with the values it has on @@ -1818,126 +1783,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return (identifier, values) } - /// Reads, changes and writes the grant records in one step, from the - /// store each time. Every caller runs inside `gated`, so no other - /// operation of this wallet writes them in between. - @discardableResult - private func updateGrants(in stores: Stores, _ change: (inout [AppConnectGrant]) -> T) -> T { - var grants = stores.grants.load() - let result = change(&grants) - stores.grants.save(grants) - return result - } - - /// Deletes, by their original values, the responses of the matching - /// grants that are still on Platform. Best effort: a response that cannot - /// be deleted now stays recorded and is tried again by the next login - /// with this identity. It does not hold the caller back — the entry it leaves is - /// the encrypted key of a request the app has already finished with. - /// - /// A grant whose key is still live keeps its record, marked as having no - /// response left: a later disconnect picks the keys it has records for - /// without looking their app up in the wallet's key store. A grant whose - /// key is already disabled has no further use and is dropped. - private func deleteAppConnectResponses( - where matches: (AppConnectGrant) -> Bool, - responseContractId: Data, - context: Context, - signer: KeychainSigner - ) async { - await resolveUnconfirmedAppConnectResponses( - where: matches, responseContractId: responseContractId, context: context) - let pending = context.stores.grants.load().filter { matches($0) && $0.hasDeletableResponse } - for grant in pending { - do { - guard let documentIdText = grant.documentId, - let documentId = Self.decodeIdentifier(documentIdText) else { - throw DashConnectPlatformError.existingDocumentLookupFailed - } - let signingKeyId = try selectDocumentSigningKeyId( - wallet: context.wallet, - identityId: context.identityId - ) - _ = try await context.wallet.deleteDocument( - ownerIdentityId: context.identityId, - contractId: responseContractId, - documentType: AppConnect.documentType, - documentId: documentId, - propertiesJSON: try grant.values.propertiesJSON(), - signingKeyId: signingKeyId, - signer: signer - ) - markAppConnectResponseGone(grant, in: context.stores) - } catch { - Self.logger.error( - "🔗 DASHCONNECT :: previous loginKeyResponse not deleted — \(error.localizedDescription, privacy: .public)") - // A delete can land without confirming, and every retry is - // then refused because there is nothing left to delete. Only - // Platform can say which failure this was. - guard let hash = AppConnect.data(fromHex: grant.values.appEphemeralPubKeyHash) else { continue } - do { - let remaining = try await findAppConnectResponse( - ownerIdentityId: context.identityId, - appEphemeralPubKeyHash: hash, - responseContractId: responseContractId, - sdk: context.sdk - ) - if remaining == nil { markAppConnectResponseGone(grant, in: context.stores) } - } catch { - continue - } - } - } - } - - /// Records that a grant has no response on Platform any more. The record - /// of a live key stays for a disconnect to disable that key by; the - /// record of a disabled key has no further use. - private func markAppConnectResponseGone(_ grant: AppConnectGrant, in stores: Stores) { - updateGrants(in: stores) { grants in - guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } - if grants[index].keyDisabled == true { - grants.remove(at: index) - } else { - grants[index].responseDeleted = true - } - } - } - - /// Settles the matching grants whose publish never confirmed, by asking - /// Platform. A response that is there gets its id and its values on - /// Platform, so it can be deleted; one that is not there needs nothing - /// more. A lookup that fails leaves the record as it is for the next try. - private func resolveUnconfirmedAppConnectResponses( - where matches: (AppConnectGrant) -> Bool, - responseContractId: Data, - context: Context - ) async { - for grant in context.stores.grants.load() where matches(grant) && grant.hasUnconfirmedResponse { - guard let hash = AppConnect.data(fromHex: grant.values.appEphemeralPubKeyHash) else { continue } - do { - let published = try await findAppConnectResponse( - ownerIdentityId: context.identityId, - appEphemeralPubKeyHash: hash, - responseContractId: responseContractId, - sdk: context.sdk - ) - guard let published else { - markAppConnectResponseGone(grant, in: context.stores) - continue - } - updateGrants(in: context.stores) { grants in - guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } - grants[index].documentId = published.documentId.toBase58String() - grants[index].values = published.values - } - } catch { - Self.logger.error( - "🔗 DASHCONNECT :: unconfirmed loginKeyResponse not resolved — \(error.localizedDescription, privacy: .public)") - } - } - } - func handleStateTransition(_ request: DashStRequest) async throws -> DashConnectStAction { try validateNetwork(request.network) await showActiveWalletRows() @@ -2066,91 +1911,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return context } - /// Confirms this identity's unconfirmed registrations whose key it now - /// holds, and makes the row of each app this identity holds a recorded - /// live key of active and one-QR, adding one if it has none: the key is - /// live and has to be reachable from Connections. That also covers a - /// grant confirmed earlier whose row was never saved, or was saved by a - /// two-QR login. - private func confirmRegistrations( - identityId: String, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], - modelContainer: ModelContainer, - in stores: Stores - ) async { - guard stores.grants.load().contains(where: { $0.identityId == identityId && $0.keyDisabled != true }) - else { return } - // Without the store's bindings no unconfirmed record is confirmed, - // and a confirmed one does not need them. - let bindings = (try? Self.storedKeyBindings(identityId: identityId, modelContainer: modelContainer)) ?? [] - if stores.grants.load().contains(where: { $0.identityId == identityId && $0.isUnconfirmed }) { - let confirmed = updateGrants(in: stores) { grants in - AppConnect.confirmRegistrations( - in: &grants, identityId: identityId, - currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings) - } - if !confirmed.isEmpty { - Self.logger.info("🔗 DASHCONNECT :: \(confirmed.count, privacy: .public) unconfirmed session key(s) found on the identity") - } - } - let appIds = Self.appIdsWithoutTheirOneQRRow( - grants: stores.grants.load(), identityId: identityId, - currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings, - rows: rows(in: stores)) - guard !appIds.isEmpty else { return } - Self.logger.info("🔗 DASHCONNECT :: \(appIds.count, privacy: .public) app(s) with a live session key get their row back") - let confirmedAt = now() - await updateRows(in: stores) { rows in - Self.rowsAfterConfirming(appIds: appIds, in: rows, at: confirmedAt) - } - } - - /// The apps `identityId` holds a live key of by a confirmed grant record - /// whose row is missing from `rows` or is not an active one-QR row. - static func appIdsWithoutTheirOneQRRow( - grants: [AppConnectGrant], - identityId: String, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], - bindings: [AppConnect.KeyBinding], - rows: [DAppConnection] - ) -> Set { - let live = grants.filter { - $0.identityId == identityId && !$0.isUnconfirmed && $0.keyDisabled != true - && AppConnect.holdsRecordedKey( - $0, currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings) - } - return Set(live.map(\.appContractId)).filter { appId in - !rows.contains { $0.id == appId && $0.status == .active && $0.loginKind == .oneQR } - } - } - - /// `rows` once the apps in `appIds` hold a live one-QR key: each app's - /// row becomes active and one-QR, keeping its branding and scope (a - /// two-QR row waiting for its second scan would otherwise keep showing - /// that banner instead of the disconnect switch), and an app with no row - /// gets one. - static func rowsAfterConfirming(appIds: Set, in rows: [DAppConnection], at confirmedAt: Date) -> [DAppConnection] { - let reconciled = rows.map { connection in - guard appIds.contains(connection.id) else { return connection } - var updated = DAppConnection( - id: connection.id, - name: connection.name, - url: connection.url, - status: .active, updatedAt: confirmedAt, loginKind: .oneQR) - updated.scope = connection.scope - return updated - } - let missing = appIds.subtracting(rows.map(\.id)) - return reconciled + missing.sorted().map { appId in - let branding = DashConnectFallbackAppMetadata.resolve(contractId: appId, unauthenticatedLabel: "") - return DAppConnection( - id: appId, - name: branding.name.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : branding.name, - url: branding.url, - status: .active, updatedAt: confirmedAt, loginKind: .oneQR) - } - } - + /// Marks the existing row of a two-QR connection whose keys were + /// registered active. private func markActive(_ pendingConnection: DAppConnection, in stores: Stores) async { let activatedAt = now() await updateRows(in: stores) { rows in @@ -2343,647 +2105,232 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { await updateRows(in: stores) { rows in rows.filter { $0.id != id } } } - @discardableResult - func disconnect(id: String, scope: String?) async throws -> DashConnectDisconnectResult { - try await gated { try await disconnectInTurn(id: id, scope: scope) } + func refreshConnections() async { + do { + try await gated { + guard let stores = await showActiveWalletRows() else { return } + let context = try await requireContext(pinnedTo: stores) + await refreshRows(from: try await identitySnapshot(context: context).snapshot, context: context) + } + } catch { + Self.logger.info("🔗 DASHCONNECT :: connections not refreshed — \(error.localizedDescription, privacy: .public)") + } } - /// The key ids this identity's confirmed grant records name. An - /// unconfirmed record's id may belong to another key by now. - private static func recordedKeyIds(of identityId: String, in stores: Stores) -> Set { - Set(stores.grants.load().filter { $0.identityId == identityId && !$0.isUnconfirmed }.flatMap(\.keyIds)) + @discardableResult + func disconnect(id: String, scope: String?, includingUnrecorded: Bool) async throws -> DashConnectDisconnectResult { + try await gated { try await disconnectInTurn(id: id, scope: scope, includingUnrecorded: includingUnrecorded) } } - private func disconnectInTurn(id: String, scope: String?) async throws -> DashConnectDisconnectResult { + private func disconnectInTurn( + id: String, + scope: String?, + includingUnrecorded: Bool + ) async throws -> DashConnectDisconnectResult { guard let stores = await showActiveWalletRows() else { throw DashConnectPlatformError.noWallet } // The row names the wallet it was published for. When that is not // the wallet that is active now, nothing of the row's wallet can be - // turned off from here, and a row this wallet has for the same app - // is not the one that was picked. + // turned off from here. guard scope == stores.scope else { throw DashConnectPlatformError.walletChanged } - let rowIsOneQR = rows(in: stores).first { $0.id == id }?.loginKind == .oneQR - // What can reach Platform: a confirmed grant of the app, and a - // registration of it whose outcome is not known yet. Which of the - // two disconnects runs is settled by the revocation, from a fresh - // view of the identity, not by the row alone. Records of every - // identity of the wallet count: the row is shared, and one held by - // another identity is reported by the revocation. - let hasGrants = stores.grants.load().contains { - $0.appContractId == id && (!$0.isUnconfirmed || $0.submittedRevision != nil) - } - var result = DashConnectDisconnectResult() - if rowIsOneQR || hasGrants { - let revocation = try await revokeAppConnectGrants( - appContractId: id, rowIsOneQR: rowIsOneQR, stores: stores) - // The row stands for the app, and the app still holds a key on - // another identity of this wallet, or may still be given one - // there. That identity's keys can only be read and disabled - // while it is the active one, so the row stays to get there, and - // the user is told; this identity's keys are off. - if let heldElsewhere = revocation.heldElsewhere { throw heldElsewhere } - result = revocation.profileKeys - if revocation.asOneQR { - // The session keys are disabled, and so are the keys of an - // earlier two-QR login that were found: the same QR can no - // longer be approved and there is no second step to wait - // for, so the row goes instead of sitting in the two-QR - // "approved" state. - await updateRows(in: stores) { rows in rows.filter { $0.id != id } } - return result - } - } - - let disconnectedAt = now() - // Local-only for a two-QR connection: its `loginKeyResponse` document - // stays, and re-approving the same `dash-key:` QR returns it to - // `.active` while the identity keys are still registered. - await updateRows(in: stores) { rows in - rows.map { connection in - guard connection.id == id else { return connection } - return DAppConnection( - id: connection.id, - name: connection.name, - url: connection.url, - status: .approved, - updatedAt: disconnectedAt - ) - } + guard let appId = Self.decodeIdentifier(id) else { + throw DashConnectPlatformError.loginContractUnavailable } - return result - } - - /// Whether a disconnect of the app takes the one-QR path. A live session - /// key of a confirmed grant makes it one-QR however the row reads: a row - /// write lost after the grant was confirmed leaves the app's two-QR row - /// in place. So does a confirmed grant not yet recorded as off while no - /// key of the two-QR login is live: a one-QR disconnect that stopped - /// after disabling its keys, those of the two-QR login among them. With - /// a two-QR login key live, that login came after the grant's key went - /// off, and the row is its. So does a registration that may still land: - /// any disable update the one-QR path then sends lands above the - /// revision that registration was built on, after which it can never - /// land. - static func disconnectsAsOneQR( - rowIsOneQR: Bool, - holdsLiveGrantedKey: Bool, - holdsUnrevokedGrant: Bool, - holdsLiveTwoQRLoginKey: Bool, - hasRegistrationThatMayStillLand: Bool - ) -> Bool { - rowIsOneQR || holdsLiveGrantedKey || (holdsUnrevokedGrant && !holdsLiveTwoQRLoginKey) - || hasRegistrationThatMayStillLand - } - - /// What a view of the identity at `identityRevision` tells of an - /// unconfirmed registration. - enum RegistrationOutcome: Equatable { - /// The key is on the identity, live, under the id the registration - /// was submitted with. The same key under another id came from - /// another submission of the request, which has its own record. - case keyLive - /// The identity is at the update's revision or past it without that - /// key live, so the update can never land. - case cannotLand - /// The identity is below the update's revision: the update may still - /// land. - case mayStillLand - /// The record does not note the revision it was submitted with. - case unknownRevision - } - - static func registrationOutcome( - of grant: AppConnectGrant, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], - identityRevision: UInt64 - ) -> RegistrationOutcome { - let isLive = currentIdentityPublicKeys.contains { - UInt32(bitPattern: $0.keyId) == grant.sessionKeyId && $0.disabledAt == nil - && $0.keyType == .ecdsaHash160 && $0.data.toHexString() == grant.unconfirmedKeyHash160 - } - if isLive { return .keyLive } - guard let submitted = grant.submittedRevision else { return .unknownRevision } - guard identityRevision >= submitted else { return .mayStillLand } - return .cannotLand - } - - /// The ids of the keys that registrations which might still land put on - /// the identity after all, read once an update of this disconnect has - /// landed: none of them can land any more, so each key is either live - /// now or never will be. Throws when the read still shows one that - /// could land: the node that answered is behind that update. - static func keyIdsOfRegistrationsThatLanded( - _ registrations: [AppConnectGrant], - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], - identityRevision: UInt64 - ) throws -> [UInt32] { - try registrations.compactMap { registration in - switch registrationOutcome( - of: registration, - currentIdentityPublicKeys: currentIdentityPublicKeys, - identityRevision: identityRevision - ) { - case .keyLive: return registration.sessionKeyId - case .cannotLand: return nil - case .mayStillLand, .unknownRevision: throw DashConnectPlatformError.identityKeysOutOfDate + let row = rows(in: stores).first { $0.id == id } + let openIntents = stores.intents.load().filter { $0.appId == appId && $0.closedAt == nil } + // Keys left over from an earlier disconnect of the app are turned off + // the App Connect way, whatever row is left. + guard !openIntents.isEmpty || row?.loginKind == .oneQR || includingUnrecorded else { + // Local-only for a two-QR connection: its `loginKeyResponse` + // document stays, and re-approving the same `dash-key:` QR returns + // it to `.active` while the identity keys are still registered. + let disconnectedAt = now() + await updateRows(in: stores) { rows in + rows.map { connection in + guard connection.id == id else { return connection } + return DAppConnection( + id: connection.id, name: connection.name, url: connection.url, + status: .approved, updatedAt: disconnectedAt) + } } + return DashConnectDisconnectResult() } - } - /// Why the app's row has to stay for another identity of this wallet, - /// as the error to show, or `nil` when no identity but `identityId` has - /// part in it. A live key there (`heldOnAnotherIdentity` covers the keys - /// no record names) comes first; a registration there that may still - /// land, one with a noted revision, is settled only by a read of that - /// identity, once it is the active one. - static func reasonHeldElsewhere( - grants: [AppConnectGrant], - appContractId: String, - identityId: String, - heldOnAnotherIdentity: Bool - ) -> DashConnectPlatformError? { - let elsewhere = grants.filter { $0.appContractId == appContractId && $0.identityId != identityId } - if heldOnAnotherIdentity || elsewhere.contains(where: { !$0.isUnconfirmed && $0.keyDisabled != true }) { - return .grantOnAnotherIdentity - } - if elsewhere.contains(where: { $0.isUnconfirmed && $0.submittedRevision != nil }) { - return .registrationPendingOnAnotherIdentity - } - return nil - } - - /// Ends the access one-QR logins gave an app: disables its session keys - /// on the identity, then deletes the responses that carried them. - /// - /// The key goes first because it is what the app signs with. A response - /// that could not be deleted afterwards stays recorded, with its key - /// marked disabled, and is retried by the next login with this identity. - /// - /// The keys are the ones recorded here plus the live keys on the identity - /// that are bound to the app's contract and shaped as this login - /// registers them, so the keys a reinstalled wallet kept no record of go - /// too. For a one-QR disconnect that includes the shapes App Connect v2 - /// registers (`AppConnect.appsV2KeyIds`). Every live DashPay profile key - /// no record names goes as well: its bound names no app, so it may be - /// another app's, and it is turned off with any app's disconnect - /// (`AppConnect.sharedProfileKeyIdsToDisable`), only when the disconnect - /// turns off keys of the app's and completes on this identity; what was - /// done with them is returned as `profileKeys`. A key another wallet gave the app in any other - /// shape stays. - /// TODO(app-connect-orphan-responses): the response behind a key with no - /// record stays on Platform. It can only be found by its request hash, - /// which the record held. - /// - /// For a row made by the one-QR login the keys of an earlier two-QR - /// login to the app are disabled as well. That login derives the same keys - /// every time and Platform never re-adds a key, so the app cannot sign - /// in with two QRs again. A two-QR row keeps them. - /// - /// Returns, as `heldElsewhere`, the error to show when a grant record - /// shows the app with a live key on another identity of this wallet, or - /// with a registration there that may still land - /// (`reasonHeldElsewhere`). When this identity gave it none, that is - /// thrown instead, before anything is signed: nothing was turned off, - /// the profile keys included. For a one-QR disconnect that - /// also covers keys on another identity that no grant record names, as - /// far as the wallet's store shows them. `asOneQR` says which disconnect - /// this was. - /// - /// For a row made by the one-QR login, with no record for this identity, - /// the keys are still looked for on it. When it holds none bound to the - /// app, there was nothing to turn off here and the call returns without - /// an error. - /// - /// Which disconnect this is, one-QR or two-QR, is settled after the - /// identity is read again (`disconnectsAsOneQR`) and returned. This - /// identity's registrations of the app whose outcome was not known are - /// settled by that read (`registrationOutcome`): a live key that cannot - /// be confirmed stops the disconnect, one that can never land is - /// dropped, and one that may still land is settled by one more read once - /// a disable update has landed, its key disabled if it turned up; with - /// no key to disable it stops the disconnect. - private func revokeAppConnectGrants( - appContractId: String, - rowIsOneQR: Bool, - stores: Stores - ) async throws -> (heldElsewhere: DashConnectPlatformError?, asOneQR: Bool, profileKeys: DashConnectDisconnectResult) { - // The row was picked in the wallet `stores` belongs to; another - // wallet's identity is not the one the row belongs to. var context = try await requireContext(pinnedTo: stores) - let identityId = context.identityId.toBase58String() - func isGranted(_ grant: AppConnectGrant) -> Bool { - grant.identityId == identityId && grant.appContractId == appContractId - } - // TODO(dashconnect-unconfirmed-row): a registration of the app on - // another identity that does not note its revision (from a build - // before `submittedRevision`) is not counted here. If it lands after - // this disconnect, its key is shown again only by the next one-QR - // approval with that identity. - func hasLiveGrantElsewhere() -> Bool { - Self.reasonHeldElsewhere( - grants: stores.grants.load(), appContractId: appContractId, identityId: identityId, - heldOnAnotherIdentity: false) == .grantOnAnotherIdentity - } - func reasonHeldElsewhere(heldOnAnotherIdentity: Bool = false) -> DashConnectPlatformError? { - Self.reasonHeldElsewhere( - grants: stores.grants.load(), appContractId: appContractId, identityId: identityId, - heldOnAnotherIdentity: heldOnAnotherIdentity) - } - guard let appContract = Self.decodeIdentifier(appContractId) else { - throw DashConnectPlatformError.loginContractUnavailable - } - if !stores.grants.load().contains(where: { - isGranted($0) && (!$0.isUnconfirmed || $0.submittedRevision != nil) - }) { - // Before the PIN prompt, from the store alone: whether this - // identity holds a key of the app's that has no record. - let holdsUnrecordedKey = try rowIsOneQR && Self - .storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) - .contains { $0.singleContractId == appContract && !$0.isDisabled && $0.isSessionKeyShaped } - // A one-QR row goes on to the PIN prompt either way: the keys of - // an earlier two-QR login can only be looked for after it. - if !holdsUnrecordedKey, !rowIsOneQR { - if let heldElsewhere = reasonHeldElsewhere() { throw heldElsewhere } - return (heldElsewhere: nil, asOneQR: false, profileKeys: DashConnectDisconnectResult()) - } + // An intent this build cannot read may name keys of the app that are + // still to land: nothing is turned off until it can be read. + guard !stores.intents.hasUnreadableRows(identityId: context.identityId) else { + throw DashConnectPlatformError.intentsUnreadable + } + var planned = try await disconnectPlan(appId: appId, includingUnrecorded: includingUnrecorded, context: context) + // The PIN is asked for only when there is something to sign. + if !planned.plan.isEmpty { + try await authorize() + context = try await contextAfterAuthorization(matching: context) + // Read again: the prompt can take any time. + planned = try await disconnectPlan(appId: appId, includingUnrecorded: includingUnrecorded, context: context) } - - try await authorize() - context = try await contextAfterAuthorization(matching: context) - + let plan = planned.plan let signer = KeychainSigner(modelContainer: context.modelContainer) - let (currentPublicKeys, revision) = try await refreshedIdentityKeysAndRevision(context: context) - // A registration whose key has turned up is confirmed. - await confirmRegistrations( - identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, - modelContainer: context.modelContainer, in: stores) - // One that has not is settled by its revision. One that does not - // note it takes no part: its key id may belong to another key, and - // its absence says nothing. - // TODO(dashconnect-unconfirmed-row): such a record (from a build - // before `submittedRevision`) whose update lands after this - // disconnect is shown again only by the next one-QR approval with - // this identity. - var mayStillLand: Set = [] - var cannotLand: Set = [] - for grant in stores.grants.load() where isGranted(grant) && grant.isUnconfirmed { - switch Self.registrationOutcome( - of: grant, currentIdentityPublicKeys: currentPublicKeys, identityRevision: revision) { - case .keyLive: - // The key landed live under the record's id but the record - // could not be confirmed: the key store has no readable - // bound for it, or the key differs from what the record says - // was submitted. - Self.logger.error("🔗 DASHCONNECT :: an unconfirmed session key of the app is live, but its record could not be confirmed") - throw DashConnectPlatformError.identityKeysOutOfDate - case .cannotLand: cannotLand.insert(grant.key) - case .mayStillLand: mayStillLand.insert(grant.key) - case .unknownRevision: break - } - } - if !cannotLand.isEmpty { - Self.logger.info("🔗 DASHCONNECT :: dropping \(cannotLand.count, privacy: .public) session key registration(s) that can no longer land") - updateGrants(in: stores) { grants in grants.removeAll { cannotLand.contains($0.key) } } - } - let granted = stores.grants.load().filter { isGranted($0) && !$0.isUnconfirmed } - // The keys the two-QR login derives for this app, known before - // anything is disabled: its authentication key has the kind and the - // bound of a session key. A one-QR row disables both of them; a - // two-QR row keeps them, so there the authentication key is named - // as one to leave. If they cannot be derived, nothing is turned off. - let twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) - let liveTwoQRLoginKeyIds = Self.liveLoginKeyIds( - authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, - encryptionPublicKey: twoQRKeys.encryptionPublicKey, - currentIdentityPublicKeys: currentPublicKeys - ) - let asOneQR = Self.disconnectsAsOneQR( - rowIsOneQR: rowIsOneQR, - holdsLiveGrantedKey: granted.contains { grant in - currentPublicKeys.contains { grant.keyIds.contains(UInt32(bitPattern: $0.keyId)) && $0.disabledAt == nil } - }, - holdsUnrevokedGrant: granted.contains { $0.keyDisabled != true }, - holdsLiveTwoQRLoginKey: !liveTwoQRLoginKeyIds.isEmpty, - hasRegistrationThatMayStillLand: !mayStillLand.isEmpty) - let checksUnrecordedKeys = asOneQR - guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { - // Platform never removes a key, so the node that answered is - // behind. A key it does not know cannot be shown to be disabled, - // so nothing is reported as turned off. - throw DashConnectPlatformError.identityKeysOutOfDate - } - let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) - guard AppConnect.sessionKeyIdsWithUnknownBinding( - for: granted, - bindings: bindings, - currentIdentityPublicKeys: currentPublicKeys - ).isEmpty, AppConnect.boundKeyIdsMissing( - from: currentPublicKeys, - appContractId: appContract, - bindings: bindings - ).isEmpty else { - // A live session key the wallet's store cannot place may be this - // app's, and a stored key of the app's that the fetched list - // lacks means the list is behind. Either way nothing is reported - // as turned off. - throw DashConnectPlatformError.identityKeysOutOfDate - } - var keyIds = AppConnect.sessionKeyIdsToDisable( - for: granted, - appContractId: appContract, - bindings: bindings, - currentIdentityPublicKeys: currentPublicKeys, - twoQRAuthenticationKeyHash160: checksUnrecordedKeys ? nil : twoQRKeys.authenticationPublicKeyHash160 - ) - let recordedKeyIds = Self.recordedKeyIds(of: identityId, in: stores) - if checksUnrecordedKeys { - // The keys of v2 grants whose record is gone. A contract or a - // group they are bound to is the app's if the app's owner owns - // it, which only the network says; if it cannot be read, - // nothing is turned off and the row stays. - let unrecorded = AppConnect.unrecordedV2Keys( - recordedKeyIds: recordedKeyIds, bindings: bindings, currentIdentityPublicKeys: currentPublicKeys) - // The store keeps every key it was ever given, the fetched view - // only what the node answered with. A stored key of the app's - // that the view lacks means the view is behind. - let storedUnrecorded = AppConnect.unrecordedV2Keys(recordedKeyIds: recordedKeyIds, bindings: bindings) - let candidates = AppConnect.unrecordedV2KeyBoundIds( - appContractId: appContract, keys: unrecorded + storedUnrecorded) - let owned = try await Self.ownedByOwner( - of: appContract, contractIds: candidates.contracts, groupIds: candidates.groups, sdk: context.sdk) - let fetchedKeyIds = Set(currentPublicKeys.map { UInt32(bitPattern: $0.keyId) }) - guard AppConnect.appsV2KeyIds( - appContractIds: owned.contracts, appGroupIds: owned.groups, keys: storedUnrecorded - ).allSatisfy(fetchedKeyIds.contains) else { - throw DashConnectPlatformError.identityKeysOutOfDate - } - let unrecordedV2KeyIds = AppConnect.appsV2KeyIds( - appContractIds: owned.contracts, appGroupIds: owned.groups, keys: unrecorded) - keyIds = Array(Set(keyIds).union(liveTwoQRLoginKeyIds).union(unrecordedV2KeyIds)).sorted() - } - if !mayStillLand.isEmpty, keyIds.isEmpty { - // No update would be sent, so nothing settles the registration. - // This identity's own state comes first: whatever another - // identity holds, this one cannot be told to be done. - // TODO(dashconnect-pending-registration): an update that was - // refused, or never sent, cannot be told from one still on its - // way, so this stays until the identity's revision moves or the - // app's code is approved again. Until then the record also holds - // the row for the wallet's other identities - // (`registrationPendingOnAnotherIdentity`). - Self.logger.error("🔗 DASHCONNECT :: a session key registration of the app may still land, and there is no key to disable") - throw DashConnectPlatformError.registrationPending - } - // For a one-QR row, the keys on another identity that no grant - // record shows. `nil` when that could not be told. - let heldOnAnotherIdentity: Bool? = checksUnrecordedKeys && !hasLiveGrantElsewhere() - ? await anotherIdentityHoldsAppKeys(appContractId: appContract, context: context) - : false - if granted.isEmpty, keyIds.isEmpty, - let heldElsewhere = reasonHeldElsewhere(heldOnAnotherIdentity: heldOnAnotherIdentity == true) { - throw heldElsewhere - } - // The DashPay profile keys no record names: their bound does not say - // which app was given them, so they go with the disconnect of any - // app rather than being left on for none to reach. Only with a - // disconnect of an app this identity holds keys or a grant of, that - // ends here: one with nothing of the app's here, or that ends with - // the app held on another identity (or not checked there), leaves - // them. A grant whose keys went in an earlier try that then failed - // still counts, so a retry reaches them. When the set cannot be told - // (a live key no record names whose bound the store cannot read, a - // stored one the view lacks, a record the store cannot read), none - // of them is touched, and the app's own keys still go. - // TODO(app-connect-v2-pending-record): a v2 approval writes its record - // only once its update is seen to land, so the profile key of one whose - // outcome was unknown when it failed has no record and is turned off - // here like any other. - let completesHere = (!keyIds.isEmpty || !granted.isEmpty) && heldOnAnotherIdentity == false - && reasonHeldElsewhere(heldOnAnotherIdentity: false) == nil - var profileKeysOff: [UInt32] = [] - var profileKeysUnchecked = false - if completesHere { - let profileKeyIds: [UInt32]? = stores.grants.hasUnreadableRows(identityId: identityId) - ? nil - : AppConnect.sharedProfileKeyIdsToDisable( - recordedKeyIds: recordedKeyIds, - bindings: bindings, - currentIdentityPublicKeys: currentPublicKeys, - nowMilliseconds: Int64(AppConnect.milliseconds(now()))) - if let profileKeyIds { - profileKeysOff = profileKeyIds.filter { !keyIds.contains($0) } - keyIds = Array(Set(keyIds).union(profileKeysOff)).sorted() - } else { - Self.logger.error("🔗 DASHCONNECT :: DashPay profile keys no record names could not be told; none turned off") - profileKeysUnchecked = true - } - } - if !keyIds.isEmpty { - Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) app key(s)") - // Platform takes a limited number of keys per update. A failure - // part way leaves the rest live and the row in place; the next - // attempt picks up what is still live. - try await disableKeys(keyIds, context: context, signer: signer) - Self.logger.info("🔗 DASHCONNECT :: app key(s) disabled") - // The reload writes the disabled keys to the store. The keys are - // off either way. - if mayStillLand.isEmpty { - _ = try? await refreshedIdentityPublicKeys(context: context) - } - // Each registration that might still land names a revision above - // `revision`, the one below it the identity was already at. The - // update that just landed took one above the identity's revision - // when it was built, at least the revision such a registration - // names, and a revision only grows: none of them can land now. - // One may have landed since `revision` was read, though, and the - // update was built on whatever copy of the identity the SDK held - // by then, which a reload elsewhere may have moved past that - // read: its key is not among `keyIds`. One more read settles - // each of them, and a key that turned up is disabled as well. - // Until then the records and the row stay. - if !mayStillLand.isEmpty { - let (keysAfter, revisionAfter) = try await refreshedIdentityKeysAndRevision(context: context) - let landedKeyIds = try Self.keyIdsOfRegistrationsThatLanded( - stores.grants.load().filter { mayStillLand.contains($0.key) }, - currentIdentityPublicKeys: keysAfter, - identityRevision: revisionAfter) - if !landedKeyIds.isEmpty { - Self.logger.info("🔗 DASHCONNECT :: disabling \(landedKeyIds.count, privacy: .public) session key(s) registered after the identity was read") - try await disableKeys(landedKeyIds.sorted(), context: context, signer: signer) + if !plan.fence.isEmpty || !plan.disable.isEmpty { + try await fenceAndDisable(plan, context: context, signer: signer) + } + let after = plan.fence.isEmpty && plan.disable.isEmpty + ? planned.snapshot + : try await identitySnapshot(context: context).snapshot + + // An intent is done once none of its keys can still be live or land. + let closedAt = now() + updateIntents(in: stores) { intents in + for index in intents.indices + where intents[index].appId == appId && intents[index].identityId == context.identityId + && intents[index].closedAt == nil { + switch AppConnect.status(of: intents[index], in: after) { + case .disconnected, .neverLanded: intents[index].closedAt = closedAt + case .active, .confirming, .expired: break } - updateGrants(in: stores) { grants in grants.removeAll { mayStillLand.contains($0.key) } } } } + if !plan.deleteResponses.isEmpty, let responseContractId = Self.decodeIdentifier(AppConnect.contractId) { + await deleteResponses( + of: plan.deleteResponses, responseContractId: responseContractId, context: context, signer: signer) + } + await refreshRows(from: after, context: context) - // The session keys of the grants read above are now off, and only - // those are marked. - let revoked = Set(granted.map(\.key)) - func isRevoked(_ grant: AppConnectGrant) -> Bool { revoked.contains(grant.key) } - updateGrants(in: stores) { AppConnect.markKeysDisabled(in: &$0, where: isRevoked) } - - if let responseContractId = Self.decodeIdentifier(AppConnect.contractId) { - await deleteAppConnectResponses( - where: isRevoked, - responseContractId: responseContractId, - context: context, - signer: signer - ) + // A key turned off is checked on the read after the update; one that + // still shows live means that read is behind, or a new key landed. + let ownIntents = stores.intents.load().filter { $0.appId == appId && $0.identityId == context.identityId } + guard ownIntents.allSatisfy({ $0.closedAt != nil }) else { + throw DashConnectPlatformError.identityKeysOutOfDate } - if let heldElsewhere = reasonHeldElsewhere(heldOnAnotherIdentity: heldOnAnotherIdentity == true) { - return (heldElsewhere: heldElsewhere, asOneQR: asOneQR, profileKeys: DashConnectDisconnectResult()) + // The app's intents on another identity of this wallet can only be + // reached while that identity is the active one. + if stores.intents.load().contains(where: { + $0.appId == appId && $0.identityId != context.identityId && $0.closedAt == nil + }) { + throw DashConnectPlatformError.grantOnAnotherIdentity } - // This identity's keys are off. Whether another one holds a key of - // the app could not be read from the store, so the row stays, with - // an error rather than without one. - guard heldOnAnotherIdentity != nil else { throw DashConnectPlatformError.otherIdentitiesNotChecked } - return (heldElsewhere: nil, asOneQR: asOneQR, profileKeys: DashConnectDisconnectResult( - profileKeysTurnedOff: profileKeysOff.count, profileKeysUnchecked: profileKeysUnchecked)) + return DashConnectDisconnectResult( + keysTurnedOff: planned.appKeysOff, + unrecordedKeysLeft: includingUnrecorded ? 0 : planned.unrecordedLeft, + keysNotChecked: planned.unplaced) } - /// Disables `keyIds` on the identity, as many per update as Platform + /// What a disconnect of `appId` submits on the active identity, from a + /// fresh read, and how many keys no intent names it leaves when + /// `includingUnrecorded` is off. + private func disconnectPlan( + appId: Data, + includingUnrecorded: Bool, + context: Context + ) async throws -> ( + plan: AppConnect.DisconnectPlan, snapshot: AppConnect.IdentitySnapshot, + appKeysOff: Int, unrecordedLeft: Int, unplaced: Int + ) { + let snapshot = try await identitySnapshot(context: context).snapshot + let all = context.stores.intents.load() + let protected = await twoQRKeys(snapshot, intents: all, context: context).protected + var plan = AppConnect.disconnectPlan( + appId: appId, snapshot: snapshot, intents: all, includeUnrecorded: includingUnrecorded, + protected: protected) + // The same intents as the plan, so the keys counted are the keys it + // would turn off. + let projection = AppConnect.project([snapshot], intents: all, protected: protected) + let unrecordedAppKeys = projection.connections.first { $0.appId == appId }? + .unrecordedKeyIds[context.identityId] ?? [] + // DashPay profile keys no intent names are no one app's. They are + // offered with the disconnect of an app that was given profile + // access. + let profileKeys = AppConnect.usesProfileAccess(all, appId: appId) + ? projection.unrecordedProfileKeyIds[context.identityId] ?? [] + : [] + plan.disable = Array(Set(plan.disable).union(includingUnrecorded ? profileKeys : [])).sorted() + let appKeysOff = plan.disable.count + plan.fence.count + // A fence an earlier try added and could not turn off yet. + let fences = try await liveFenceKeyIds(snapshot: snapshot, intents: all, context: context) + plan.disable = Array(Set(plan.disable).union(fences)).sorted() + return (plan, snapshot, appKeysOff, unrecordedAppKeys.count + profileKeys.count, + projection.unplacedKeyIds[context.identityId]?.count ?? 0) + } + + /// The ids of this wallet's fence keys that are still live: a fence is + /// turned off once it holds its id, and an update that failed in between + /// leaves it on. + private func liveFenceKeyIds( + snapshot: AppConnect.IdentitySnapshot, + intents: [AppConnect.ConnectionIntent], + context: Context + ) async throws -> [UInt32] { + let ids = Set(intents.filter { $0.identityId == snapshot.identityId }.flatMap { $0.authKeys.map(\.id) }) + var live: [UInt32] = [] + for key in snapshot.keys where key.disabledAt == nil && ids.contains(key.id) && key.bound == nil + && key.keyType == .ecdsaHash160 { + let leaf = AppConnect.fenceKeyLeaf(identityId: context.identityId, keyId: key.id) + let (publicKey, derivedPrivateKey) = try await MainActor.run { + let derived = try context.wallet.deriveConnectKey( + subFeature: .sessionAuthentication, identityId: context.identityId, leaf: leaf, network: context.network) + return (derived.publicKeyData, derived.privateKeyData) + } + var privateKey = derivedPrivateKey + Self.zero(&privateKey) + if try KeyExchangeCrypto.hash160(publicKey) == key.data { live.append(key.id) } + } + return live + } + + /// Submits a disconnect: a fence key under each id an intent may still + /// land on, and every key to turn off, as many per update as Platform /// takes. - private func disableKeys(_ keyIds: [UInt32], context: Context, signer: KeychainSigner) async throws { - for start in stride(from: 0, to: keyIds.count, by: AppConnect.maxKeysDisabledPerUpdate) { - try await context.wallet.updateIdentity( - identityId: context.identityId, - disablePublicKeyIds: Array(keyIds[start ..< min(start + AppConnect.maxKeysDisabledPerUpdate, keyIds.count)]), - signer: signer - ) + private func fenceAndDisable( + _ plan: AppConnect.DisconnectPlan, + context: Context, + signer: KeychainSigner + ) async throws { + var fences: [(key: ManagedPlatformWallet.IdentityPubkey, privateKey: Data)] = [] + defer { for index in fences.indices { Self.zero(&fences[index].privateKey) } } + for id in plan.fence { + let leaf = AppConnect.fenceKeyLeaf(identityId: context.identityId, keyId: id) + let (publicKey, derivedPrivateKey) = try await MainActor.run { + let key = try context.wallet.deriveConnectKey( + subFeature: .sessionAuthentication, identityId: context.identityId, leaf: leaf, network: context.network) + return (key.publicKeyData, key.privateKeyData) + } + var privateKey = derivedPrivateKey + defer { Self.zero(&privateKey) } + fences.append((AppConnect.fenceKey(keyId: id, publicKeyHash160: try KeyExchangeCrypto.hash160(publicKey)), + privateKey)) } - } - - /// Whether the wallet's store shows another identity of this wallet with - /// a live key of the app that no grant record names: a session key bound - /// to the app's contract, or a key the two-QR login derives for it. - /// `nil` when no identity shows one and at least one could not be told: - /// its keys are not in the store, a live session-shaped key there has a - /// bound this build cannot read, or its two-QR keys could not be derived. - /// TODO(app-connect-other-identity-keys): the store is as fresh as each - /// identity's last load from Platform, and an identity it does not hold - /// is not seen, so the row can go while such a key is live. - /// The v2 shapes no record names count too (`AppConnect.appsV2KeyIds`), - /// with the contracts and groups the app's owner owns read from - /// Platform; an identity whose read fails cannot be told. - private func anotherIdentityHoldsAppKeys(appContractId: Data, context: Context) async -> Bool? { - let others: [(identityId: Data, identityIndex: UInt32)] - do { - others = try Self.storedWalletIdentities( - walletId: context.wallet.walletId, - network: context.network, - modelContainer: context.modelContainer - ).filter { $0.identityId != context.identityId } - } catch { - Self.logger.error( - "🔗 DASHCONNECT :: other identities not read — \(error.localizedDescription, privacy: .public)") - return nil + Self.logger.info("🔗 DASHCONNECT :: fencing \(fences.count, privacy: .public) key id(s), disabling \(plan.disable.count, privacy: .public) key(s)") + let addBatches = stride(from: 0, to: fences.count, by: AppConnect.maxKeysAddedPerUpdate).map { + Array(fences[$0 ..< min($0 + AppConnect.maxKeysAddedPerUpdate, fences.count)]) } - // One identity that cannot be told does not hide a key found on - // another. - var hasUnknown = false - for other in others { - do { - let bindings = try Self.storedKeyBindings( - identityId: other.identityId.toBase58String(), modelContainer: context.modelContainer) - if AppConnect.holdsLiveSessionKey(appContractId: appContractId, bindings: bindings) { return true } - let otherIdentityId = other.identityId.toBase58String() - let unrecorded = AppConnect.unrecordedV2Keys( - recordedKeyIds: Self.recordedKeyIds(of: otherIdentityId, in: context.stores), - bindings: bindings) - if !unrecorded.isEmpty { - let candidates = AppConnect.unrecordedV2KeyBoundIds(appContractId: appContractId, keys: unrecorded) - let owned = try await Self.ownedByOwner( - of: appContractId, contractIds: candidates.contracts, groupIds: candidates.groups, - sdk: context.sdk) - if !AppConnect.appsV2KeyIds( - appContractIds: owned.contracts, appGroupIds: owned.groups, keys: unrecorded - ).isEmpty { - return true - } - } - // An identity always has keys, so none stored means not - // loaded; and a session-shaped key with an unreadable bound - // may be the app's. - if bindings.isEmpty || bindings.contains(where: { - !$0.isDisabled && ($0.isSessionKeyShaped || $0.isV2AuthKeyShaped) && $0.hasUnreadableBound - }) { - hasUnknown = true - } - // Derive only for an identity that has a live key of either - // two-QR kind at all. - guard bindings.contains(where: { - !$0.isDisabled && ($0.isTwoQRAuthenticationKeyShaped || $0.isTwoQREncryptionKeyShaped) - }) else { continue } - let twoQRKeys = try await twoQRLoginPublicKeys( - appContractId: appContractId, - identityId: other.identityId, - identityIndex: other.identityIndex, - context: context) - if AppConnect.holdsLiveTwoQRLoginKey( - authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, - encryptionPublicKey: twoQRKeys.encryptionPublicKey, - bindings: bindings - ) { - return true - } - } catch { - Self.logger.error( - "🔗 DASHCONNECT :: keys of another identity not checked — \(error.localizedDescription, privacy: .public)") - hasUnknown = true - } + let disableBatches = stride(from: 0, to: plan.disable.count, by: AppConnect.maxKeysDisabledPerUpdate).map { + Array(plan.disable[$0 ..< min($0 + AppConnect.maxKeysDisabledPerUpdate, plan.disable.count)]) } - return hasUnknown ? nil : false - } - - /// The identities the SDK's store attaches to this wallet on `network`. - private static func storedWalletIdentities( - walletId: Data, - network: Network, - modelContainer: ModelContainer - ) throws -> [(identityId: Data, identityIndex: UInt32)] { - let descriptor = FetchDescriptor(predicate: PersistentIdentity.predicate(network: network)) - let modelContext = ModelContext(modelContainer) - // The rows are only readable while their context is alive. - return try withExtendedLifetime(modelContext) { - try modelContext.fetch(descriptor) - .filter { $0.wallet?.walletId == walletId } - .map { ($0.identityId, $0.identityIndex) } + for index in 0 ..< max(addBatches.count, disableBatches.count) { + let add = index < addBatches.count ? addBatches[index] : [] + let disable = index < disableBatches.count ? disableBatches[index] : [] + try await signer.withAdditionalSigningKeys(add.map { ($0.key.pubkeyBytes, $0.privateKey) }) { + try await context.wallet.updateIdentity( + identityId: context.identityId, + addPublicKeys: add.map(\.key), + disablePublicKeyIds: disable, + signer: signer) + } } - } - - /// The public halves of the keys the two-QR login derives for the active - /// identity and an app. - private func twoQRLoginPublicKeys( - appContractId: Data, - context: Context - ) async throws -> (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data) { - try await twoQRLoginPublicKeys( - appContractId: appContractId, - identityId: context.identityId, - identityIndex: context.identityIndex, - context: context) - } - - /// The same for any identity of the active wallet, by its index. - private func twoQRLoginPublicKeys( - appContractId: Data, - identityId: Data, - identityIndex: UInt32, - context: Context - ) async throws -> (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data) { - var derivedMaterial = try await deriveKeyRegistrationMaterial( - appContractId: appContractId, - identityId: identityId, - identityIndex: identityIndex, - context: context) - defer { - Self.zero(&derivedMaterial.loginKey) - Self.zero(&derivedMaterial.authenticationPrivateKey) - Self.zero(&derivedMaterial.encryptionPrivateKey) + // A disabled key still holds its id, so the fences are turned off once + // they are there: none stays able to sign. One left on by a failure + // here is the wallet's own key, limited to one credit. + let fenceIds = fences.map(\.key.keyId) + for start in stride(from: 0, to: fenceIds.count, by: AppConnect.maxKeysDisabledPerUpdate) { + try await context.wallet.updateIdentity( + identityId: context.identityId, + disablePublicKeyIds: Array(fenceIds[start ..< min(start + AppConnect.maxKeysDisabledPerUpdate, fenceIds.count)]), + signer: signer) } - return (derivedMaterial.authenticationPublicKeyHash160, derivedMaterial.encryptionPublicKey) } static func buildLoginKeyResponseDraft( @@ -3194,27 +2541,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } - /// The ids of the two-QR login's keys that are on the identity and not - /// disabled. - static func liveLoginKeyIds( - authenticationPublicKeyHash160: Data, - encryptionPublicKey: Data, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] - ) -> [UInt32] { - currentIdentityPublicKeys - .filter { key in - hasRegisteredAuthenticationKey( - authenticationPublicKeyHash160: authenticationPublicKeyHash160, - currentIdentityPublicKeys: [key] - ) || hasRegisteredEncryptionKey( - encryptionPublicKey: encryptionPublicKey, - currentIdentityPublicKeys: [key] - ) - } - .map { UInt32(bitPattern: $0.keyId) } - .sorted() - } - static func missingKeyRegistrationKeys( _ validated: DashConnectKeyRegistrationValidationResult, currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] @@ -3284,14 +2610,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private static func pinnedStores( walletIdHex: String?, store: any DashConnectStore, - responseStore: any AppConnectResponseStore, + intentStore: any AppConnectIntentStore, endpoint: String? ) -> Stores? { guard let walletIdHex, !walletIdHex.isEmpty else { return nil } return Stores( walletIdHex: walletIdHex, connections: store.pinned(toWalletIdHex: walletIdHex), - grants: responseStore.pinned(toWalletIdHex: walletIdHex), + intents: intentStore.pinned(toWalletIdHex: walletIdHex), endpoint: endpoint) } @@ -3299,7 +2625,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// once; `nil` with no wallet. private func pinnedActiveStores() -> Stores? { Self.pinnedStores( - walletIdHex: activeWalletIdHex(), store: store, responseStore: responseStore, + walletIdHex: activeWalletIdHex(), store: store, intentStore: intentStore, endpoint: networkEndpoint()) } @@ -3431,18 +2757,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - /// The identity's keys as Platform has them now. The SDK's own copy is - /// only replaced when an identity update returns success, so a - /// registration or a disable that landed without confirming is missing - /// from it; deciding from that copy would add the key twice or disable it - /// twice. The reload also replaces the copy the SDK signs the next update - /// against. - private func refreshedIdentityPublicKeys( - context: Context - ) async throws -> [ManagedIdentity.IdentityPublicKeyInfo] { - try await refreshedIdentityKeysAndRevision(context: context).keys - } - /// The identity's keys and revision as Platform has them, both read from /// one copy of the identity. private func refreshedIdentityKeysAndRevision( @@ -3474,11 +2788,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { boundIds: $0.contractBounds ), isDisabled: $0.disabledAt != nil, - isSessionKeyShaped: $0.keyTypeEnum == .ecdsaHash160 - && $0.purposeEnum == .authentication - && $0.securityLevelEnum == .high - && $0.totalBudget != nil - && $0.expiresAt != nil, // A bound of a kind this build reads whose ids or name it // cannot place is as unknown as a kind it does not read. hasUnreadableBound: !AppConnect.isReadableBound( @@ -3489,22 +2798,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { boundIds: $0.contractBounds, documentTypeName: $0.contractBoundsDocumentTypeName ) == nil), - isTwoQRAuthenticationKeyShaped: $0.keyTypeEnum == .ecdsaHash160 - && $0.purposeEnum == .authentication - && $0.securityLevelEnum == .high, - isTwoQREncryptionKeyShaped: $0.keyTypeEnum == .ecdsaSecp256k1 - && $0.purposeEnum == .encryption - && $0.securityLevelEnum == .medium, bound: AppConnect.storedBound( boundsKind: $0.effectiveContractBoundsKind, boundIds: $0.contractBounds, documentTypeName: $0.contractBoundsDocumentTypeName - ), - isV2AuthKeyShaped: $0.keyTypeEnum == .ecdsaHash160 - && $0.purposeEnum == .authentication - && ($0.securityLevelEnum == .high || $0.securityLevelEnum == .critical) - && $0.expiresAt != nil, - expiresAt: $0.expiresAt + ) ) } } @@ -3565,7 +2863,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let stores = Stores( walletIdHex: walletIdHex, connections: store.pinned(toWalletIdHex: walletIdHex), - grants: responseStore.pinned(toWalletIdHex: walletIdHex), + intents: intentStore.pinned(toWalletIdHex: walletIdHex), endpoint: networkEndpoint()) guard await MainActor.run(body: { SwiftDashSDKHost.shared.sdk === sdk }) else { Self.logger.error("🔗 DASHCONNECT :: the SDK runtime changed while its context was read") diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index 7854e82021..37bbe07b2b 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -70,7 +70,7 @@ struct ApproveConnectionSheet: View { // The name above can be one the code or the // contract's owner chose. This id is what the - // approval is for: a one-QR key is bound to it. Shown + // approval is for: the app's keys are bound to it. Shown // in full and selectable, so it can be compared with // the one the app publishes. VStack(alignment: .leading, spacing: 2) { @@ -91,9 +91,9 @@ struct ApproveConnectionSheet: View { reloginNotice(existingConnection) } - // The one-QR login gives the app a key with limits of its - // own, so its terms are spelled out on a repeat sign-in - // too, and when it replaces a two-QR connection. + // An App Connect plan gives the app keys with limits of + // their own, so its terms are spelled out on a repeat + // sign-in too, and when it replaces a two-QR connection. if request.login == .unresolved { Text(NSLocalizedString( "This wallet could not check what this sign-in would give the app.", @@ -116,8 +116,6 @@ struct ApproveConnectionSheet: View { .foregroundColor(.secondaryText) } else if let plan = request.login.grantPlan { appConnectPermissions(plan) - } else if let terms = request.login.sessionKeyTerms { - sessionKeyPermissions(terms) } else if isRelogin { reloginPermissionsSummary } else { @@ -239,43 +237,6 @@ struct ApproveConnectionSheet: View { ) } - /// The one-QR login gives the app a key of its own on the identity, so - /// the sheet names what that key can spend and when it stops working. - private func sessionKeyPermissions(_ terms: AppConnect.SessionKeyTerms) -> some View { - VStack(alignment: .leading, spacing: 20) { - permissions( - granted: [ - NSLocalizedString("See your username", comment: "DashConnect"), - NSLocalizedString("Verify your identity", comment: "DashConnect"), - NSLocalizedString("Act as you in this app without asking each time", comment: "DashConnect one-QR login"), - // Per sign-in: an earlier sign-in to the app keeps its - // own key and limit until the app is disconnected. - String( - format: NSLocalizedString( - "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit.", - comment: "DashConnect one-QR login: the placeholder is an amount with its unit, e.g. 0.05 DASH"), - terms.budgetText - ), - ], - withheld: [ - NSLocalizedString("Your recovery phrase or wallet keys", comment: "DashConnect one-QR login"), - NSLocalizedString("Your Dash balance", comment: "DashConnect one-QR login"), - ] - ) - - Text( - String( - format: NSLocalizedString( - "This access ends after %d days, or when you disconnect the app.", - comment: "DashConnect one-QR login"), - terms.lifetimeDays - ) - ) - .font(.footnote) - .foregroundColor(.secondaryText) - } - } - /// An App Connect request v2: one line per key the app is given, with /// what it can spend and until when, then how old the request is and /// where the wallet returns. A draft: per-binding toggles and budget and @@ -293,8 +254,8 @@ struct ApproveConnectionSheet: View { resolvedAppLabel) }, withheld: [ - NSLocalizedString("Your recovery phrase or wallet keys", comment: "DashConnect one-QR login"), - NSLocalizedString("Your Dash balance", comment: "DashConnect one-QR login"), + NSLocalizedString("Your recovery phrase or wallet keys", comment: "DashConnect App Connect"), + NSLocalizedString("Your Dash balance", comment: "DashConnect App Connect"), NSLocalizedString("Registering names or changing your keys", comment: "DashConnect App Connect v2"), ] ) @@ -571,22 +532,6 @@ private let dashConnectTruncateMiddleCheck: Bool = { ) } -#Preview("Approve One-QR") { - ApproveConnectionSheet( - request: ConnectionRequest( - loginRequest: MockDashConnectDataSource.sampleLoginRequest, - appLabel: "Yappr", - appUrl: "yap.pr", - walletUsername: "dashuser", - walletIdentityId: "5DbLwAxEWR695MsqP4KybNQD5n7CUDWydJYNg63FzUo8", - existingConnection: nil, - login: .oneQR(.current) - ), - onApprove: {}, - onDeny: {} - ) -} - #Preview("Approve Re-Login") { ApproveConnectionSheet( request: ConnectionRequest( diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift index 00ac7e770c..81d7497f45 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift @@ -55,7 +55,9 @@ struct ConnectionRow: View { ConnectionStatusBadge(status: connection.status, updatedAt: connection.updatedAt) .fixedSize(horizontal: true, vertical: false) - if connection.status == .active { + // A confirming connection may get its keys yet: turning it + // off makes sure it never does. + if connection.status != .approved { activeSwitch } } @@ -86,12 +88,13 @@ struct ConnectionRow: View { .frame(maxWidth: .infinity, alignment: .topLeading) } - /// Always reads as on: the row only shows it for an active connection, and - /// only the off direction is reachable from here. What turning it off does - /// depends on the login that made the connection (see - /// `DashConnectDataSource.disconnect`): a one-QR connection has the app's - /// key disabled on the identity and its row removed; a two-QR connection - /// is downgraded to `.approved` locally and the app keeps its keys. + /// Always reads as on: the row shows it for an active or a confirming + /// connection, and only the off direction is reachable from here. What + /// turning it off does depends on the login that made the connection (see + /// `DashConnectDataSource.disconnect`): an App Connect connection has the + /// app's keys turned off on the identity and its row removed; a two-QR + /// connection is downgraded to `.approved` locally and the app keeps its + /// keys. private var activeSwitch: some View { ZStack { SwitchView(isOn: .constant(true)) diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionStatusBadge.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionStatusBadge.swift index 1883126f14..5be4c8e719 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionStatusBadge.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionStatusBadge.swift @@ -53,8 +53,9 @@ struct ConnectionStatusBadge: View { } } - /// Green only once the connection is live; the only other state is - /// `approved`, which reads as neutral blue while it waits for the next scan. + /// Green only once the connection is live; `approved` (waiting for the + /// next scan) and `confirming` (waiting for the network) read as neutral + /// blue. private var dotColor: Color { status == .active ? Color.dash.green : Color.dash.blue } @@ -63,6 +64,8 @@ struct ConnectionStatusBadge: View { switch status { case .approved: return NSLocalizedString("Approved", comment: "DashConnect") + case .confirming: + return NSLocalizedString("Confirming", comment: "DashConnect: an approval whose identity update may still land") case .active: return NSLocalizedString("Active", comment: "DashConnect") } diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 795b6d9b7d..16757b021b 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -66,8 +66,21 @@ struct ConnectionsScreen: View { } .background(Color.primaryBackground) .navigationBarHidden(true) + .task { await viewModel.refreshConnections() } .alert(item: messageBinding) { message in - Alert( + if let connection = message.unrecordedKeysOf { + return Alert( + title: Text(message.title), + message: Text(message.text), + primaryButton: .destructive(Text(NSLocalizedString("Turn them off", comment: "DashConnect"))) { + viewModel.message = nil + viewModel.disconnect(connection, includingUnrecorded: true) + }, + secondaryButton: .cancel(Text(NSLocalizedString("Leave them", comment: "DashConnect"))) { + viewModel.message = nil + }) + } + return Alert( title: Text(message.title), message: Text(message.text), dismissButton: .default(Text(NSLocalizedString("OK", comment: ""))) { @@ -114,9 +127,9 @@ struct ConnectionsScreen: View { onRetry: { viewModel.retryPendingRequest() }, onDeny: { viewModel.denyPendingRequest() } ) - // The one-QR terms make the sheet longer than the fixed height + // An App Connect plan makes the sheet longer than the fixed height // shows; who pays and when access ends must not sit below the fold. - .approveSheetPresentation(isLoading: viewModel.isApproving, isTall: request.login.sessionKeyTerms != nil || request.login.grantPlan != nil) + .approveSheetPresentation(isLoading: viewModel.isApproving, isTall: request.login.grantPlan != nil) } private func tokenPurchaseSheet(for purchase: DashConnectTokenPurchaseRequest) -> some View { diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index e624c7867f..7b62fd9fbc 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -25,10 +25,15 @@ struct ConnectionsScreenMessage: Identifiable, Equatable { enum Kind: String { case error case success + /// A question the user answers from the message itself. + case question } let kind: Kind let text: String + /// A connection the user can also turn its unrecorded keys off for, + /// from the same message. + var unrecordedKeysOf: DAppConnection? = nil var id: String { "\(kind.rawValue):\(text)" @@ -40,6 +45,8 @@ struct ConnectionsScreenMessage: Identifiable, Equatable { return NSLocalizedString("Error", comment: "") case .success: return NSLocalizedString("Success", comment: "DashConnect") + case .question: + return NSLocalizedString("Keys left on your identity", comment: "DashConnect: title of the question after a disconnect") } } } @@ -376,35 +383,58 @@ final class ConnectionsViewModel: ObservableObject { } func disconnect(_ connection: DAppConnection) { - // Disconnecting a one-QR connection signs an identity update, which - // takes seconds. It must not overlap anything else that signs one or - // touches the same records: a second tap, an approval on screen or in - // flight, a request still resolving, a `dash-st:` in progress. + disconnect(connection, includingUnrecorded: false) + } + + /// `includingUnrecorded`: also turn off the live keys of the app, and the + /// DashPay profile keys, that no approval of this wallet names. The user + /// is asked for that separately, after a disconnect left some. + func disconnect(_ connection: DAppConnection, includingUnrecorded: Bool) { + // Disconnecting an App Connect connection signs an identity update, + // which takes seconds. It must not overlap anything else that signs + // one or touches the same records: a second tap, an approval on + // screen or in flight, a request still resolving, a `dash-st:` in + // progress. guard !isDisconnecting, !isProcessingStateTransition, !isApproving, !isApprovingPurchase, - !isResolvingRequest, pendingRequest == nil, pendingTokenPurchase == nil else { return } + !isResolvingRequest, pendingRequest == nil, pendingTokenPurchase == nil else { + // Asked for from the message after a disconnect: say why nothing + // happened rather than nothing. + if includingUnrecorded { + message = ConnectionsScreenMessage( + kind: .error, + text: NSLocalizedString( + "Finish the request on screen, then disconnect the app again.", + comment: "DashConnect: turning off unrecorded keys while another request is in progress")) + } + return + } isDisconnecting = true Task { [weak self] in guard let self else { return } defer { self.isDisconnecting = false } do { - let result = try await self.dataSource.disconnect(id: connection.id, scope: connection.scope) - // What the disconnect did with the DashPay profile keys no - // connection accounts for; said, since they may have been - // another app's. - if result.profileKeysUnchecked { + let result = try await self.dataSource.disconnect( + id: connection.id, scope: connection.scope, includingUnrecorded: includingUnrecorded) + if result.unrecordedKeysLeft > 0 { + let text = result.keysTurnedOff > 0 + ? NSLocalizedString( + "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?", + comment: "DashConnect: after a disconnect that left keys no approval of this wallet names") + : NSLocalizedString( + "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?", + comment: "DashConnect: a disconnect of an app whose keys no approval of this wallet names") self.message = ConnectionsScreenMessage( - kind: .success, - text: NSLocalizedString( - "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off.", - comment: "DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart")) - } else if result.profileKeysTurnedOff > 0 { + kind: .question, + text: String.localizedStringWithFormat(text, result.unrecordedKeysLeft), + unrecordedKeysOf: connection) + } else if result.keysNotChecked > 0 { self.message = ConnectionsScreenMessage( kind: .success, text: String.localizedStringWithFormat( NSLocalizedString( - "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d.", - comment: "DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off"), - result.profileKeysTurnedOff)) + "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them.", + comment: "DashConnect: after a disconnect that found keys whose app is not known yet"), + result.keysNotChecked)) } } catch { self.message = ConnectionsScreenMessage( @@ -416,6 +446,15 @@ final class ConnectionsViewModel: ObservableObject { } } + /// Reads the active identity again when the screen shows, so a + /// connection whose update landed or was turned off elsewhere shows as it + /// is. Skipped while anything else is running. + func refreshConnections() async { + guard !featureUnavailable, !isDisconnecting, !isApproving, !isApprovingPurchase, + !isProcessingStateTransition else { return } + await dataSource.refreshConnections() + } + func removeConnection(_ connection: DAppConnection) { Task { await dataSource.remove(id: connection.id, scope: connection.scope) diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index cb1138f005..535c40a9ed 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "تم تسجيل ”%@“. هل تريد إرسال طلب جهة اتصال إلى الشخص الذي دعاك؟"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 0997874e63..0826135ca6 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ беше регистрирано. Да се изпрати ли заявка за контакт до човека, който ви покани?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index fe271fe9ce..17495379b6 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» s'ha registrat. Vols enviar una sol·licitud de contacte a la persona que t'ha convidat?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index ea46780ece..3f9800214e 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ bylo zaregistrováno. Poslat žádost o kontakt osobě, která vás pozvala?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 541ef20bd6..966f2638c2 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” er blevet registreret. Vil du sende en kontaktanmodning til den person, der inviterede dig?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 5efea37d2d..43525d617e 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ wurde registriert. Möchtest du der Person, die dich eingeladen hat, eine Kontaktanfrage senden?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index f7ed9d59b2..efb710a39d 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "Το «%@» καταχωρίστηκε. Να σταλεί αίτημα επαφής στο άτομο που σας προσκάλεσε;"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index a4a0bbfe05..c2a26e1e1c 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6108,18 +6108,54 @@ "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; -/* Wallet preparation and support */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; @@ -6201,8 +6237,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6589,8 +6623,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 85e149cdfb..2d09a2402b 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ estis registrita. Ĉu sendi kontaktpeton al la persono kiu vin invitis?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index a9f3fdfa0c..0147d6b5ce 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» se ha registrado. ¿Quieres enviar una solicitud de contacto a la persona que te invitó?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 4647c289e1..f847ce4653 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ on registreeritud. Kas saata kontaktitaotlus inimesele, kes sind kutsus?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index a2adeaa4b4..a6a6d12997 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» ثبت شد. برای کسی که شما را دعوت کرده درخواست تماس فرستاده شود؟"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 837e4bc388..53c8dd7ddc 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "”%@” on rekisteröity. Lähetetäänkö yhteyspyyntö sinut kutsuneelle henkilölle?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index ebb45da784..db2be784a1 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "Nairehistro na ang “%@”. Magpadala ng kahilingan sa pakikipag-ugnay sa taong nag-imbita sa iyo?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 0abe6dbd2a..0d3fffee58 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "« %@ » a été enregistré. Envoyer une demande de contact à la personne qui vous a invité ?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 09f233575b..53be6d82e8 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ je registrirano. Poslati zahtjev za kontakt osobi koja vas je pozvala?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index e57a4afc68..c71b686514 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "A(z) „%@” regisztrálva. Küldesz kapcsolatkérést annak, aki meghívott?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 869c1c1056..5ed9450ea7 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” telah terdaftar. Kirim permintaan kontak ke orang yang mengundang Anda?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 84f1c833bd..f34ec3f078 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» è stato registrato. Vuoi inviare una richiesta di contatto alla persona che ti ha invitato?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index f254730250..322aee1c0f 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "「%@」が登録されました。招待してくれた相手に連絡先リクエストを送りますか?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index f45ea73914..1314e8cd97 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@”이(가) 등록되었습니다. 초대해 준 사람에게 연락처 요청을 보낼까요?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 73c3d17f75..59952e44ec 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ е регистрирано. Да се испрати барање за контакт до лицето што ве покани?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 6264633bdc..b822b88e86 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” telah didaftarkan. Hantar permintaan kenalan kepada orang yang menjemput anda?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 66c0040f27..b3075b78ad 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» er registrert. Vil du sende en kontaktforespørsel til personen som inviterte deg?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 97bcfe25c9..6dbd2b724e 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” is geregistreerd. Wil je een contactverzoek sturen naar de persoon die je heeft uitgenodigd?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 5412a6055c..ad14444bcf 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@” zostało zarejestrowane. Wysłać zaproszenie do kontaktów osobie, która Cię zaprosiła?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 4e9bb5f04a..883ac963ed 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” foi registrado. Enviar uma solicitação de contato para a pessoa que convidou você?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 0e8230a88c..161287742b 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@” a fost înregistrat. Trimiți o cerere de contact persoanei care te-a invitat?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 703eeb7fe7..8297803ec3 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» зарегистрировано. Отправить запрос на добавление в контакты человеку, который вас пригласил?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index a7d6c4a93a..54f8ce3738 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ bolo zaregistrované. Poslať žiadosť o kontakt osobe, ktorá vás pozvala?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 3bf497d86f..18241d761c 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "»%@« je bilo registrirano. Želite poslati zahtevo za stik osebi, ki vas je povabila?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 064983e5b7..1042ed20ec 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "»%@« je bilo registrirano. Želite poslati zahtevo za stik osebi, ki vas je povabila?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 9041bb4e67..57627c8954 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ u regjistrua. Të dërgohet një kërkesë kontakti te personi që ju ftoi?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 06e89b8d00..d4aa9ee62a 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ je registrovano. Poslati zahtev za kontakt osobi koja vas je pozvala?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index e447a0a5d6..452919fc30 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "”%@” har registrerats. Vill du skicka en kontaktförfrågan till personen som bjöd in dig?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 7de13d1468..bbf1cd097c 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "ลงทะเบียน “%@” แล้ว ต้องการส่งคำขอการติดต่อไปยังคนที่เชิญคุณไหม"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index ff12c142f1..7aaec1b600 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” kaydedildi. Sizi davet eden kişiye bir iletişim isteği gönderilsin mi?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 371fa76fd0..9fe02cf9a0 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» зареєстровано. Надіслати запит на додавання до контактів людині, яка вас запросила?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index bff79a1f94..1ecd5e15ab 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” đã được đăng ký. Gửi yêu cầu liên hệ tới người đã mời bạn chứ?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index aec64335b4..cffd04b014 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@”已注册。要向邀请您的人发送联系人请求吗?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 911d3caa59..9d4569db67 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6210,24 +6210,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "「%@」已註冊。要向邀請您的人發送聯繫請求嗎?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6298,8 +6334,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6813,8 +6847,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index b7a3fb65a3..1500911dda 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@”已注册。要向邀请您的人发送联系人请求吗?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 4f0dda2804..22ee428be9 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6208,24 +6208,60 @@ /* DashPay Invitations */ "“%@” has been registered. Send a contact request to the person who invited you?" = "「%@」已註冊。要向邀請您的人發送聯繫請求嗎?"; -/* DashPay username registration recovery */ -"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; + +/* DashConnect: an approval whose identity update may still land */ +"Confirming" = "Confirming"; + +/* DashConnect */ +"Leave them" = "Leave them"; + +/* DashConnect */ +"Turn them off" = "Turn them off"; + +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; + +/* DashConnect App Connect v2 */ +"This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; + +/* DashConnect App Connect v2 */ +"This app asks for more keys than one approval can add. Ask the app to ask for fewer." = "This app asks for more keys than one approval can add. Ask the app to ask for fewer."; + +/* DashConnect */ +"This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again." = "This wallet holds DashConnect records a newer version wrote. Update the wallet, then try again."; + +/* DashConnect */ +"This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; + +/* DashConnect: after a disconnect that left keys no approval of this wallet names */ +"Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; + +/* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ +"This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; + +/* DashConnect: turning off unrecorded keys while another request is in progress */ +"Finish the request on screen, then disconnect the app again." = "Finish the request on screen, then disconnect the app again."; + +/* DashConnect */ +"The network answered with an older copy of your identity. Try again in a moment." = "The network answered with an older copy of your identity. Try again in a moment."; + +/* DashConnect: title of the question after a disconnect */ +"Keys left on your identity" = "Keys left on your identity"; + +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; -"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; -"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; -"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; -"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; @@ -6296,8 +6332,6 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; -"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; -"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; @@ -6811,8 +6845,4 @@ /* Usernames: confirm the funding source */ "Nothing was sent" = "Nothing was sent"; -/* DashConnect: after a disconnect, how many unattributed DashPay profile keys were also turned off */ -"Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d." = "Disconnected. DashPay profile keys not linked to any connection were turned off as well: %d."; -/* DashConnect: after a disconnect whose unattributed DashPay profile keys could not be told apart */ -"Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off." = "Disconnected. DashPay profile keys not linked to any connection could not be checked, so none of them was turned off."; diff --git a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift new file mode 100644 index 0000000000..4d2c28aeab --- /dev/null +++ b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift @@ -0,0 +1,533 @@ +import Foundation +import XCTest +@testable import dashpay +@testable import SwiftDashSDK + +/// The App Connect projection: intents against one read of the identity +/// (`AppConnectProjection.swift`). +final class AppConnectProjectionTests: XCTestCase { + private typealias Key = AppConnect.IntendedKey + private typealias Intent = AppConnect.ConnectionIntent + private typealias Snapshot = AppConnect.IdentitySnapshot + + private static let identity = Data(repeating: 0x01, count: 32) + private static let otherIdentity = Data(repeating: 0x02, count: 32) + private static let app = Data(repeating: 0xA1, count: 32) + private static let otherApp = Data(repeating: 0xA2, count: 32) + private static let appGroup = Data(repeating: 0xB1, count: 32) + private static let dashPay = Data.identifier(fromBase58: AppConnect.dashPayContractId)! + private static let now: UInt64 = 1_800_000_000_000 + + private static func authKey( + _ id: UInt32, data: UInt8? = nil, bound: AppConnect.StoredBound? = .singleContract(app), expiresAt: UInt64? = now + 1000 + ) -> Key { + Key(id: id, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, + data: Data(repeating: data ?? UInt8(truncatingIfNeeded: id), count: 20), readOnly: false, bound: bound, + totalBudget: 1000, expiresAt: expiresAt) + } + + private static func encryptionKey(_ id: UInt32) -> Key { + Key(id: id, purpose: .encryption, securityLevel: .medium, keyType: .ecdsaSecp256k1, + data: Data(repeating: UInt8(id), count: 33), readOnly: false, bound: .singleContract(app), + totalBudget: nil, expiresAt: nil) + } + + /// The key as Platform shows it once its update landed. + private static func onPlatform( + _ key: Key, disabledAt: UInt64? = nil, boundKnown: Bool = true, data: Data? = nil + ) -> AppConnect.PlatformKey { + AppConnect.PlatformKey( + id: key.id, purpose: key.purpose, securityLevel: key.securityLevel, keyType: key.keyType, + data: data ?? key.data, readOnly: key.readOnly, bound: boundKnown ? key.bound : nil, + boundKnown: boundKnown, totalBudget: key.totalBudget, expiresAt: key.expiresAt, disabledAt: disabledAt) + } + + private static func intent( + _ keys: [Key], app: Data = app, identity: Data = identity, published: Bool = false, createdAt: TimeInterval = 0 + ) -> Intent { + Intent( + id: UUID(), identityId: identity, appId: app, appLabel: "App", appUrl: "", requestHash: Data(repeating: 0xEE, count: 20), + connectionId: nil, keys: keys, sentEncryptionKeyIds: [], disables: [], + response: AppConnect.ResponseValues(appEphemeralPubKeyHash: "ee", walletEphemeralPubKey: "02", encryptedPayload: "00"), + responseDocumentId: published ? Data(repeating: 0xDD, count: 32) : nil, responseRemoved: !published, createdAt: Date(timeIntervalSince1970: createdAt), closedAt: nil) + } + + private static func snapshot( + _ keys: [AppConnect.PlatformKey], identity: Data = identity, revision: UInt64 = 5, time: UInt64? = now + ) -> Snapshot { + Snapshot(identityId: identity, revision: revision, keys: keys, platformTime: time) + } + + // MARK: Status of one intent + + func testStatusOfAnIntentFollowsItsAuthKeysOnPlatform() { + let a = Self.authKey(10), b = Self.authKey(11) + let intent = Self.intent([a, b, Self.encryptionKey(12)]) + let expired = Self.authKey(10, expiresAt: Self.now - 1) + let cases: [(String, [AppConnect.PlatformKey], AppConnect.IntentStatus)] = [ + ("nothing there yet", [], .confirming), + ("all there", [Self.onPlatform(a), Self.onPlatform(b)], .active(expiresAt: Self.now + 1000)), + ("one there, one missing", [Self.onPlatform(a)], .active(expiresAt: Self.now + 1000)), + ("one id taken by another key", [Self.onPlatform(a, data: Data(repeating: 9, count: 20))], .neverLanded), + ("taken id wins over a live key", [Self.onPlatform(a), Self.onPlatform(b, data: Data(repeating: 9, count: 20))], .neverLanded), + ("all off", [Self.onPlatform(a, disabledAt: 1), Self.onPlatform(b, disabledAt: 1)], .disconnected), + ("one off, one missing", [Self.onPlatform(a, disabledAt: 1)], .confirming), + ("expired by Platform time", [Self.onPlatform(expired), Self.onPlatform(b, disabledAt: 1)], .expired), + ] + for (name, keys, expected) in cases { + XCTAssertEqual(AppConnect.status(of: intent, in: Self.snapshot(keys)), expected, name) + } + } + + func testAKeyIsNeverJudgedExpiredWithoutPlatformTime() { + let key = Self.authKey(10, expiresAt: 1) + let intent = Self.intent([key]) + XCTAssertEqual( + AppConnect.status(of: intent, in: Self.snapshot([Self.onPlatform(key)], time: nil)), + .active(expiresAt: 1)) + } + + func testABoundTheStoreDoesNotKnowYetDoesNotMakeTheKeyAnother() { + let key = Self.authKey(10) + let intent = Self.intent([key]) + XCTAssertEqual( + AppConnect.status(of: intent, in: Self.snapshot([Self.onPlatform(key, boundKnown: false)])), + .active(expiresAt: Self.now + 1000)) + } + + func testAKnownOtherBoundMeansTheIdIsHeldByAnotherKey() { + let key = Self.authKey(10) + var other = Self.onPlatform(Self.authKey(10, bound: .singleContract(Self.otherApp))) + other = AppConnect.PlatformKey( + id: other.id, purpose: other.purpose, securityLevel: other.securityLevel, keyType: other.keyType, + data: key.data, readOnly: false, bound: other.bound, boundKnown: true, + totalBudget: other.totalBudget, expiresAt: other.expiresAt, disabledAt: nil) + XCTAssertEqual(AppConnect.status(of: Self.intent([key]), in: Self.snapshot([other])), .neverLanded) + } + + func testChangedLimitsAreTheSameKey() { + let key = Self.authKey(10) + let raised = AppConnect.PlatformKey( + id: 10, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: key.data, + readOnly: false, bound: key.bound, boundKnown: true, totalBudget: 5000, expiresAt: Self.now + 9000, + disabledAt: nil) + XCTAssertEqual(AppConnect.status(of: Self.intent([key]), in: Self.snapshot([raised])), .active(expiresAt: Self.now + 9000)) + } + + // MARK: Projection + + func testAnAppShowsTheStatusTheUserCanActOnFirst() { + let old = Self.intent([Self.authKey(10)], createdAt: 1) + let new = Self.intent([Self.authKey(11)], createdAt: 2) + let projection = AppConnect.project( + [Self.snapshot([Self.onPlatform(Self.authKey(10))])], intents: [old, new]) + XCTAssertEqual(projection.connections.count, 1) + XCTAssertEqual(projection.connections[0].status, .active(expiresAt: Self.now + 1000)) + XCTAssertEqual(projection.connections[0].intents.map(\.id), [new.id, old.id]) + } + + func testIntentsOnSeveralIdentitiesMakeOneConnection() { + let first = Self.intent([Self.authKey(10)]) + let second = Self.intent([Self.authKey(10)], identity: Self.otherIdentity) + let projection = AppConnect.project( + [Self.snapshot([]), Self.snapshot([Self.onPlatform(Self.authKey(10))], identity: Self.otherIdentity)], + intents: [first, second]) + XCTAssertEqual(projection.connections.map(\.status), [.active(expiresAt: Self.now + 1000)]) + } + + func testALiveAppKeyNoIntentNamesIsShownUnderItsApp() { + let group = Self.authKey(10, bound: .contractGroup(Self.appGroup)) + let intent = Self.intent([group]) + let stray = Self.onPlatform(Self.authKey(20, bound: .contractGroup(Self.appGroup))) + let projection = AppConnect.project([Self.snapshot([Self.onPlatform(group, disabledAt: 1), stray])], intents: [intent]) + XCTAssertEqual(projection.connections.count, 1) + XCTAssertEqual(projection.connections[0].appId, Self.app) + XCTAssertEqual(projection.connections[0].unrecordedKeyIds, [Self.identity: [20]]) + XCTAssertEqual(projection.connections[0].status, .active(expiresAt: nil)) + } + + func testALiveKeyOfAnAppWithNoIntentMakesItsOwnConnection() { + let stray = Self.onPlatform(Self.authKey(20, bound: .singleContract(Self.otherApp))) + let projection = AppConnect.project([Self.snapshot([stray])], intents: []) + XCTAssertEqual(projection.connections.map(\.appId), [Self.otherApp]) + XCTAssertEqual(projection.connections[0].unrecordedKeyIds, [Self.identity: [20]]) + } + + func testAProfileKeyNoIntentNamesIsNoAppsAndADisabledOneIsNotShown() { + let profile = Self.authKey(20, bound: .documentType(contractId: Self.dashPay, name: "profile")) + let off = Self.authKey(21, bound: .singleContract(Self.otherApp)) + let projection = AppConnect.project( + [Self.snapshot([Self.onPlatform(profile), Self.onPlatform(off, disabledAt: 1)])], intents: []) + XCTAssertTrue(projection.connections.isEmpty) + XCTAssertEqual(projection.unrecordedProfileKeyIds, [Self.identity: [20]]) + } + + func testAKeyAStoreCannotBindIsNotGuessedToBeAnApps() { + let unknown = Self.onPlatform(Self.authKey(20), boundKnown: false) + XCTAssertEqual(AppConnect.project([Self.snapshot([unknown])], intents: []).connections, []) + } + + // MARK: Snapshots + + func testAReadBehindOneAlreadySeenIsDropped() { + let newest = Self.snapshot([], revision: 7) + XCTAssertFalse(Self.snapshot([], revision: 6).mayReplace(newest)) + XCTAssertTrue(Self.snapshot([], revision: 7).mayReplace(newest)) + XCTAssertTrue(Self.snapshot([], revision: 1).mayReplace(nil)) + XCTAssertTrue(Self.snapshot([], identity: Self.otherIdentity, revision: 1).mayReplace(newest)) + } + + // MARK: Key ids + + func testNewIdsSkipEveryIdAnIntentMayStillLandOn() { + let pending = Self.intent([Self.authKey(14), Self.encryptionKey(15)]) + let elsewhere = Self.intent([Self.authKey(40)], identity: Self.otherIdentity) + let ids = AppConnect.newKeyIds( + count: 2, snapshot: Self.snapshot([Self.onPlatform(Self.authKey(3))]), intents: [pending, elsewhere]) + XCTAssertEqual(ids, [16, 17]) + } + + func testNewIdsTakeTheLowestFreeOnesOnceTheTopIsReached() { + let top = Self.onPlatform(Self.authKey(UInt32.max - 1)) + XCTAssertEqual(AppConnect.newKeyIds(count: 1, snapshot: Self.snapshot([top]), intents: []), [UInt32.max]) + let low = [Self.onPlatform(Self.authKey(0)), top] + let pending = Self.intent([Self.authKey(1)]) + XCTAssertEqual(AppConnect.newKeyIds(count: 2, snapshot: Self.snapshot(low), intents: [pending]), [2, 3]) + } + + // MARK: Disconnect + + func testADisconnectTurnsOffWhatIsThereAndFencesWhatMayStillLand() { + let landed = Self.intent([Self.authKey(10), Self.authKey(11)], published: true) + let waiting = Self.intent([Self.authKey(12), Self.authKey(13)]) + let dead = Self.intent([Self.authKey(14)]) + let expired = Self.authKey(11, expiresAt: Self.now - 1) + let snapshot = Self.snapshot([ + Self.onPlatform(Self.authKey(10)), Self.onPlatform(expired), + Self.onPlatform(Self.authKey(14), data: Data(repeating: 9, count: 20)), + ]) + let plan = AppConnect.disconnectPlan( + appId: Self.app, snapshot: snapshot, intents: [landed, waiting, dead], includeUnrecorded: false) + XCTAssertEqual(plan.disable, [10, 11]) + XCTAssertEqual(plan.fence, [12]) + XCTAssertEqual(plan.deleteResponses, [landed.id]) + } + + func testAPartlyLandedIntentIsFencedOnlyWhileAKeyIsMissing() { + let intent = Self.intent([Self.authKey(10), Self.authKey(11)]) + let plan = AppConnect.disconnectPlan( + appId: Self.app, snapshot: Self.snapshot([Self.onPlatform(Self.authKey(10))]), intents: [intent], + includeUnrecorded: false) + XCTAssertEqual(plan.disable, [10]) + XCTAssertEqual(plan.fence, [11]) + } + + func testUnrecordedAppKeysAreTurnedOffOnlyWhenTheUserSaysSo() { + let intent = Self.intent([Self.authKey(10)]) + let stray = Self.onPlatform(Self.authKey(20)) + let snapshot = Self.snapshot([Self.onPlatform(Self.authKey(10)), stray]) + XCTAssertEqual( + AppConnect.disconnectPlan(appId: Self.app, snapshot: snapshot, intents: [intent], includeUnrecorded: false).disable, + [10]) + XCTAssertEqual( + AppConnect.disconnectPlan(appId: Self.app, snapshot: snapshot, intents: [intent], includeUnrecorded: true).disable, + [10, 20]) + } + + func testADisconnectLeavesOtherAppsAndOtherIdentitiesAlone() { + let mine = Self.intent([Self.authKey(10)]) + let otherApps = Self.intent([Self.authKey(11)], app: Self.otherApp) + let otherIdentity = Self.intent([Self.authKey(12)], identity: Self.otherIdentity) + let snapshot = Self.snapshot([Self.onPlatform(Self.authKey(10)), Self.onPlatform(Self.authKey(11))]) + let plan = AppConnect.disconnectPlan( + appId: Self.app, snapshot: snapshot, intents: [mine, otherApps, otherIdentity], includeUnrecorded: false) + XCTAssertEqual(plan, AppConnect.DisconnectPlan(disable: [10])) + } + + // MARK: Store + + func testAnIntentRoundTripsThroughJSON() throws { + let intent = Self.intent([ + Self.authKey(10, bound: .documentType(contractId: Self.dashPay, name: "profile")), + Self.authKey(11, bound: .contractGroup(Self.appGroup)), Self.encryptionKey(12), + ]) + let decoded = try JSONDecoder().decode(Intent.self, from: JSONEncoder().encode(intent)) + XCTAssertEqual(decoded, intent) + } + + // MARK: Intent store + + private func intentStore(_ scope: @escaping () -> String?) -> (UserDefaultsAppConnectIntentStore, UserDefaults) { + let suite = "AppConnectProjectionTests.\(UUID().uuidString)" + let defaults = UserDefaults(suiteName: suite)! + addTeardownBlock { defaults.removePersistentDomain(forName: suite) } + return (UserDefaultsAppConnectIntentStore(defaults: defaults, network: .testnet, scopeKeyProvider: scope), defaults) + } + + func testAPinnedHandedInScopeDoesNotFollowItsProvider() { + var scope: String? = "scope-a" + let (store, _) = intentStore { scope } + let intent = Self.intent([Self.authKey(6)]) + + let pinned = store.pinned(toWalletIdHex: "wallet-a") + scope = "scope-b" + pinned.save([intent]) + + XCTAssertEqual(store.load(), []) + scope = "scope-a" + XCTAssertEqual(store.load(), [intent]) + } + + func testARowThisBuildCannotReadIsKeptAndCountsForItsIdentity() throws { + let (store, defaults) = intentStore { "scope" } + let intent = Self.intent([Self.authKey(6)]) + store.save([intent]) + let key = "scope.app-connect-intents.v1" + var rows = try XCTUnwrap(JSONSerialization.jsonObject(with: XCTUnwrap(defaults.data(forKey: key))) as? [Any]) + rows.append(["identityId": Self.identity.base64EncodedString(), "future": true]) + defaults.set(try JSONSerialization.data(withJSONObject: rows), forKey: key) + + XCTAssertEqual(store.load(), [intent]) + XCTAssertTrue(store.hasUnreadableRows(identityId: Self.identity)) + XCTAssertFalse(store.hasUnreadableRows(identityId: Self.otherIdentity)) + store.save([]) + XCTAssertTrue(store.hasUnreadableRows(identityId: Self.identity), "an unreadable row is never dropped") + } + + func testAStoredValueThatIsNotARowListIsNeverReplaced() { + let (store, defaults) = intentStore { "scope" } + defaults.set("not a list", forKey: "scope.app-connect-intents.v1") + XCTAssertFalse(store.canPersist) + store.save([Self.intent([Self.authKey(6)])]) + XCTAssertEqual(defaults.string(forKey: "scope.app-connect-intents.v1"), "not a list") + } + + // MARK: Rows + + func testRowsFollowTheProjectionAndLeaveTwoQRRowsAlone() { + let twoQR = DAppConnection(id: "two-qr", name: "Old", url: "", status: .approved, updatedAt: Date(timeIntervalSince1970: 1)) + let gone = DAppConnection( + id: Self.otherApp.toBase58String(), name: "Gone", url: "", status: .active, + updatedAt: Date(timeIntervalSince1970: 1), loginKind: .oneQR) + let confirming = Self.intent([Self.authKey(10)]) + let projection = AppConnect.project([Self.snapshot([])], intents: [confirming]) + let rows = PlatformDashConnectDataSource.rows( + [twoQR, gone], after: projection, intents: [], at: Date(timeIntervalSince1970: 2)) + XCTAssertEqual(rows.map(\.id), ["two-qr", Self.app.toBase58String()]) + XCTAssertEqual(rows.last?.status, .confirming) + XCTAssertEqual(rows.last?.name, "App") + XCTAssertEqual(rows.last?.loginKind, .oneQR) + } + + func testAnAppConnectRowHeldByAnotherIdentityStays() { + let row = DAppConnection( + id: Self.otherApp.toBase58String(), name: "Elsewhere", url: "", status: .active, + updatedAt: Date(timeIntervalSince1970: 1), loginKind: .oneQR) + let elsewhere = Self.intent([Self.authKey(10)], app: Self.otherApp, identity: Self.otherIdentity) + let rows = PlatformDashConnectDataSource.rows( + [row], after: AppConnect.project([Self.snapshot([])], intents: []), intents: [elsewhere], + at: Date(timeIntervalSince1970: 2)) + XCTAssertEqual(rows, [row]) + } + + // MARK: Retry + + private static func plan(budget: UInt64? = 1000, expiresAt: UInt64 = now + 1000, critical: Bool = false) -> AppConnect.GrantPlan { + let binding = AppConnectRequest.AuthBinding( + kind: .singleContract, securityLevel: critical ? .critical : .high, id: app, + totalBudget: budget, expiresAt: expiresAt, documentTypeName: nil) + return AppConnect.GrantPlan( + appId: app, appEphemeralPubKeyHash: Data(repeating: 0xEE, count: 20), + auth: [AppConnect.AuthGrant(bindingIndex: 0, binding: binding, totalBudget: budget, expiresAt: expiresAt)], + encryption: [], connectionId: nil, identityHint: nil, createdAt: 0, callbackHost: nil) + } + + func testARetrySubmitsTheIntentOnlyWithinWhatIsApprovedNow() { + let intent = Self.intent([Self.authKey(10)]) + XCTAssertTrue(AppConnect.isWithinPlan(intent, Self.plan())) + XCTAssertTrue(AppConnect.isWithinPlan(intent, Self.plan(expiresAt: Self.now + 5000)), "a later expiry now still covers it") + XCTAssertFalse(AppConnect.isWithinPlan(intent, Self.plan(expiresAt: Self.now + 10)), "it would outlive what is approved now") + XCTAssertFalse(AppConnect.isWithinPlan(intent, Self.plan(budget: 500))) + XCTAssertFalse(AppConnect.isWithinPlan(intent, Self.plan(critical: true))) + } + + // MARK: Fence + + func testAFenceKeyIsTheSameOnEveryTryAndDiffersPerId() { + let first = AppConnect.fenceKeyLeaf(identityId: Self.identity, keyId: 7) + XCTAssertEqual(first, AppConnect.fenceKeyLeaf(identityId: Self.identity, keyId: 7)) + XCTAssertNotEqual(first, AppConnect.fenceKeyLeaf(identityId: Self.identity, keyId: 8)) + XCTAssertNotEqual(first, AppConnect.fenceKeyLeaf(identityId: Self.otherIdentity, keyId: 7)) + let key = AppConnect.fenceKey(keyId: 7, publicKeyHash160: Data(repeating: 1, count: 20)) + XCTAssertEqual(key.keyId, 7) + XCTAssertEqual(key.purpose, .authentication) + XCTAssertNil(key.contractBounds) + } + + func testAnIntendedKeyIsSubmittedExactlyAsRecorded() { + let key = Self.authKey(10, bound: .documentType(contractId: Self.dashPay, name: "profile")) + let submitted = AppConnect.identityPubkey(of: key) + XCTAssertEqual(submitted.keyId, 10) + XCTAssertEqual(submitted.pubkeyBytes, key.data) + XCTAssertEqual(submitted.contractBounds, .singleContractDocumentType(id: Self.dashPay, documentTypeName: "profile")) + XCTAssertEqual(submitted.totalBudget, key.totalBudget) + XCTAssertEqual(submitted.expiresAt, key.expiresAt) + } + + // MARK: Review fixes + + func testATwoQRKeyIsNeverOfferedForTurningOff() { + let twoQR = Self.authKey(20) + let snapshot = Self.snapshot([Self.onPlatform(twoQR)]) + let projection = AppConnect.project([snapshot], intents: [], protected: [twoQR.data]) + XCTAssertTrue(projection.connections.isEmpty) + let plan = AppConnect.disconnectPlan( + appId: Self.app, snapshot: snapshot, intents: [], includeUnrecorded: true, protected: [twoQR.data]) + XCTAssertEqual(plan.disable, []) + } + + func testAContractSeveralAppsBindIsNoOneAppsForAnUnrecordedKey() { + let shared = Data(repeating: 0xC1, count: 32) + let mine = Self.intent([Self.authKey(10, bound: .singleContract(shared))]) + let theirs = Self.intent([Self.authKey(11, bound: .singleContract(shared))], app: Self.otherApp) + let stray = Self.onPlatform(Self.authKey(20, bound: .singleContract(shared))) + let projection = AppConnect.project([Self.snapshot([stray])], intents: [mine, theirs]) + XCTAssertTrue(projection.connections.allSatisfy { $0.unrecordedKeyIds.isEmpty }, "no one app's: not offered") + } + + func testARetryCarriesOnOnlyWhileTheKeysAreLiveOrMayStillLand() { + let key = Self.authKey(10) + var intent = Self.intent([key]) + XCTAssertTrue(AppConnect.mayResume(intent, in: Self.snapshot([]))) + XCTAssertTrue(AppConnect.mayResume(intent, in: Self.snapshot([Self.onPlatform(key)]))) + XCTAssertFalse(AppConnect.mayResume(intent, in: Self.snapshot([Self.onPlatform(key, disabledAt: 1)]))) + XCTAssertFalse(AppConnect.mayResume( + Self.intent([Self.authKey(10, expiresAt: Self.now - 1)]), + in: Self.snapshot([Self.onPlatform(Self.authKey(10, expiresAt: Self.now - 1))]))) + intent.closedAt = Date(timeIntervalSince1970: 5) + XCTAssertFalse(AppConnect.mayResume(intent, in: Self.snapshot([Self.onPlatform(key)])), "the user disconnected it") + } + + func testProfileKeysAreOfferedOnlyWithAnAppThatWasGivenProfileAccess() { + let profile = Self.intent([Self.authKey(10, bound: .documentType(contractId: Self.dashPay, name: "profile"))]) + let plain = Self.intent([Self.authKey(11)], app: Self.otherApp) + XCTAssertTrue(AppConnect.usesProfileAccess([profile, plain], appId: Self.app)) + XCTAssertFalse(AppConnect.usesProfileAccess([profile, plain], appId: Self.otherApp)) + } + + func testARowAnotherIdentityHoldsStaysAfterThisOneDisconnected() { + let row = DAppConnection( + id: Self.app.toBase58String(), name: "App", url: "", status: .active, + updatedAt: Date(timeIntervalSince1970: 1), loginKind: .oneQR) + let closed = Self.intent([Self.authKey(10)]) + let projection = AppConnect.project([Self.snapshot([Self.onPlatform(Self.authKey(10), disabledAt: 1)])], intents: [closed]) + let elsewhere = Self.intent([Self.authKey(10)], identity: Self.otherIdentity) + let rows = PlatformDashConnectDataSource.rows( + [row], after: projection, intents: [elsewhere], at: Date(timeIntervalSince1970: 2)) + XCTAssertEqual(rows, [row]) + } + + func testATwoQRRowStaysWhenTheAppsAppConnectApprovalsAreAllOff() { + let row = DAppConnection( + id: Self.app.toBase58String(), name: "App", url: "", status: .approved, updatedAt: Date(timeIntervalSince1970: 1)) + let closed = Self.intent([Self.authKey(10)]) + let projection = AppConnect.project([Self.snapshot([Self.onPlatform(Self.authKey(10), disabledAt: 1)])], intents: [closed]) + XCTAssertEqual( + PlatformDashConnectDataSource.rows([row], after: projection, intents: [], at: Date(timeIntervalSince1970: 2)), + [row]) + } + + func testAFenceKeyCanSpendOneCreditAndNeverExpires() { + let key = AppConnect.fenceKey(keyId: 7, publicKeyHash160: Data(repeating: 1, count: 20)) + XCTAssertEqual(key.totalBudget, 1) + XCTAssertNil(key.expiresAt) + } + + // MARK: Second review round + + func testAnIdHeldByAnotherKeyEndsTheUpdateEvenWhenItIsTheEncryptionKey() { + let auth = Self.authKey(20) + let encryption = Self.encryptionKey(21) + let intent = Self.intent([auth, encryption]) + var other = Self.onPlatform(encryption) + other = AppConnect.PlatformKey( + id: 21, purpose: .encryption, securityLevel: .medium, keyType: .ecdsaSecp256k1, + data: Data(repeating: 0x77, count: 33), readOnly: false, bound: other.bound, boundKnown: true, + totalBudget: nil, expiresAt: nil, disabledAt: nil) + let snapshot = Self.snapshot([other]) + XCTAssertEqual(AppConnect.status(of: intent, in: snapshot), .neverLanded) + XCTAssertFalse(AppConnect.mayResume(intent, in: snapshot)) + XCTAssertEqual( + AppConnect.disconnectPlan(appId: Self.app, snapshot: snapshot, intents: [intent], includeUnrecorded: false).fence, + []) + } + + func testAKeyAtTheLastIdLeavesTheLowestFreeIds() { + let last = Self.onPlatform(Self.authKey(UInt32.max)) + XCTAssertEqual(AppConnect.newKeyIds(count: 2, snapshot: Self.snapshot([last]), intents: []), [0, 1]) + } + + func testATwoQRRowComesBackWhenTheAppConnectSideEndsAndItsKeysAreLive() { + let id = Self.app.toBase58String() + let row = DAppConnection( + id: id, name: "App", url: "u", status: .active, updatedAt: Date(timeIntervalSince1970: 1), loginKind: .oneQR) + let closed = Self.intent([Self.authKey(10)]) + let projection = AppConnect.project( + [Self.snapshot([Self.onPlatform(Self.authKey(10), disabledAt: 1)])], intents: [closed]) + let rows = PlatformDashConnectDataSource.rows( + [row], after: projection, intents: [], twoQRApps: [id], at: Date(timeIntervalSince1970: 2)) + XCTAssertEqual(rows.map(\.loginKind), [.twoQR]) + XCTAssertEqual(rows.first?.name, "App") + XCTAssertEqual(PlatformDashConnectDataSource.rows( + [row], after: projection, intents: [], at: Date(timeIntervalSince1970: 2)), []) + } + + // MARK: Third review round + + func testAnAppWhoseIntentsAreOnlyOnAnotherIdentityHasNoConnectionInThisRead() { + let elsewhere = Self.intent([Self.authKey(10)], identity: Self.otherIdentity) + XCTAssertEqual(AppConnect.project([Self.snapshot([])], intents: [elsewhere]).connections, []) + } + + func testOnlyKeysInAnAppConnectShapeOnAnAppsContractCountAsUnrecorded() { + let full = AppConnect.PlatformKey( + id: 20, purpose: .authentication, securityLevel: .high, keyType: .ecdsaSecp256k1, + data: Data(repeating: 2, count: 33), readOnly: false, bound: .singleContract(Self.otherApp), boundKnown: true, + totalBudget: nil, expiresAt: nil, disabledAt: nil) + let master = Self.onPlatform(Key( + id: 21, purpose: .authentication, securityLevel: .master, keyType: .ecdsaHash160, + data: Data(repeating: 3, count: 20), readOnly: false, bound: .singleContract(Self.otherApp), + totalBudget: nil, expiresAt: nil)) + let system = Self.onPlatform(Self.authKey(22, bound: .singleContract(Data.identifier(fromBase58: AppConnect.contractId)!))) + XCTAssertEqual(AppConnect.project([Self.snapshot([full, master, system])], intents: []).connections, []) + } + + // MARK: Fourth review round + + func testAProtocolTimestampAboveTheSignedRangeIsReadUnsigned() { + let far: UInt64 = 1 << 63 + 5 + let info = ManagedIdentity.IdentityPublicKeyInfo( + keyId: 4, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, readOnly: false, + disabledAt: nil, data: Data(repeating: 4, count: 20), totalBudget: nil, expiresAt: Int64(bitPattern: far)) + XCTAssertEqual(AppConnect.platformKey(info, binding: nil).expiresAt, far) + } + + func testAKeyWithoutAnExpiryIsNoAppConnectKey() { + let forever = Self.onPlatform(Self.authKey(20, bound: .singleContract(Self.otherApp), expiresAt: nil)) + XCTAssertEqual(AppConnect.project([Self.snapshot([forever])], intents: []).connections, []) + } + + func testAKeyWhoseBoundIsNotKnownYetIsReportedNotGuessed() { + let unplaced = Self.onPlatform(Self.authKey(20), boundKnown: false) + let projection = AppConnect.project([Self.snapshot([unplaced])], intents: []) + XCTAssertEqual(projection.connections, []) + XCTAssertEqual(projection.unplacedKeyIds, [Self.identity: [20]]) + } + + func testAnIdAnotherKeyHoldsIsThatKeysNotTheIntents() { + let mine = Self.intent([Self.authKey(7)]) + let theirs = Self.onPlatform(Self.authKey(7, data: 0x99, bound: .singleContract(Self.otherApp))) + let projection = AppConnect.project([Self.snapshot([theirs])], intents: [mine]) + XCTAssertEqual(projection.connections.first { $0.appId == Self.otherApp }?.unrecordedKeyIds, [Self.identity: [7]]) + } +} diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 45e227e9bc..9510756a81 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -1,3 +1,4 @@ +import CryptoKit import Foundation import XCTest @testable import dashpay @@ -85,22 +86,6 @@ final class AppConnectV2LoginTests: XCTestCase { expiresAt: nil) } - private static func grant( - sessionKeyId: UInt32, - additionalKeyIds: [UInt32]? = nil, - appId: String = "app", - requestHash: String = "aa", - connectionId: String? = nil - ) -> AppConnectGrant { - AppConnectGrant( - identityId: "identity", appContractId: appId, documentId: nil, - values: .init(appEphemeralPubKeyHash: requestHash, walletEphemeralPubKey: "bb", encryptedPayload: "cc"), - sessionKeyId: sessionKeyId, totalBudget: nil, expiresAt: nil, - publishedAt: Date(timeIntervalSince1970: 1_000), - additionalKeyIds: additionalKeyIds, - connectionId: connectionId) - } - // MARK: - Derivation func testEachBindingDerivesFromItsOwnLeafAndTheLeafIsStable() { @@ -115,8 +100,8 @@ final class AppConnectV2LoginTests: XCTestCase { (0 ..< AppConnectRequest.maxAuthBindings).map { AppConnect.authKeyLeaf(appEphemeralPubKey: Self.appEphemeralPubKey, bindingIndex: $0) }) - // Never the v1 session key of the same ephemeral key. - XCTAssertFalse(leaves.contains(AppConnect.requestId(appEphemeralPubKey: Self.appEphemeralPubKey))) + // Never the leaf of the v1 session key of the same ephemeral key. + XCTAssertFalse(leaves.contains(hash256(Self.appEphemeralPubKey))) // hash256(appEphPub ‖ 0x00) XCTAssertEqual(leaves[0], hash256(Self.appEphemeralPubKey + Data([0]))) // Another request derives other keys. @@ -126,7 +111,7 @@ final class AppConnectV2LoginTests: XCTestCase { } private func hash256(_ data: Data) -> Data { - AppConnect.requestId(appEphemeralPubKey: data) + Data(SHA256.hash(data: Data(SHA256.hash(data: data)))) } func testAuthKeysAreRegisteredWithTheirBindingLevelAndLimits() throws { @@ -324,279 +309,6 @@ final class AppConnectV2LoginTests: XCTestCase { // MARK: - Re-sending an auth key - func testAKeyOnTheIdentityIsSentAgainOnlyWithinThePlansTerms() throws { - let plan = try Self.vectorPlan() - let group = plan.auth[0] - func key(level: SecurityLevel = .critical, budget: UInt64? = 50_000_000_000, - expiresAt: UInt64? = Self.expiresAt, disabled: Bool = false) -> ManagedIdentity.IdentityPublicKeyInfo { - ManagedIdentity.IdentityPublicKeyInfo( - keyId: 7, purpose: .authentication, securityLevel: level, keyType: .ecdsaHash160, readOnly: false, - disabledAt: disabled ? 1 : nil, data: Data(repeating: 7, count: 20), - totalBudget: budget, expiresAt: expiresAt.map { Int64($0) }) - } - let stored = AppConnect.KeyBinding( - keyId: 7, data: Data(repeating: 7, count: 20), singleContractId: nil, bound: group.storedBound) - func resend(_ key: ManagedIdentity.IdentityPublicKeyInfo, binding: AppConnect.KeyBinding? = stored, - now: Date = AppConnectV2LoginTests.now) -> Bool { - AppConnect.canResendAuthKey(key, for: group, binding: binding, now: now) - } - XCTAssertTrue(resend(key())) - XCTAssertFalse(resend(key(disabled: true))) - XCTAssertFalse(resend(key(level: .high))) - XCTAssertFalse(resend(key(budget: 60_000_000_000))) - XCTAssertFalse(resend(key(budget: nil))) - XCTAssertFalse(resend(key(expiresAt: Self.expiresAt + 2 * Self.dayMilliseconds))) - XCTAssertFalse(resend(key(), now: Self.date(milliseconds: Self.expiresAt + 1)), "an expired key cannot sign") - // The payload alone does not make the key this binding's: the store - // has to show it with the binding's bound. - XCTAssertFalse(resend(key(), binding: nil), "a key the store does not show") - var otherBound = stored - otherBound.bound = .contractGroup(Data(repeating: 0xEE, count: 32)) - XCTAssertFalse(resend(key(), binding: otherBound), "a key bound to another group") - var wholeContract = stored - wholeContract.bound = .singleContract(group.binding.id) - XCTAssertFalse(resend(key(), binding: wholeContract), "the same id as a contract, not a group") - var unreadable = stored - unreadable.hasUnreadableBound = true - XCTAssertFalse(resend(key(), binding: unreadable)) - let otherKey = AppConnect.KeyBinding( - keyId: 8, data: Data(repeating: 7, count: 20), singleContractId: nil, bound: group.storedBound) - XCTAssertFalse(resend(key(), binding: otherKey), "a record of another key id") - } - - /// A disconnect finds the app's v2 keys that no record names: bound to - /// its contract, a document type on it, or a group its owner owns; with - /// an expiry; HIGH or CRITICAL. The allowlisted DashPay profile is shared. - func testADisconnectFindsTheAppsV2KeysThatNoRecordNames() { - let app = Data(repeating: 0xA1, count: 32) - let group = Data(repeating: 0xB2, count: 32) - let otherGroup = Data(repeating: 0xC3, count: 32) - let other = Data(repeating: 0xD4, count: 32) - let dashPay = Data.identifier(fromBase58: AppConnect.dashPayContractId)! - func key(_ id: Int32, level: SecurityLevel = .high, expires: Bool = true, disabled: Bool = false, - type: KeyType = .ecdsaHash160) -> ManagedIdentity.IdentityPublicKeyInfo { - ManagedIdentity.IdentityPublicKeyInfo( - keyId: id, purpose: .authentication, securityLevel: level, keyType: type, readOnly: false, - disabledAt: disabled ? 1 : nil, data: Data([UInt8(id)]), - totalBudget: nil, expiresAt: expires ? 9_000 : nil) - } - func binding(_ id: UInt32, _ bound: AppConnect.StoredBound?, unreadable: Bool = false) -> AppConnect.KeyBinding { - AppConnect.KeyBinding(keyId: id, data: Data([UInt8(id)]), singleContractId: nil, - hasUnreadableBound: unreadable, bound: bound) - } - let keys = [ - key(1), key(2), key(3, level: .critical), key(4, level: .critical), key(5), key(6), - key(7, expires: false), key(8, disabled: true), key(9, level: .master), key(10, type: .ecdsaSecp256k1), - key(11), key(12), - ] - let bindings = [ - binding(1, .singleContract(app)), - binding(2, .documentType(contractId: app, name: "post")), - binding(3, .contractGroup(group)), - binding(4, .contractGroup(otherGroup)), - binding(5, .documentType(contractId: dashPay, name: "profile")), - binding(6, .documentType(contractId: dashPay, name: "contactRequest")), - binding(7, .singleContract(app)), binding(8, .singleContract(app)), - binding(9, .singleContract(app)), binding(10, .singleContract(app)), - binding(11, .singleContract(other)), - binding(12, .singleContract(app)), - ] - let recorded: Set = [12] - let unrecorded = AppConnect.unrecordedV2Keys( - recordedKeyIds: recorded, bindings: bindings, currentIdentityPublicKeys: keys) - - XCTAssertEqual(unrecorded.map(\.keyId), [1, 2, 3, 4, 5, 6, 11]) - let candidates = AppConnect.unrecordedV2KeyBoundIds(appContractId: app, keys: unrecorded) - XCTAssertEqual(candidates.contracts, [other], "never the app itself, the allowlisted profile or a system contract") - XCTAssertEqual(candidates.groups, [group, otherGroup]) - XCTAssertEqual( - AppConnect.appsV2KeyIds(appContractIds: [app], appGroupIds: [group], keys: unrecorded), - [1, 2, 3]) - // Another contract of the app's owner: a binding the request could - // have had, so its key goes too. - XCTAssertEqual( - AppConnect.appsV2KeyIds(appContractIds: [app, other], appGroupIds: [group], keys: unrecorded), - [1, 2, 3, 11]) - // The DashPay profile key names no app: it is never the app's, only - // shared, and the contact-request type v2 does not allow is neither. - XCTAssertEqual(AppConnect.unattributedProfileKeyIds(keys: unrecorded), [5]) - // A key the store cannot place is the disconnect's stop, not a guess. - XCTAssertEqual( - AppConnect.unrecordedV2Keys( - recordedKeyIds: [], bindings: [binding(1, .singleContract(app), unreadable: true)], - currentIdentityPublicKeys: [key(1)]).count, - 0) - // Another identity's keys, from the store alone. - var stored = binding(1, .singleContract(app)) - stored.isV2AuthKeyShaped = true - var storedOff = binding(2, .singleContract(app)) - storedOff.isV2AuthKeyShaped = true - storedOff.isDisabled = true - XCTAssertEqual( - AppConnect.unrecordedV2Keys(recordedKeyIds: [], bindings: [stored, storedOff, binding(3, .singleContract(app))]) - .map(\.keyId), - [1]) - XCTAssertEqual( - AppConnect.sessionKeyIdsWithUnknownBinding(for: [], bindings: [], currentIdentityPublicKeys: [key(3, level: .critical)]), - [3], "a CRITICAL HASH160 key the store does not show stops a disconnect too") - } - - /// A disconnect takes the live, unexpired DashPay profile keys no - /// confirmed record names, and refuses a view of the identity it cannot - /// trust. - func testADisconnectTakesOnlyUnattributedLiveProfileKeys() { - let dashPay = Data.identifier(fromBase58: AppConnect.dashPayContractId)! - let app = Data(repeating: 0xA1, count: 32) - let now: Int64 = 100_000_000 - func key(_ id: Int32, expiresAt: Int64? = 200_000_000, disabled: Bool = false) -> ManagedIdentity.IdentityPublicKeyInfo { - ManagedIdentity.IdentityPublicKeyInfo( - keyId: id, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, readOnly: false, - disabledAt: disabled ? 1 : nil, data: Data([UInt8(id)]), - totalBudget: nil, expiresAt: expiresAt) - } - func binding(_ id: UInt32, _ bound: AppConnect.StoredBound?, expiresAt: Int64? = 200_000_000, - unreadable: Bool = false) -> AppConnect.KeyBinding { - var binding = AppConnect.KeyBinding(keyId: id, data: Data([UInt8(id)]), singleContractId: nil, - hasUnreadableBound: unreadable, bound: bound) - binding.isV2AuthKeyShaped = true - binding.expiresAt = expiresAt - return binding - } - let profile = AppConnect.StoredBound.documentType(contractId: dashPay, name: "profile") - let keys = [key(1), key(2), key(3, expiresAt: 92_800_000), key(4), key(5)] - let bindings = [ - binding(1, profile), binding(2, profile), binding(3, profile, expiresAt: 92_800_000), - binding(4, .singleContract(app)), binding(5, profile), - ] - - XCTAssertEqual( - AppConnect.sharedProfileKeyIdsToDisable( - recordedKeyIds: [5], bindings: bindings, currentIdentityPublicKeys: keys, nowMilliseconds: now), - [1, 2], "not the expired one, the app's own, or the recorded one") - XCTAssertEqual( - AppConnect.storedSharedProfileKeyIds(recordedKeyIds: [5], bindings: bindings, nowMilliseconds: now), - [1, 2]) - // Expiries past Int64.max arrive as negative bit patterns and are far - // in the future: counted, revoked, and still blocking when unplaced. - for far in [Int64.max, Int64(bitPattern: UInt64(Int64.max) + 1), -1] { - XCTAssertTrue(AppConnect.isUnexpired(far, nowMilliseconds: now)) - XCTAssertEqual(AppConnect.storedSharedProfileKeyIds( - recordedKeyIds: [], bindings: [binding(1, profile, expiresAt: far)], nowMilliseconds: now), [1]) - XCTAssertEqual(AppConnect.sharedProfileKeyIdsToDisable( - recordedKeyIds: [], bindings: [binding(1, profile, expiresAt: far)], - currentIdentityPublicKeys: [key(1, expiresAt: far)], nowMilliseconds: now), [1]) - XCTAssertTrue(AppConnect.hasUnplacedStoredKey( - recordedKeyIds: [], bindings: [binding(2, nil, expiresAt: far, unreadable: true)], nowMilliseconds: now)) - } - XCTAssertFalse(AppConnect.isUnexpired(nil, nowMilliseconds: now)) - XCTAssertFalse(AppConnect.isUnexpired(0, nowMilliseconds: now)) - // An hour of a fast device clock does not expire a working key. - XCTAssertEqual(AppConnect.storedSharedProfileKeyIds( - recordedKeyIds: [], bindings: [binding(1, profile, expiresAt: now - 1_000)], nowMilliseconds: now), [1]) - // A live v2 key the store cannot place may be a profile key. - XCTAssertNil(AppConnect.sharedProfileKeyIdsToDisable( - recordedKeyIds: [], bindings: [binding(1, nil, unreadable: true)], - currentIdentityPublicKeys: [key(1)], nowMilliseconds: now)) - XCTAssertNil(AppConnect.sharedProfileKeyIdsToDisable( - recordedKeyIds: [], bindings: [], currentIdentityPublicKeys: [key(1)], nowMilliseconds: now)) - // A live v2 key the store cannot place counts even when the fetched - // view lacks it. - XCTAssertNil(AppConnect.sharedProfileKeyIdsToDisable( - recordedKeyIds: [], bindings: [binding(1, profile), binding(2, nil, unreadable: true)], - currentIdentityPublicKeys: [key(1)], nowMilliseconds: now)) - // Not when that stored key is off, expired, or named by a record. - let placedOrOff: [(AppConnect.KeyBinding, Set)] = [ - (binding(2, nil, unreadable: true).disabled(), []), - (binding(2, nil, expiresAt: 92_800_000, unreadable: true), []), - (binding(2, nil, unreadable: true), [2]), - ] - for (stored, recorded) in placedOrOff { - XCTAssertFalse(AppConnect.hasUnplacedStoredKey( - recordedKeyIds: recorded, bindings: [stored], nowMilliseconds: now)) - } - // One the fetched view shows off does not. - XCTAssertEqual(AppConnect.sharedProfileKeyIdsToDisable( - recordedKeyIds: [], bindings: [binding(1, profile), binding(2, nil, unreadable: true)], - currentIdentityPublicKeys: [key(1), key(2, disabled: true)], nowMilliseconds: now), [1]) - // A stored profile key the fetched view lacks: the node is behind. - XCTAssertNil(AppConnect.sharedProfileKeyIdsToDisable( - recordedKeyIds: [], bindings: [binding(1, profile), binding(2, profile)], - currentIdentityPublicKeys: [key(1)], nowMilliseconds: now)) - // Disabled on Platform: nothing to do. - XCTAssertEqual(AppConnect.sharedProfileKeyIdsToDisable( - recordedKeyIds: [], bindings: [binding(1, profile)], - currentIdentityPublicKeys: [key(1, disabled: true)], nowMilliseconds: now), []) - } - - /// A v2 grant's CRITICAL group key is disabled under its recorded id, - /// but only while the store shows that key bound to a group: a CRITICAL - /// key under a recorded id with no such record is not taken for it. - func testADisconnectDisablesAV2GroupKeyOnlyAsTheGroupKey() { - let app = Data(repeating: 0xA1, count: 32) - let keys = [5, 6].map { id in - ManagedIdentity.IdentityPublicKeyInfo( - keyId: Int32(id), purpose: .authentication, securityLevel: .critical, keyType: .ecdsaHash160, - readOnly: false, disabledAt: nil, data: Data([UInt8(id)]), totalBudget: 1, expiresAt: 9_000) - } - let grant = Self.grant(sessionKeyId: 5, additionalKeyIds: [6]) - let groupBound = AppConnect.KeyBinding( - keyId: 5, data: Data([5]), singleContractId: nil, bound: .contractGroup(Data(repeating: 0xB2, count: 32))) - - XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable( - for: [grant], appContractId: app, bindings: [groupBound], currentIdentityPublicKeys: keys), - [5]) - var v1 = grant - v1.additionalKeyIds = nil - XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable( - for: [v1], appContractId: app, bindings: [groupBound], currentIdentityPublicKeys: keys), - [], "a v1 grant never registered a CRITICAL key") - } - - /// One update's new keys get ids no key of the identity has: above the - /// highest while they fit, then the lowest gaps, never an id twice. - func testTheKeysOfOneUpdateGetFreeIds() { - func keys(_ ids: [UInt32]) -> [ManagedIdentity.IdentityPublicKeyInfo] { - ids.map { Self.key($0) } - } - XCTAssertEqual(AppConnect.freeKeyIds(count: 3, currentIdentityPublicKeys: keys([0, 1, 2])), [3, 4, 5]) - XCTAssertEqual(AppConnect.freeKeyIds(count: 2, currentIdentityPublicKeys: []), [0, 1]) - XCTAssertEqual( - AppConnect.freeKeyIds(count: 2, currentIdentityPublicKeys: keys([0, 1, 2, 3, 5, .max])), [4, 6], - "past the last id: the gaps, skipping the taken 5") - XCTAssertEqual( - AppConnect.freeKeyIds(count: 3, currentIdentityPublicKeys: keys([0, .max - 1])), [.max, 1, 2], - "the last id, then the gaps, without overflowing") - XCTAssertEqual(AppConnect.freeKeyIds(count: 0, currentIdentityPublicKeys: keys([1])), []) - } - - /// After an update reported a failure, a key found under the added id is - /// taken as the added one only with everything it was registered with: - /// the same payload alone may be another request's key, bound otherwise. - func testASettledKeyIsTheAddedOneOnlyAsItWasAdded() throws { - let plan = try Self.vectorPlan() - let group = plan.auth[0] - let added = AppConnect.authIdentityPubkey(group, keyId: 7, publicKeyHash160: Data(repeating: 7, count: 20)) - func key(level: SecurityLevel = .critical, budget: UInt64? = group.totalBudget, disabled: Bool = false) - -> ManagedIdentity.IdentityPublicKeyInfo { - ManagedIdentity.IdentityPublicKeyInfo( - keyId: 7, purpose: .authentication, securityLevel: level, keyType: .ecdsaHash160, readOnly: false, - disabledAt: disabled ? 1 : nil, data: Data(repeating: 7, count: 20), - totalBudget: budget, expiresAt: Int64(group.expiresAt)) - } - let stored = AppConnect.KeyBinding( - keyId: 7, data: Data(repeating: 7, count: 20), singleContractId: nil, bound: group.storedBound) - XCTAssertTrue(AppConnect.isAddedKey(key(), added: added, binding: stored)) - var narrower = stored - narrower.bound = .documentType(contractId: group.binding.id, name: "post") - XCTAssertFalse(AppConnect.isAddedKey(key(), added: added, binding: narrower), "another request's bound") - XCTAssertFalse(AppConnect.isAddedKey(key(), added: added, binding: nil), "a key the store does not show") - XCTAssertFalse(AppConnect.isAddedKey(key(level: .high), added: added, binding: stored)) - XCTAssertFalse(AppConnect.isAddedKey(key(budget: 1), added: added, binding: stored)) - XCTAssertFalse(AppConnect.isAddedKey(key(disabled: true), added: added, binding: stored)) - } - /// A stored bound is read from the store's discriminant, ids and name. func testAStoredBoundIsReadFromTheStore() { let id = Data(repeating: 1, count: 32) @@ -1020,87 +732,6 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertNil(try AppConnect.currentContractKey(from: response, identityId: "identity", purpose: .decryption)) } - // MARK: - Supersession (wallet rule 8) - - func testALoginReplacesTheLiveKeysOfTheSameConnectionOnly() { - let grants = [ - Self.grant(sessionKeyId: 10, additionalKeyIds: [11], connectionId: "c1"), - Self.grant(sessionKeyId: 20, additionalKeyIds: [21], requestHash: "bb", connectionId: "c2"), - Self.grant(sessionKeyId: 30, appId: "other", connectionId: "c1"), - ] - let keys = [ - Self.key(0, level: .master), Self.key(10, level: .critical), Self.key(11), Self.key(20), Self.key(21), - Self.key(30), - ] - func superseded(_ connectionId: String?, keeping: Set = []) -> [UInt32] { - AppConnect.supersededKeyIds( - grants: grants, identityId: "identity", appId: "app", connectionId: connectionId, - keeping: keeping, currentIdentityPublicKeys: keys) - } - XCTAssertEqual(superseded("c1"), [10, 11]) - XCTAssertEqual(superseded("c2"), [20, 21]) - XCTAssertEqual(superseded(nil), [], "without a connection id nothing is replaced") - XCTAssertEqual(superseded("c3"), []) - // A retry of the same request keeps the keys it sends again. - XCTAssertEqual(superseded("c1", keeping: [10, 11]), []) - } - - func testSupersessionSkipsKeysThatAreOffOrNotAppKeys() { - let grants = [Self.grant(sessionKeyId: 0, additionalKeyIds: [1, 2, 3], connectionId: "c1")] - let keys = [ - Self.key(0, level: .master), - Self.key(1, disabled: true), - Self.key(2, purpose: .transfer, level: .critical), - Self.key(3), - ] - XCTAssertEqual( - AppConnect.supersededKeyIds( - grants: grants, identityId: "identity", appId: "app", connectionId: "c1", - keeping: [], currentIdentityPublicKeys: keys), - [3], "a damaged record never gets the identity's own keys disabled") - } - - // MARK: - Disconnect and the grant record - - func testADisconnectDisablesEveryAuthKeyOfAV2Grant() { - let grant = Self.grant(sessionKeyId: 7, additionalKeyIds: [8]) - let encryption = Self.encryptionKey(9, data: Self.derivedPoint) - let keys = [Self.key(0, level: .master), Self.key(7, level: .critical), Self.key(8), encryption] - XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable( - for: [grant], appContractId: Self.appId, - bindings: [ - .init(keyId: 9, data: Self.derivedPoint, singleContractId: Self.appId), - .init(keyId: 7, data: Self.key(7, level: .critical).data, singleContractId: nil, - bound: .contractGroup(Data(repeating: 0xB2, count: 32))), - ], - currentIdentityPublicKeys: keys), - [7, 8], "the group key and the profile key go; the shared encryption key stays") - XCTAssertEqual( - AppConnect.sessionKeyIdsMissing(from: [Self.key(7, level: .critical)], for: [grant]), - [8]) - } - - func testAGrantRecordWithoutTheV2FieldsStillReads() throws { - let stored = """ - {"identityId":"identity","appContractId":"app","values":{"appEphemeralPubKeyHash":"aa",\ - "walletEphemeralPubKey":"bb","encryptedPayload":"cc"},"sessionKeyId":6,"publishedAt":1000} - """ - let decoder = JSONDecoder() - decoder.dateDecodingStrategy = .millisecondsSince1970 - let grant = try decoder.decode(AppConnectGrant.self, from: Data(stored.utf8)) - XCTAssertNil(grant.additionalKeyIds) - XCTAssertNil(grant.connectionId) - XCTAssertEqual(grant.keyIds, [6]) - - let v2 = Self.grant(sessionKeyId: 7, additionalKeyIds: [8, 9], connectionId: "c1") - let encoder = JSONEncoder() - encoder.dateEncodingStrategy = .millisecondsSince1970 - let roundTripped = try decoder.decode(AppConnectGrant.self, from: encoder.encode(v2)) - XCTAssertEqual(roundTripped.keyIds, [7, 8, 9]) - XCTAssertEqual(roundTripped.connectionId, "c1") - } - // MARK: - URI and callback func testOnlyAVersionTwoKeyUriIsAnAppConnectRequest() { diff --git a/DashWalletTests/DashConnect/DashConnectStoreTests.swift b/DashWalletTests/DashConnect/DashConnectStoreTests.swift index 92b923c2b2..8a4f33f933 100644 --- a/DashWalletTests/DashConnect/DashConnectStoreTests.swift +++ b/DashWalletTests/DashConnect/DashConnectStoreTests.swift @@ -195,7 +195,7 @@ final class DashConnectStoreTests: XCTestCase { store: store ) - try await first.disconnect(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", scope: nil) + try await first.disconnect(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", scope: nil, includingUnrecorded: false) let second = MockDashConnectDataSource(store: store) XCTAssertEqual(second.connectionsSnapshot.count, 1) diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 051c26be97..ff85b02804 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -928,36 +928,6 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { ) } - /// Turning off a one-QR connection that replaced a two-QR one disables - /// what is left of the two-QR login's keys as well. - func testADisconnectFindsTheLiveTwoQrLoginKeysByTheirDerivedPayload() { - let authentication = Data(repeating: 0x51, count: 20) - let encryption = Data(repeating: 0x52, count: 33) - func live(_ keys: [ManagedIdentity.IdentityPublicKeyInfo]) -> [UInt32] { - PlatformDashConnectDataSource.liveLoginKeyIds( - authenticationPublicKeyHash160: authentication, - encryptionPublicKey: encryption, - currentIdentityPublicKeys: keys) - } - let authenticationKey = makeIdentityPublicKeyInfo( - keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: authentication) - let encryptionKey = makeIdentityPublicKeyInfo( - keyId: 101, purpose: .encryption, securityLevel: .medium, keyType: .ecdsaSecp256k1, data: encryption) - let disabledAuthenticationKey = makeIdentityPublicKeyInfo( - keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, - data: authentication, disabledAt: 1) - // A one-QR session key: same kind as the two-QR authentication key, - // another payload. - let sessionKey = makeIdentityPublicKeyInfo( - keyId: 102, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, - data: Data(repeating: 0x53, count: 20)) - - XCTAssertEqual(live([encryptionKey, sessionKey, authenticationKey]), [100, 101]) - XCTAssertEqual(live([disabledAuthenticationKey, encryptionKey]), [101]) - XCTAssertEqual(live([disabledAuthenticationKey, sessionKey]), []) - XCTAssertEqual(live([]), []) - } - func testMissingKeyRegistrationKeysReturnsOnlyMissingEncryptionKey() throws { let chainKey = Data(repeating: 0x22, count: 32) let identityId = Data(repeating: 0x33, count: 32) @@ -1372,30 +1342,24 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertNil(viewModel.message) } - /// A disconnect that also turned off DashPay profile keys no - /// connection accounted for says how many; one that could not tell them - /// apart says so; one that turned off none says nothing. - func testADisconnectSaysWhatItDidWithTheProfileKeys() async { + /// A disconnect that left keys no approval names offers to turn them + /// off as well; one that left none says nothing. + func testADisconnectThatLeftUnrecordedKeysOffersToTurnThemOff() async { let spy = PurchaseApprovalSpy() let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - spy.disconnectResult = DashConnectDisconnectResult(profileKeysTurnedOff: 2) + spy.disconnectResult = DashConnectDisconnectResult(unrecordedKeysLeft: 2) viewModel.disconnect(Self.connection) await waitUntil { !viewModel.isDisconnecting && spy.disconnectedIds.count == 1 } - XCTAssertEqual(viewModel.message?.kind, .success) XCTAssertEqual(viewModel.message?.text.contains("2"), true) + XCTAssertEqual(viewModel.message?.unrecordedKeysOf, Self.connection) + XCTAssertEqual(spy.disconnectedIncludingUnrecorded, [false]) - spy.disconnectResult = DashConnectDisconnectResult(profileKeysUnchecked: true) viewModel.message = nil - viewModel.disconnect(Self.connection) - await waitUntil { !viewModel.isDisconnecting && spy.disconnectedIds.count == 2 } - XCTAssertEqual(viewModel.message?.kind, .success) - XCTAssertEqual(viewModel.message?.text.contains("could not be checked"), true) - spy.disconnectResult = DashConnectDisconnectResult() - viewModel.message = nil - viewModel.disconnect(Self.connection) - await waitUntil { !viewModel.isDisconnecting && spy.disconnectedIds.count == 3 } + viewModel.disconnect(Self.connection, includingUnrecorded: true) + await waitUntil { !viewModel.isDisconnecting && spy.disconnectedIds.count == 2 } + XCTAssertEqual(spy.disconnectedIncludingUnrecorded, [false, true]) XCTAssertNil(viewModel.message) } @@ -1403,7 +1367,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { /// nothing. func testAnUnresolvedLoginIsAskedForAgainInsteadOfApproved() async { let unresolved = ConnectionRequest(loginRequest: MockDashConnectDataSource.sampleLoginRequest) - let resolved = Self.consent(identityId: "identity-a", terms: .current) + let resolved = Self.consent(identityId: "identity-a") let spy = LoginApprovalSpy(shown: [unresolved, resolved]) let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) @@ -1421,7 +1385,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { } func testApprovingALoginPassesTheRequestAsTheSheetShowedIt() async { - let shown = Self.consent(identityId: "identity-a", terms: .current) + let shown = Self.consent(identityId: "identity-a") let spy = LoginApprovalSpy(shown: [shown]) let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) @@ -1440,7 +1404,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { var request = MockDashConnectDataSource.sampleLoginRequest request.appConnect = try DashConnectUri.parseAppConnectRequest( "dash-key:2fAANHHASdojyjV9Sqa2wf2nwZE8kLLqmeHpZWa8sBfaGsddVqyMG2ZVte7xJkTKsXvmFYbXzXbNnMo7bJQBxNcf79N8YWi7pLKyb39Rqv6b1KUmxw9UeJGYz2CV9hFGNUQtcyMYVq2Fg6vAxtxpYays61H8gLMcWqaG8TfgGA3H7setGAYiBsM5YmdZgeuCdGAHSwfNfav5cfFjXNDkPWv37UNSgFxj6o58jfXc3kCLKqLJtc5ZPjm1thEGYxK8HVYBi8fRQeEVy76n27DXGrVTyHz94CfJRuMnH76xGYbMgeuvurxjJMLrQgWUu53cjocYyzzNWdJrgs2D5?n=d&v=2&cb=https%3A%2F%2Fyap.pr%2Fconnect%3Fr%3Dd77dc0da9df83a47755a15c42c5d9db9d7a7fd62") - let spy = LoginApprovalSpy(shown: [Self.consent(identityId: "identity-a", terms: .current)], loginRequest: request) + let spy = LoginApprovalSpy(shown: [Self.consent(identityId: "identity-a")], loginRequest: request) let opened = OpenedURLs() let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false, openURL: { opened.urls.append($0) }) @@ -1477,7 +1441,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { var request = MockDashConnectDataSource.sampleLoginRequest request.appConnect = try DashConnectUri.parseAppConnectRequest( "dash-key:2fAANHHASdojyjV9Sqa2wf2nwZE8kLLqmeHpZWa8sBfaGsddVqyMG2ZVte7xJkTKsXvmFYbXzXbNnMo7bJQBxNcf79N8YWi7pLKyb39Rqv6b1KUmxw9UeJGYz2CV9hFGNUQtcyMYVq2Fg6vAxtxpYays61H8gLMcWqaG8TfgGA3H7setGAYiBsM5YmdZgeuCdGAHSwfNfav5cfFjXNDkPWv37UNSgFxj6o58jfXc3kCLKqLJtc5ZPjm1thEGYxK8HVYBi8fRQeEVy76n27DXGrVTyHz94CfJRuMnH76xGYbMgeuvurxjJMLrQgWUu53cjocYyzzNWdJrgs2D5?n=d&v=2&cb=https%3A%2F%2Fyap.pr%2Fconnect%3Fr%3Dd77dc0da9df83a47755a15c42c5d9db9d7a7fd62") - let spy = LoginApprovalSpy(shown: [Self.consent(identityId: "identity-a", terms: .current)], loginRequest: request) + let spy = LoginApprovalSpy(shown: [Self.consent(identityId: "identity-a")], loginRequest: request) spy.approveFailures = [DashConnectPlatformError.noIdentity, DashConnectPlatformError.authorizationCancelled] let opened = OpenedURLs() let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false, openURL: { opened.urls.append($0) }) @@ -1498,8 +1462,8 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { /// login, while the sheet was up: nothing is approved on the old sheet, /// and the user decides again on what is true now. func testAnApprovalThatIsOutOfDateShowsTheRequestAgainAsItStands() async { - let shown = Self.consent(identityId: "identity-a", terms: nil) - let current = Self.consent(identityId: "identity-b", terms: .current) + let shown = Self.consent(identityId: "identity-a") + let current = Self.consent(identityId: "identity-b") let spy = LoginApprovalSpy(shown: [shown, current]) spy.approveFailures = [DashConnectPlatformError.approvalOutOfDate] let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) @@ -1524,7 +1488,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { /// so itself and no error is added; when it can again, a note says why /// nothing was approved. func testAnApprovalThatCouldNotCheckTheLoginRebuildsTheSheet() async { - let shown = Self.consent(identityId: "identity-a", terms: .current) + let shown = Self.consent(identityId: "identity-a") var unresolved = shown unresolved.login = .unresolved unresolved.unresolvedLoginReason = "no nodes" @@ -1549,7 +1513,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertEqual(viewModel.approveError, DashConnectPlatformError.loginUnresolved.localizedDescription) } - private static func consent(identityId: String, terms: AppConnect.SessionKeyTerms?) -> ConnectionRequest { + private static func consent(identityId: String) -> ConnectionRequest { ConnectionRequest( loginRequest: MockDashConnectDataSource.sampleLoginRequest, appLabel: "App", @@ -1557,7 +1521,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { walletUsername: nil, walletIdentityId: identityId, existingConnection: nil, - login: terms.map(AppConnect.Login.oneQR) ?? .twoQR) + login: .twoQR) } private static let connection = DAppConnection( @@ -1661,6 +1625,7 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { private var storedDisconnectFailure: Error? private var storedDisconnectedIds: [String] = [] private var storedDisconnectedScopes: [String?] = [] + private var storedDisconnectedIncludingUnrecorded: [Bool] = [] var disconnectFailure: Error? { get { lock.withLock { storedDisconnectFailure } } @@ -1675,18 +1640,23 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { lock.withLock { storedDisconnectedScopes } } + var disconnectedIncludingUnrecorded: [Bool] { + lock.withLock { storedDisconnectedIncludingUnrecorded } + } + private var storedDisconnectResult = DashConnectDisconnectResult() - /// What a successful disconnect reports about the profile keys. + /// What a successful disconnect reports. var disconnectResult: DashConnectDisconnectResult { get { lock.withLock { storedDisconnectResult } } set { lock.withLock { storedDisconnectResult = newValue } } } - func disconnect(id: String, scope: String?) async throws -> DashConnectDisconnectResult { + func disconnect(id: String, scope: String?, includingUnrecorded: Bool) async throws -> DashConnectDisconnectResult { let (failure, result) = lock.withLock { () -> (Error?, DashConnectDisconnectResult) in storedDisconnectedIds.append(id) storedDisconnectedScopes.append(scope) + storedDisconnectedIncludingUnrecorded.append(includingUnrecorded) return (storedDisconnectFailure, storedDisconnectResult) } if let failure { throw failure } @@ -1755,7 +1725,7 @@ private final class LoginApprovalSpy: DashConnectDataSource { throw PurchaseSpyError.unsupported } - func disconnect(id: String, scope: String?) async throws -> DashConnectDisconnectResult { + func disconnect(id: String, scope: String?, includingUnrecorded: Bool) async throws -> DashConnectDisconnectResult { throw PurchaseSpyError.unsupported } @@ -1819,274 +1789,6 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertTrue(AppConnect.isAvailable(protocolVersion: 15)) } - func testRequestIdIsHash256OfTheAppEphemeralKey() { - // hash256 of the empty string, a published vector. - XCTAssertEqual( - AppConnect.requestId(appEphemeralPubKey: Data()).toHexString(), - "5df6e0e2761359d30a8275058e299fcc0381534545f55cf43e41983f5d4c9456") - XCTAssertEqual(AppConnect.requestId(appEphemeralPubKey: Data(repeating: 0x02, count: 33)).count, 32) - } - - func testSessionKeyIsAbsentUntilItsHashIsOnTheIdentity() { - let other = Self.key(keyId: 4, data: Data(repeating: 0x22, count: 20)) - XCTAssertEqual(Self.sessionKeyState(keys: [other]), .absent) - // The same bytes under another key type are a different key. - let sameBytesOtherType = Self.key(keyId: 5, keyType: .ecdsaSecp256k1, data: Self.sessionKeyHash) - XCTAssertEqual(Self.sessionKeyState(keys: [sameBytesOtherType]), .absent) - } - - func testRegisteredSessionKeyOfTheAppIsUsableWithItsKeyId() { - XCTAssertEqual(Self.sessionKeyState(keys: [Self.sessionKey()]), .usable(keyId: 9)) - // Registered a moment ago by a clock that has since been set back. - let afterClockCorrection = Self.sessionKey(expiresAt: Self.nowMilliseconds + 3_600_000 + 60_000) - XCTAssertEqual(Self.sessionKeyState(keys: [afterClockCorrection]), .usable(keyId: 9)) - // Limits narrower than the approved terms are within them. - let narrower = Self.sessionKey( - totalBudget: Self.terms.budgetCredits - 1, expiresAt: Self.nowMilliseconds + 1) - XCTAssertEqual(Self.sessionKeyState(keys: [narrower]), .usable(keyId: 9)) - } - - func testDisabledExpiredOrMisregisteredSessionKeyIsUnusable() { - let latestExpiry = Int64(Self.terms.expiresAt(from: Self.now.addingTimeInterval(AppConnect.clockTolerance))) - let unusable: [(String, ManagedIdentity.IdentityPublicKeyInfo)] = [ - ("disabled", Self.sessionKey(disabledAt: 1)), - ("expired", Self.sessionKey(expiresAt: Self.nowMilliseconds)), - ("wrong level", Self.sessionKey(securityLevel: .critical)), - ("wrong purpose", Self.sessionKey(purpose: .transfer)), - ("no budget", Self.sessionKey(totalBudget: nil)), - ("no expiry", Self.sessionKey(expiresAt: nil)), - ("budget above the approved one", Self.sessionKey(totalBudget: Self.terms.budgetCredits + 1)), - ("expiry after the approved one", Self.sessionKey(expiresAt: latestExpiry + 1)), - ] - for (name, key) in unusable { - XCTAssertEqual(Self.sessionKeyState(keys: [key]), .unusable, name) - } - } - - /// The key is derived from the identity and the request's ephemeral key - /// alone, so a request that repeats another app's ephemeral key finds - /// that app's key on the identity. - func testARegisteredSessionKeyBoundToAnotherAppIsUnusable() { - let otherApp = Data(repeating: 0xB2, count: 32) - let boundElsewhere = [AppConnect.KeyBinding(keyId: 9, data: Self.sessionKeyHash, singleContractId: otherApp)] - XCTAssertEqual(Self.sessionKeyState(keys: [Self.sessionKey()], bindings: boundElsewhere), .unusable) - // A grant record does not outweigh a bound the store can read. - XCTAssertEqual( - Self.sessionKeyState(keys: [Self.sessionKey()], bindings: boundElsewhere, grantedKeyIds: [9]), - .unusable) - let unbound = [AppConnect.KeyBinding(keyId: 9, data: Self.sessionKeyHash, singleContractId: nil)] - XCTAssertEqual(Self.sessionKeyState(keys: [Self.sessionKey()], bindings: unbound), .unusable) - } - - func testARegisteredSessionKeyTheStoreCannotPlaceNeedsAGrantRecord() { - let unplaced: [[AppConnect.KeyBinding]] = [ - [], - // The stored row under this id is for a different key. - [AppConnect.KeyBinding(keyId: 9, data: Data([0xFF]), singleContractId: Self.app)], - [AppConnect.KeyBinding( - keyId: 9, data: Self.sessionKeyHash, singleContractId: nil, hasUnreadableBound: true)], - ] - for bindings in unplaced { - XCTAssertEqual(Self.sessionKeyState(keys: [Self.sessionKey()], bindings: bindings), .unusable) - XCTAssertEqual( - Self.sessionKeyState(keys: [Self.sessionKey()], bindings: bindings, grantedKeyIds: [8]), - .unusable) - XCTAssertEqual( - Self.sessionKeyState(keys: [Self.sessionKey()], bindings: bindings, grantedKeyIds: [9]), - .usable(keyId: 9)) - } - } - - func testTheOneQrLoginHasTermsAndTheTwoQrLoginHasNone() { - XCTAssertEqual(AppConnect.login(protocolVersion: 13), .twoQR) - XCTAssertEqual(AppConnect.login(protocolVersion: 14), .oneQR(.current)) - XCTAssertNil(AppConnect.Login.twoQR.sessionKeyTerms) - XCTAssertNil(AppConnect.Login.unresolved.sessionKeyTerms) - XCTAssertEqual(AppConnect.Login.oneQR(.current).sessionKeyTerms, .current) - // A request built without asking the network is not a two-QR one. - XCTAssertEqual(ConnectionRequest(loginRequest: MockDashConnectDataSource.sampleLoginRequest).login, .unresolved) - XCTAssertEqual(AppConnect.SessionKeyTerms.current.budgetCredits, AppConnect.sessionKeyBudgetCredits) - XCTAssertEqual(AppConnect.SessionKeyTerms.current.lifetime, AppConnect.sessionKeyLifetime) - } - - func testTheApprovalSheetNamesTheBudgetInDashAndTheLifetimeInDays() { - let terms = AppConnect.SessionKeyTerms(budgetCredits: 5_000_000_000, lifetime: 90 * 24 * 60 * 60) - XCTAssertEqual(terms.budgetText.filter { $0.isNumber || $0.isLetter }, "005DASH") - XCTAssertEqual(terms.lifetimeDays, 90) - } - - /// A response an earlier login deleted is published again when its - /// request comes back. If that publish never confirms, the record must - /// not say the response is gone: a disconnect would drop it and leave - /// the response on Platform with nothing pointing at it. - func testARepublishThatNeverConfirmsKeepsItsRecordThroughADisconnect() { - var republished = Self.grant(sessionKeyId: 9) - republished.responseDeleted = true - republished.markPublishStarted() - XCTAssertNil(republished.documentId) - XCTAssertTrue(republished.hasUnconfirmedResponse) - - var knownGone = Self.grant(sessionKeyId: 10) - knownGone.responseDeleted = true - var otherApp = Self.grant(sessionKeyId: 11) - otherApp.responseDeleted = true - var grants = [republished, knownGone, otherApp] - AppConnect.markKeysDisabled(in: &grants) { $0.sessionKeyId != 11 } - - XCTAssertEqual(grants.map(\.sessionKeyId), [9, 11]) - XCTAssertEqual(grants.map(\.keyDisabled), [true, nil]) - XCTAssertTrue(grants[0].hasUnconfirmedResponse, "the disconnect still has a response to look for") - } - - func testNextKeyIdFollowsTheHighestKeyOnTheIdentity() { - XCTAssertEqual(AppConnect.nextKeyId(currentIdentityPublicKeys: []), 1) - XCTAssertEqual( - AppConnect.nextKeyId(currentIdentityPublicKeys: [ - Self.key(keyId: 0, data: Data([1])), - Self.key(keyId: 7, data: Data([2]), disabledAt: 1), - Self.key(keyId: 3, data: Data([3])), - ]), - 8) - } - - /// An app can register a key under the last id there is. The next key - /// then takes the lowest free id, and disabling that key changes nothing: - /// its id stays taken. - func testAKeyOnTheLastIdLeavesTheLowestFreeIdForTheNextKey() { - // A key id is a UInt32 the SDK carries as an Int32 bit pattern. - let last = Self.key(keyId: -1, data: Data([1])) - XCTAssertEqual(AppConnect.nextKeyId(currentIdentityPublicKeys: [last]), 0) - let disabledLast = Self.key(keyId: -1, data: Data([1]), disabledAt: 1) - XCTAssertEqual( - AppConnect.nextKeyId(currentIdentityPublicKeys: [ - Self.key(keyId: 0, data: Data([0])), Self.key(keyId: 1, data: Data([2])), - Self.key(keyId: 2, data: Data([3]), disabledAt: 1), disabledLast, - ]), - 3, "a disabled key keeps its id") - XCTAssertEqual( - AppConnect.nextKeyId(currentIdentityPublicKeys: [Self.key(keyId: -2, data: Data([2]))]), - .max) - } - - func testDisconnectDisablesOnlyTheLiveSessionKeysItGranted() { - let grants = [9, 11, 12, 13].map { Self.grant(sessionKeyId: $0) } - let keys = [ - Self.key(keyId: 0, securityLevel: .master, keyType: .ecdsaSecp256k1, data: Data([0])), - Self.key(keyId: 9, data: Data([9])), - // Not granted by these responses. - Self.key(keyId: 10, data: Data([10])), - // Already disabled. - Self.key(keyId: 11, data: Data([11]), disabledAt: 1), - // The id now belongs to a key this login would never register. - Self.key(keyId: 12, securityLevel: .critical, data: Data([12])), - // 13 is not on the identity at all. - Self.key(keyId: 14, data: Data([14])), - ] - let app = Data(repeating: 0xA1, count: 32) - XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable( - for: grants, appContractId: app, bindings: [], currentIdentityPublicKeys: keys), - [9]) - XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable( - for: [], appContractId: app, bindings: [], currentIdentityPublicKeys: keys), - []) - } - - func testDisconnectAlsoDisablesLiveKeysBoundToTheAppThatHaveNoGrantRecord() { - let app = Data(repeating: 0xA1, count: 32) - let otherApp = Data(repeating: 0xB2, count: 32) - let keys = [ - Self.key(keyId: 6, data: Data([6]), totalBudget: 5, expiresAt: 9_999), - Self.key(keyId: 7, data: Data([7]), totalBudget: 5, expiresAt: 9_999), - Self.key(keyId: 8, data: Data([8]), disabledAt: 1), - Self.key(keyId: 9, data: Data([9]), totalBudget: 5, expiresAt: 9_999), - Self.key(keyId: 10, data: Data([10]), totalBudget: 5, expiresAt: 9_999), - Self.key(keyId: 11, data: Data([11]), totalBudget: 5, expiresAt: 9_999), - // Bound to the app and of the same kind, but without limits and - // without a grant record: not a key this login registered. - Self.key(keyId: 13, data: Data([13])), - // Bound to the app, but not a key this login registers. - Self.key( - keyId: 12, purpose: .encryption, securityLevel: .medium, keyType: .ecdsaSecp256k1, - data: Data([12]), totalBudget: 5, expiresAt: 9_999), - // Bound to the app with one limit only. - Self.key(keyId: 14, data: Data([14]), expiresAt: 9_999), - ] - let bindings = [ - AppConnect.KeyBinding(keyId: 6, data: Data([6]), singleContractId: app), - AppConnect.KeyBinding(keyId: 7, data: Data([7]), singleContractId: app), - AppConnect.KeyBinding(keyId: 8, data: Data([8]), singleContractId: app), - AppConnect.KeyBinding(keyId: 9, data: Data([9]), singleContractId: app), - AppConnect.KeyBinding(keyId: 10, data: Data([10]), singleContractId: otherApp), - // The stored row under this id is for a different key. - AppConnect.KeyBinding(keyId: 11, data: Data([0xFF]), singleContractId: app), - AppConnect.KeyBinding(keyId: 12, data: Data([12]), singleContractId: app), - AppConnect.KeyBinding(keyId: 13, data: Data([13]), singleContractId: app), - AppConnect.KeyBinding(keyId: 14, data: Data([14]), singleContractId: app), - ] - XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable( - for: [Self.grant(sessionKeyId: 9)], - appContractId: app, - bindings: bindings, - currentIdentityPublicKeys: keys), - [6, 7, 9]) - XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable( - for: [], appContractId: otherApp, bindings: bindings, currentIdentityPublicKeys: keys), - [10]) - // Key 7 is the two-QR login's authentication key, given limits by - // its `dash-st:` registration: it stays unless a grant names it. - XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable( - for: [Self.grant(sessionKeyId: 9)], - appContractId: app, - bindings: bindings, - currentIdentityPublicKeys: keys, - twoQRAuthenticationKeyHash160: Data([7])), - [6, 9]) - } - - /// Keys of the app on an identity that is not the active one are - /// recognised from the wallet's store: no grant record names them. - func testTheStoreShowsAnAppKeyHeldOnAnotherIdentityWhileItIsLive() { - let app = Data(repeating: 0xA1, count: 32) - let authentication = Data(repeating: 0x51, count: 20) - let encryption = Data(repeating: 0x52, count: 33) - func holdsTwoQR(_ bindings: [AppConnect.KeyBinding]) -> Bool { - AppConnect.holdsLiveTwoQRLoginKey( - authenticationPublicKeyHash160: authentication, encryptionPublicKey: encryption, bindings: bindings) - } - func authenticationKey(data: Data = authentication, isDisabled: Bool = false) -> AppConnect.KeyBinding { - AppConnect.KeyBinding( - keyId: 3, data: data, singleContractId: app, isDisabled: isDisabled, - isTwoQRAuthenticationKeyShaped: true) - } - let encryptionKey = AppConnect.KeyBinding( - keyId: 4, data: encryption, singleContractId: nil, isTwoQREncryptionKeyShaped: true) - - XCTAssertTrue(holdsTwoQR([authenticationKey()])) - XCTAssertTrue(holdsTwoQR([authenticationKey(isDisabled: true), encryptionKey])) - XCTAssertFalse(holdsTwoQR([authenticationKey(isDisabled: true)])) - // Another app's key: same kind, another payload. - XCTAssertFalse(holdsTwoQR([authenticationKey(data: Data(repeating: 0x53, count: 20))])) - // The same bytes under another kind are not that key. - XCTAssertFalse(holdsTwoQR([AppConnect.KeyBinding(keyId: 5, data: authentication, singleContractId: app)])) - XCTAssertFalse(holdsTwoQR([])) - - let sessionKey = AppConnect.KeyBinding( - keyId: 6, data: Data([6]), singleContractId: app, isSessionKeyShaped: true) - var disabledSessionKey = sessionKey - disabledSessionKey.isDisabled = true - XCTAssertTrue(AppConnect.holdsLiveSessionKey(appContractId: app, bindings: [sessionKey])) - XCTAssertFalse(AppConnect.holdsLiveSessionKey(appContractId: app, bindings: [disabledSessionKey])) - XCTAssertFalse( - AppConnect.holdsLiveSessionKey(appContractId: Data(repeating: 0xB2, count: 32), bindings: [sessionKey])) - // The two-QR authentication key is bound to the app but carries no limits. - XCTAssertFalse(AppConnect.holdsLiveSessionKey(appContractId: app, bindings: [authenticationKey()])) - } - func testOnlyAWholeSingleContractBoundNamesTheApp() { let app = Data(repeating: 0xA1, count: 32) XCTAssertEqual(AppConnect.singleContractId(boundsKind: 1, boundIds: [app]), app) @@ -2105,94 +1807,6 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertFalse(AppConnect.isReadableBound(boundsKind: 4, boundIds: [app])) } - func testAKeyBoundElsewhereOrNotAtAllIsNeitherDisabledNorUnknown() { - let app = Data(repeating: 0xA1, count: 32) - let keys = [4, 5, 6].map { - Self.key(keyId: Int32($0), data: Data([UInt8($0)]), totalBudget: 5, expiresAt: 9_999) - } - let bindings = [ - // A document-type bound and an unbounded key both store no single contract. - AppConnect.KeyBinding(keyId: 4, data: Data([4]), singleContractId: nil), - AppConnect.KeyBinding(keyId: 5, data: Data([5]), singleContractId: nil), - AppConnect.KeyBinding(keyId: 6, data: Data([6]), singleContractId: Data(repeating: 0xB2, count: 32)), - ] - XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable( - for: [], appContractId: app, bindings: bindings, currentIdentityPublicKeys: keys), - []) - XCTAssertEqual( - AppConnect.sessionKeyIdsWithUnknownBinding(for: [], bindings: bindings, currentIdentityPublicKeys: keys), - []) - } - - func testAStoredLiveKeyOfTheAppMissingFromTheIdentityViewIsReported() { - let app = Data(repeating: 0xA1, count: 32) - let otherApp = Data(repeating: 0xB2, count: 32) - let keys = [Self.key(keyId: 6, data: Data([6]))] - let bindings = [ - AppConnect.KeyBinding(keyId: 6, data: Data([6]), singleContractId: app), - AppConnect.KeyBinding(keyId: 7, data: Data([7]), singleContractId: app), - AppConnect.KeyBinding(keyId: 8, data: Data([8]), singleContractId: app, isDisabled: true), - AppConnect.KeyBinding(keyId: 9, data: Data([9]), singleContractId: otherApp), - ] - XCTAssertEqual(AppConnect.boundKeyIdsMissing(from: keys, appContractId: app, bindings: bindings), [7]) - } - - func testALiveSessionKeyTheStoreCannotPlaceStopsADisconnect() { - let app = Data(repeating: 0xA1, count: 32) - let keys = [ - Self.key(keyId: 0, securityLevel: .master, keyType: .ecdsaSecp256k1, data: Data([0])), - Self.key(keyId: 6, data: Data([6])), - Self.key(keyId: 7, data: Data([7])), - Self.key(keyId: 8, data: Data([8]), disabledAt: 1), - Self.key(keyId: 9, data: Data([9])), - Self.key(keyId: 11, data: Data([11])), - ] - let bindings = [ - AppConnect.KeyBinding(keyId: 6, data: Data([6]), singleContractId: nil), - AppConnect.KeyBinding(keyId: 11, data: Data([0xFF]), singleContractId: app), - AppConnect.KeyBinding(keyId: 14, data: Data([14]), singleContractId: nil, hasUnreadableBound: true), - ] - // 0 and 8 cannot be session keys that sign; 6 is in the store; 9 has - // a grant record. 7 is unknown, so is 11 (its row is another key) and - // 14 (its stored bound cannot be read). - XCTAssertEqual( - AppConnect.sessionKeyIdsWithUnknownBinding( - for: [Self.grant(sessionKeyId: 9)], - bindings: bindings, - currentIdentityPublicKeys: keys + [Self.key(keyId: 14, data: Data([14]))]), - [7, 11, 14]) - } - - private static func grant(sessionKeyId: UInt32) -> AppConnectGrant { - AppConnectGrant( - identityId: "identity", appContractId: "app", documentId: "document-\(sessionKeyId)", - values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), - sessionKeyId: sessionKeyId, totalBudget: nil, expiresAt: nil, - publishedAt: Date(timeIntervalSince1970: 1_000)) - } - - func testSessionKeyIsBoundToTheRequestedContractWithBothLimits() { - let hash = Data(repeating: 0x11, count: 20) - let contractId = Data(repeating: 0x33, count: 32) - let key = AppConnect.sessionIdentityPubkey( - keyId: 8, publicKeyHash160: hash, appContractId: contractId, totalBudget: 5, expiresAt: 6) - XCTAssertEqual(key.keyId, 8) - XCTAssertEqual(key.keyType, .ecdsaHash160) - XCTAssertEqual(key.purpose, .authentication) - XCTAssertEqual(key.securityLevel, .high) - XCTAssertEqual(key.pubkeyBytes, hash) - XCTAssertEqual(key.contractBounds, .singleContract(id: contractId)) - XCTAssertEqual(key.totalBudget, 5) - XCTAssertEqual(key.expiresAt, 6) - } - - func testExpiryIsTheLifetimeAfterNowInMilliseconds() { - XCTAssertEqual( - AppConnect.SessionKeyTerms(budgetCredits: 1, lifetime: 60).expiresAt(from: Date(timeIntervalSince1970: 1_000)), - 1_060_000) - } - func testResponseCarriesTheSessionKeyOnlyTheAppCanDecrypt() throws { let sessionPrivateKey = Data(repeating: 0x5a, count: 32) let appEphemeralPrivateKey = Data(repeating: 0x07, count: 32) @@ -2238,44 +1852,6 @@ final class AppConnectLoginTests: XCTestCase { ]) } - func testAGrantWrittenBeforeTheDeleteFlagsExistedStillLoads() throws { - // The shape the first device run stored: no `responseDeleted`, no - // `keyDisabled`. Losing it would leave that key impossible to find. - let stored = """ - [{"identityId":"identity","appContractId":"app","documentId":"document", - "values":{"appEphemeralPubKeyHash":"aa","walletEphemeralPubKey":"bb","encryptedPayload":"cc"}, - "sessionKeyId":6,"totalBudget":5000000000,"expiresAt":1799315762000,"publishedAt":1791539765792}] - """ - defaults.set(Data(stored.utf8), forKey: "scope.app-connect-responses.v1") - let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } - - let grant = try XCTUnwrap(store.load().first) - XCTAssertEqual(grant.sessionKeyId, 6) - XCTAssertEqual(grant.documentId, "document") - XCTAssertNil(grant.responseDeleted) - XCTAssertNil(grant.keyDisabled) - XCTAssertTrue(grant.hasDeletableResponse) - } - - func testASavedGrantIsLoadedWithTheSameKey() { - let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } - let grant = AppConnectGrant( - identityId: "identity", appContractId: "app", documentId: nil, - values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), - sessionKeyId: 6, totalBudget: nil, expiresAt: nil, - publishedAt: Date(timeIntervalSince1970: 1_791_539_765.792_813)) - store.save([grant]) - - XCTAssertEqual(store.load().first?.key, grant.key) - } - - func testAStoreWithoutAScopeCannotPersist() { - XCTAssertTrue( - UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" }.canPersist) - XCTAssertFalse( - UserDefaultsAppConnectResponseStore(defaults: defaults, network: .devnet) { nil }.canPersist) - } - func testResponseValuesAreReadBackFromNumbersBase64AndHex() { let hash = Data(repeating: 0xAB, count: 20) let walletKey = Data([0x02] + [UInt8](repeating: 0x11, count: 32)) @@ -2303,148 +1879,6 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertNil(AppConnect.responseValues(fromDocument: ["$id": "id"], appEphemeralPubKeyHash: hash)) } - func testAnUnconfirmedResponseIsNeitherDeletableNorKnownGone() { - var grant = Self.grant(sessionKeyId: 6) - grant.documentId = nil - XCTAssertTrue(grant.hasUnconfirmedResponse) - XCTAssertFalse(grant.hasDeletableResponse) - - grant.responseDeleted = true - XCTAssertFalse(grant.hasUnconfirmedResponse) - } - - func testARowThisBuildCannotReadIsKeptWhenTheStoreIsSaved() throws { - let stored = """ - [{"somethingNewer":true,"sessionKeyId":4}, - {"identityId":"identity","appContractId":"app","documentId":"document", - "values":{"appEphemeralPubKeyHash":"aa","walletEphemeralPubKey":"bb","encryptedPayload":"cc"}, - "sessionKeyId":6,"publishedAt":1791539765792}] - """ - defaults.set(Data(stored.utf8), forKey: "scope.app-connect-responses.v1") - let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } - - XCTAssertEqual(store.load().map(\.sessionKeyId), [6]) - XCTAssertTrue(store.hasUnreadableRows(identityId: "identity"), "a record load leaves out may name a key") - store.save(store.load() + [Self.grant(sessionKeyId: 7)]) - XCTAssertEqual(store.load().map(\.sessionKeyId), [6, 7]) - - let rows = try XCTUnwrap( - JSONSerialization.jsonObject( - with: try XCTUnwrap(defaults.data(forKey: "scope.app-connect-responses.v1"))) as? [[String: Any]]) - XCTAssertEqual(rows.filter { $0["somethingNewer"] as? Bool == true }.count, 1) - - // Clearing the readable grants must not clear the unreadable row. - store.save([]) - XCTAssertNotNil(defaults.data(forKey: "scope.app-connect-responses.v1")) - } - - func testAnUnreadableRowOfAnotherIdentityLeavesThisOneReadable() { - let stored = #"[{"identityId":"other","somethingNewer":true}]"# - defaults.set(Data(stored.utf8), forKey: "scope.app-connect-responses.v1") - let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } - - XCTAssertFalse(store.hasUnreadableRows(identityId: "identity")) - XCTAssertTrue(store.hasUnreadableRows(identityId: "other")) - } - - func testAStoredValueThatIsNotARowListIsNeverReplaced() { - let suiteName = "AppConnectResponseStoreTests.\(UUID().uuidString)" - let defaults = UserDefaults(suiteName: suiteName)! - defer { defaults.removePersistentDomain(forName: suiteName) } - let key = "scope.app-connect-responses.v1" - let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } - - XCTAssertTrue(store.canPersist) - XCTAssertFalse(store.hasUnreadableRows(identityId: "identity")) - for stored in [Data(#"{"rows":[]}"#.utf8), Data([0xFF, 0x00])] { - defaults.set(stored, forKey: key) - // Nothing new would be kept, so a login must not start. - XCTAssertFalse(store.canPersist) - XCTAssertTrue(store.hasUnreadableRows(identityId: "identity")) - XCTAssertEqual(store.load().count, 0) - store.save([Self.grant(sessionKeyId: 7)]) - XCTAssertEqual(defaults.data(forKey: key), stored) - store.save([]) - XCTAssertEqual(defaults.data(forKey: key), stored) - } - // A value that is not data at all is left alone the same way. - let others: [NSObject] = ["rows" as NSString, ["rows": NSArray()] as NSDictionary, 7 as NSNumber] - for stored in others { - defaults.set(stored, forKey: key) - XCTAssertFalse(store.canPersist) - XCTAssertEqual(store.load().count, 0) - store.save([Self.grant(sessionKeyId: 7)]) - XCTAssertEqual(defaults.object(forKey: key) as? NSObject, stored) - store.save([]) - XCTAssertEqual(defaults.object(forKey: key) as? NSObject, stored) - } - defaults.removeObject(forKey: key) - XCTAssertTrue(store.canPersist) - } - - func testAGrantedKeyMissingFromTheIdentityViewIsReportedNotAssumedGone() { - let grants = [9, 13].map { Self.grant(sessionKeyId: $0) } - let keys = [Self.key(keyId: 9, data: Data([9]), disabledAt: 1)] - XCTAssertEqual(AppConnect.sessionKeyIdsMissing(from: keys, for: grants), [13]) - XCTAssertEqual(AppConnect.sessionKeyIdsMissing(from: keys, for: [grants[0]]), []) - } - - func testAGrantHasNothingToDeleteBeforeItIsPublishedOrAfterItsResponseIsGone() { - var grant = Self.grant(sessionKeyId: 6) - XCTAssertTrue(grant.hasDeletableResponse) - grant.responseDeleted = true - XCTAssertFalse(grant.hasDeletableResponse) - grant.responseDeleted = nil - grant.documentId = nil - XCTAssertFalse(grant.hasDeletableResponse) - } - - func testPublishedResponsesSurviveAReloadAndAreScoped() { - let response = AppConnectGrant( - identityId: "identity", appContractId: "app", documentId: "document", - values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), - sessionKeyId: 8, totalBudget: 5, expiresAt: 6, - publishedAt: Date(timeIntervalSince1970: 1_000)) - var scope: String? = "scope-a" - let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { scope } - - store.save([response]) - XCTAssertEqual(store.load(), [response]) - - scope = "scope-b" - XCTAssertEqual(store.load(), [], "another wallet does not see the records") - scope = nil - store.save([response]) - XCTAssertEqual(store.load(), [], "nothing is stored without a wallet scope") - - scope = "scope-a" - store.save([]) - XCTAssertEqual(store.load(), []) - } - - func testPinnedGrantRecordsStayWithTheirWalletWhenTheActiveOneChanges() { - var walletIdHex: String? = "wallet-b" - let connections = UserDefaultsDashConnectStore( - defaults: defaults, - network: .testnet, - walletIdHexProvider: { walletIdHex }, - devnetNameProvider: { nil } - ) - let store = UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .connections(connections)) - let grant = Self.grant(sessionKeyId: 6) - - // Pinned for the wallet the operation runs for, which the active - // one has already stopped being. - let pinned = store.pinned(toWalletIdHex: "wallet-a") - XCTAssertTrue(pinned.canPersist) - pinned.save([grant]) - - XCTAssertEqual(pinned.load(), [grant]) - XCTAssertEqual(store.load(), [], "the active wallet got none of the records") - walletIdHex = "wallet-a" - XCTAssertEqual(store.load(), [grant]) - } - func testDisconnectOfARowFromAnotherWalletIsRefusedAndTheListMovesToTheActiveWallet() async { let active = ActiveWallet("wallet-a") let row = Self.twoQRRow(status: .active) @@ -2454,7 +1888,7 @@ final class AppConnectLoginTests: XCTestCase { active.idHex = "wallet-b" connections.save([other]) - await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope, includingUnrecorded: false) } XCTAssertEqual(Self.shownRows(dataSource).map(\.id), [other.id], "the list shows the wallet that is active") XCTAssertEqual(connections.load(), [other]) @@ -2470,7 +1904,7 @@ final class AppConnectLoginTests: XCTestCase { active.idHex = "wallet-b" connections.save([row]) - await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope, includingUnrecorded: false) } XCTAssertEqual(connections.load().map(\.status), [.active]) } @@ -2494,13 +1928,13 @@ final class AppConnectLoginTests: XCTestCase { center.post(name: SwiftDashSDKWalletState.activeWalletDidChangeNotification, object: nil) await fulfillment(of: [moved], timeout: 2) - await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope, includingUnrecorded: false) } await dataSource.remove(id: shown[0].id, scope: shown[0].scope) XCTAssertEqual(connections.load(), [row], "the new wallet's row for the same app is untouched") // The row the new list shows is this wallet's own. let current = Self.shownRows(dataSource) - try await dataSource.disconnect(id: current[0].id, scope: current[0].scope) + try await dataSource.disconnect(id: current[0].id, scope: current[0].scope, includingUnrecorded: false) XCTAssertEqual(connections.load().map(\.status), [.approved]) } @@ -2526,7 +1960,7 @@ final class AppConnectLoginTests: XCTestCase { let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) let shown = Self.shownRows(dataSource) - try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) + try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope, includingUnrecorded: false) XCTAssertEqual(connections.load().map(\.status), [.approved]) XCTAssertEqual(Self.shownRows(dataSource).map(\.status), [.approved]) @@ -2544,11 +1978,11 @@ final class AppConnectLoginTests: XCTestCase { // The same wallet and devnet name, pointed at other nodes. endpoint.url = "https://quorums.two.example" - await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope, includingUnrecorded: false) } XCTAssertEqual(connections.load().map(\.status), [.active]) let current = Self.shownRows(dataSource) XCTAssertNotEqual(current[0].scope, shown[0].scope) - try await dataSource.disconnect(id: current[0].id, scope: current[0].scope) + try await dataSource.disconnect(id: current[0].id, scope: current[0].scope, includingUnrecorded: false) XCTAssertEqual(connections.load().map(\.status), [.approved]) } @@ -2557,7 +1991,7 @@ final class AppConnectLoginTests: XCTestCase { let row = Self.twoQRRow(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) - await Self.expectWalletChanged { try await dataSource.disconnect(id: row.id, scope: nil) } + await Self.expectWalletChanged { try await dataSource.disconnect(id: row.id, scope: nil, includingUnrecorded: false) } await dataSource.remove(id: row.id, scope: nil) XCTAssertEqual(connections.load(), [row]) @@ -2640,7 +2074,7 @@ final class AppConnectLoginTests: XCTestCase { } await fulfillment(of: [otherStarted], timeout: 2) - let disconnect = Task { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + let disconnect = Task { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope, includingUnrecorded: false) } try await Task.sleep(nanoseconds: 100_000_000) XCTAssertEqual(connections.load().map(\.status), [.active], "the disconnect has not run yet") @@ -2670,7 +2104,7 @@ final class AppConnectLoginTests: XCTestCase { await fulfillment(of: [otherStarted], timeout: 2) let disconnect = Task { - await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope, includingUnrecorded: false) } } try? await Task.sleep(nanoseconds: 100_000_000) active.idHex = "wallet-b" @@ -2721,333 +2155,12 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertFalse(unscoped.wasResolved(forIdentityId: "identity-a", scope: "wallet-a devnet-one")) } - func testAnUnconfirmedRegistrationIsConfirmedOnlyByItsOwnKeyWithWhatItWasGiven() throws { - let appContractId = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" - let appContract = try XCTUnwrap(Data.identifier(fromBase58: appContractId)) - let template = Self.grant(sessionKeyId: 9) - var pending = AppConnectGrant( - identityId: template.identityId, appContractId: appContractId, documentId: nil, - values: template.values, sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, - publishedAt: template.publishedAt) - let hash = Data(repeating: 0x5A, count: 20) - pending.unconfirmedKeyHash160 = hash.toHexString() - let bound = [AppConnect.KeyBinding(keyId: 9, data: hash, singleContractId: appContract)] - func key( - data: Data = hash, level: SecurityLevel = .high, budget: UInt64? = 5_000, - expiry: Int64? = 6_000, disabledAt: Int64? = nil - ) -> [ManagedIdentity.IdentityPublicKeyInfo] { - [Self.key(keyId: 9, securityLevel: level, data: data, disabledAt: disabledAt, - totalBudget: budget, expiresAt: expiry)] - } - - XCTAssertTrue(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: key(), bindings: bound)) - for (keys, why) in [ - (key(data: Data(repeating: 0x01, count: 20)), "another key under the same id"), - (key(disabledAt: 1), "a disabled key"), - (key(level: .critical), "another security level"), - (key(budget: nil), "no budget"), - (key(budget: 9_000), "another budget"), - (key(expiry: nil), "no expiry"), - ([], "no key at all"), - ] { - XCTAssertFalse(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: keys, bindings: bound), why) - } - XCTAssertFalse( - AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: key(), bindings: []), - "a bound the store does not show is not taken on trust") - let otherApp = [AppConnect.KeyBinding(keyId: 9, data: hash, singleContractId: Data(repeating: 0x77, count: 32))] - XCTAssertFalse( - AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: key(), bindings: otherApp), - "bound to another app") - - var grants = [pending] - XCTAssertEqual( - AppConnect.confirmRegistrations( - in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: [], bindings: bound), - [], "a key not in the view is not taken as never registered") - XCTAssertTrue(grants[0].isUnconfirmed) - XCTAssertEqual( - AppConnect.confirmRegistrations( - in: &grants, identityId: "another identity", currentIdentityPublicKeys: key(), bindings: bound), []) - let confirmed = AppConnect.confirmRegistrations( - in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: key(), bindings: bound) - XCTAssertEqual(confirmed.map(\.key), [pending.key]) - XCTAssertFalse(grants[0].isUnconfirmed) - } - - /// A recovered one-QR registration turns the app's existing row into an - /// active one-QR row: a two-QR row still waiting for its second scan - /// would otherwise keep that banner over a live session key. - func testConfirmingARegistrationActivatesTheAppsExistingRow() { - let appA = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" - let appB = "BbWcUA8Msi7HSgC2hCJsCtDADs2FzQVabRuHvk1tnj4d" - let earlier = Date(timeIntervalSince1970: 1_000) - let confirmedAt = Date(timeIntervalSince1970: 2_000) - var waiting = DAppConnection( - id: appA, name: "App A", url: "https://a.example", - status: .approved, updatedAt: earlier, loginKind: .twoQR) - waiting.scope = "wallet-a devnet-one" - let other = DAppConnection( - id: appB, name: "App B", url: "https://b.example", - status: .approved, updatedAt: earlier, loginKind: .twoQR) - - let rows = PlatformDashConnectDataSource.rowsAfterConfirming( - appIds: [appA], in: [waiting, other], at: confirmedAt) - - XCTAssertEqual(rows.count, 2) - let a = rows[0] - XCTAssertEqual(a.id, appA) - XCTAssertEqual(a.status, .active) - XCTAssertEqual(a.loginKind, .oneQR) - XCTAssertEqual(a.updatedAt, confirmedAt) - XCTAssertEqual(a.name, "App A") - XCTAssertEqual(a.url, "https://a.example") - XCTAssertEqual(a.scope, "wallet-a devnet-one") - let b = rows[1] - XCTAssertEqual(b.status, .approved, "an app whose key was not confirmed keeps its row") - XCTAssertEqual(b.loginKind, .twoQR) - XCTAssertEqual(b.updatedAt, earlier) - } - - /// An app with a confirmed key but no row gets an active one-QR row. - func testConfirmingARegistrationAddsARowForAnAppWithout() { - let appA = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" - let confirmedAt = Date(timeIntervalSince1970: 2_000) - - let rows = PlatformDashConnectDataSource.rowsAfterConfirming(appIds: [appA], in: [], at: confirmedAt) - - XCTAssertEqual(rows.map(\.id), [appA]) - XCTAssertEqual(rows.first?.status, .active) - XCTAssertEqual(rows.first?.loginKind, .oneQR) - XCTAssertEqual(rows.first?.updatedAt, confirmedAt) - } - - /// A grant confirmed with no row saved after it, as an app terminated - /// between the two writes leaves it, gets its app's row back: when the - /// app has none, and when the row it has is a two-QR one. - func testAConfirmedGrantWithoutItsOneQRRowGetsItsRowBack() throws { - let appA = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" - let appB = "BbWcUA8Msi7HSgC2hCJsCtDADs2FzQVabRuHvk1tnj4d" - func grant(app: String, keyId: UInt32, identity: String = "identity") -> AppConnectGrant { - let template = Self.grant(sessionKeyId: keyId) - return AppConnectGrant( - identityId: identity, appContractId: app, documentId: nil, values: template.values, - sessionKeyId: keyId, totalBudget: nil, expiresAt: nil, publishedAt: template.publishedAt) - } - let keys = [ - Self.key(keyId: 7, data: Data(repeating: 0x07, count: 20)), - Self.key(keyId: 8, data: Data(repeating: 0x08, count: 20)), - ] - // Key 7 bound to app A as the store shows it, so an unconfirmed - // record of it would hold its key. - let bindings = [AppConnect.KeyBinding( - keyId: 7, data: Data(repeating: 0x07, count: 20), - singleContractId: try XCTUnwrap(Data.identifier(fromBase58: appA)))] - func appIds(_ grants: [AppConnectGrant], rows: [DAppConnection], keys: [ManagedIdentity.IdentityPublicKeyInfo] = keys) - -> Set { - PlatformDashConnectDataSource.appIdsWithoutTheirOneQRRow( - grants: grants, identityId: "identity", currentIdentityPublicKeys: keys, bindings: bindings, rows: rows) - } - let earlier = Date(timeIntervalSince1970: 1_000) - let twoQRRow = DAppConnection( - id: appA, name: "App A", url: "", status: .approved, updatedAt: earlier, loginKind: .twoQR) - let oneQRRow = DAppConnection( - id: appA, name: "App A", url: "", status: .active, updatedAt: earlier, loginKind: .oneQR) - - XCTAssertEqual(appIds([grant(app: appA, keyId: 7)], rows: []), [appA], "no row") - XCTAssertEqual(appIds([grant(app: appA, keyId: 7)], rows: [twoQRRow]), [appA], "a two-QR row") - XCTAssertEqual(appIds([grant(app: appA, keyId: 7)], rows: [oneQRRow]), [], "the row is there") - XCTAssertEqual( - appIds([grant(app: appA, keyId: 7), grant(app: appB, keyId: 8)], rows: [oneQRRow]), [appB], - "a later approval for another app finds the row this one lost") - - var disabled = grant(app: appA, keyId: 7) - disabled.keyDisabled = true - XCTAssertEqual(appIds([disabled], rows: []), [], "a disconnected grant") - XCTAssertEqual( - appIds([grant(app: appA, keyId: 7)], rows: [], - keys: [Self.key(keyId: 7, data: Data(repeating: 0x07, count: 20), disabledAt: 1)]), - [], "a key disabled on the identity") - XCTAssertEqual(appIds([grant(app: appA, keyId: 9)], rows: []), [], "a key the identity does not hold") - XCTAssertEqual(appIds([grant(app: appA, keyId: 7, identity: "other")], rows: []), [], "another identity") - var unconfirmed = grant(app: appA, keyId: 7) - unconfirmed.unconfirmedKeyHash160 = Data(repeating: 0x07, count: 20).toHexString() - XCTAssertTrue(AppConnect.holdsRecordedKey(unconfirmed, currentIdentityPublicKeys: keys, bindings: bindings)) - XCTAssertEqual(appIds([unconfirmed], rows: []), [], "an unconfirmed grant is left to its confirmation") - - // What the row becomes. - let rows = PlatformDashConnectDataSource.rowsAfterConfirming( - appIds: appIds([grant(app: appA, keyId: 7)], rows: [twoQRRow]), in: [twoQRRow], - at: Date(timeIntervalSince1970: 2_000)) - XCTAssertEqual(rows.map(\.status), [.active]) - XCTAssertEqual(rows.map(\.loginKind), [.oneQR]) - } - - /// What a fresh view says of an unconfirmed registration: its key live - /// under its id, an update that can never land once the identity is at - /// its revision without the key, or one that may still land. - func testAnUnconfirmedRegistrationIsSettledByItsKeyAndTheIdentityRevision() { - let hash = Data(repeating: 0x5A, count: 20) - let template = Self.grant(sessionKeyId: 9) - var pending = AppConnectGrant( - identityId: "identity", appContractId: "app", documentId: nil, values: template.values, - sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) - pending.unconfirmedKeyHash160 = hash.toHexString() - pending.submittedRevision = 4 - func outcome( - _ grant: AppConnectGrant, keys: [ManagedIdentity.IdentityPublicKeyInfo], revision: UInt64 - ) -> PlatformDashConnectDataSource.RegistrationOutcome { - PlatformDashConnectDataSource.registrationOutcome( - of: grant, currentIdentityPublicKeys: keys, identityRevision: revision) - } - - XCTAssertEqual(outcome(pending, keys: [Self.key(keyId: 9, data: hash)], revision: 4), .keyLive) - // Still at the revision the update was built on: it may land. - XCTAssertEqual(outcome(pending, keys: [], revision: 3), .mayStillLand) - // Another update took the revision, or this one landed and its key - // was turned off since. - XCTAssertEqual(outcome(pending, keys: [], revision: 4), .cannotLand) - XCTAssertEqual(outcome(pending, keys: [], revision: 7), .cannotLand) - XCTAssertEqual(outcome(pending, keys: [Self.key(keyId: 9, data: hash, disabledAt: 1)], revision: 4), .cannotLand) - // A refused submission under id 9 and a later one of the same request - // that landed under id 12: the record of the first is not that key. - XCTAssertEqual( - outcome(pending, keys: [Self.key(keyId: 9, data: Data([9])), Self.key(keyId: 12, data: hash)], revision: 5), - .cannotLand) - var unnoted = pending - unnoted.submittedRevision = nil - XCTAssertEqual(outcome(unnoted, keys: [], revision: 9), .unknownRevision) - XCTAssertEqual(outcome(unnoted, keys: [Self.key(keyId: 9, data: hash)], revision: 9), .keyLive) - } - - /// After a disable update of the disconnect has landed, a registration - /// that could still land when its keys were picked has either put its - /// key on the identity, which is then picked for disabling too, or - /// never will. - func testARegistrationThatLandedWhileTheDisconnectRanIsPickedForDisabling() throws { - let hash = Data(repeating: 0x5A, count: 20) - let template = Self.grant(sessionKeyId: 9) - var pending = AppConnectGrant( - identityId: "identity", appContractId: "app", documentId: nil, values: template.values, - sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) - pending.unconfirmedKeyHash160 = hash.toHexString() - pending.submittedRevision = 4 - func landed(keys: [ManagedIdentity.IdentityPublicKeyInfo], revision: UInt64) throws -> [UInt32] { - try PlatformDashConnectDataSource.keyIdsOfRegistrationsThatLanded( - [pending], currentIdentityPublicKeys: keys, identityRevision: revision) - } - - // Landed at 4 before the disable update, which then took 5. - XCTAssertEqual(try landed(keys: [Self.key(keyId: 9, data: hash)], revision: 5), [9]) - // The disable update took 4: the registration can never land. - XCTAssertEqual(try landed(keys: [], revision: 4), []) - // It landed and its key is off already. - XCTAssertEqual(try landed(keys: [Self.key(keyId: 9, data: hash, disabledAt: 1)], revision: 6), []) - // A node still below the disable update cannot settle it. - XCTAssertThrowsError(try landed(keys: [], revision: 3)) { error in - guard case DashConnectPlatformError.identityKeysOutOfDate = error else { - return XCTFail("unexpected error: \(error)") - } - } - } - - /// A row stays for another identity of the wallet that holds a key of - /// the app, or may still be given one by a registration with a noted - /// revision. Only that identity's own read settles the registration. - func testAnotherIdentityKeepsTheRowForItsLiveKeyOrPendingRegistration() { - let template = Self.grant(sessionKeyId: 9) - func record(identity: String, app: String = "app", unconfirmed: Bool, revision: UInt64? = 4) -> AppConnectGrant { - var grant = AppConnectGrant( - identityId: identity, appContractId: app, documentId: nil, values: template.values, - sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) - if unconfirmed { - grant.unconfirmedKeyHash160 = Data(repeating: 0x5A, count: 20).toHexString() - grant.submittedRevision = revision - } - return grant - } - func reason(_ grants: [AppConnectGrant], heldOnAnotherIdentity: Bool = false) -> String? { - PlatformDashConnectDataSource.reasonHeldElsewhere( - grants: grants, appContractId: "app", identityId: "b", - heldOnAnotherIdentity: heldOnAnotherIdentity - ).map { "\($0)" } - } - var disabled = record(identity: "a", unconfirmed: false) - disabled.keyDisabled = true - - XCTAssertNil(reason([])) - XCTAssertNil(reason([record(identity: "b", unconfirmed: true)]), "this identity's own registration") - XCTAssertNil(reason([record(identity: "a", app: "other", unconfirmed: true)])) - XCTAssertNil(reason([disabled])) - XCTAssertNil( - reason([record(identity: "a", unconfirmed: true, revision: nil)]), - "a record with no revision can never be settled, so it takes no part") - XCTAssertEqual(reason([record(identity: "a", unconfirmed: true)]), "registrationPendingOnAnotherIdentity") - XCTAssertEqual(reason([record(identity: "a", unconfirmed: false)]), "grantOnAnotherIdentity") - XCTAssertEqual(reason([], heldOnAnotherIdentity: true), "grantOnAnotherIdentity") - XCTAssertEqual( - reason([record(identity: "a", unconfirmed: true), record(identity: "c", unconfirmed: false)]), - "grantOnAnotherIdentity", "a live key comes first") - } - - /// A live key of a confirmed grant, a confirmed grant not recorded as - /// off while no two-QR login key is live, or a registration that may - /// still land makes the disconnect one-QR even over a two-QR row. - func testWhatMakesADisconnectOneQR() { - func oneQR( - row: Bool = false, live: Bool = false, unrevoked: Bool = false, twoQRKeyLive: Bool = false, - pending: Bool = false - ) -> Bool { - PlatformDashConnectDataSource.disconnectsAsOneQR( - rowIsOneQR: row, holdsLiveGrantedKey: live, holdsUnrevokedGrant: unrevoked, - holdsLiveTwoQRLoginKey: twoQRKeyLive, hasRegistrationThatMayStillLand: pending) - } - - XCTAssertFalse(oneQR(), "a two-QR row and nothing live") - XCTAssertTrue(oneQR(row: true)) - XCTAssertTrue( - oneQR(live: true, unrevoked: true, twoQRKeyLive: true), - "a confirmed grant over a two-QR row, its row write lost") - XCTAssertTrue(oneQR(unrevoked: true), "a one-QR disconnect that stopped after disabling every key") - XCTAssertFalse( - oneQR(unrevoked: true, twoQRKeyLive: true), - "a two-QR login came after the grant's key went off: the row is its") - XCTAssertTrue(oneQR(pending: true), "the one-QR disable update settles the registration") - } - - /// A two-QR row with a registration of the app whose outcome is not - /// known is not turned off locally: the disconnect goes to Platform, and - /// when that cannot be done the row stays as it was. - func testATwoQRRowWithARegistrationThatMayStillLandIsNotTurnedOffLocally() async throws { - let active = ActiveWallet("wallet-a") - let row = Self.twoQRRow(status: .active) - let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) - let grants = UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .connections(connections)) - let template = Self.grant(sessionKeyId: 9) - var pending = AppConnectGrant( - identityId: "identity", appContractId: row.id, documentId: nil, values: template.values, - sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) - pending.unconfirmedKeyHash160 = Data(repeating: 0x5A, count: 20).toHexString() - pending.submittedRevision = 4 - grants.pinned(toWalletIdHex: "wallet-a").save([pending]) - let shown = Self.shownRows(dataSource) - - do { - try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) - XCTFail("turned off locally while the registration may still land") - } catch {} - - XCTAssertEqual(connections.load().map(\.status), [.active]) - XCTAssertEqual(connections.load().map(\.loginKind), [.twoQR]) - XCTAssertEqual(grants.pinned(toWalletIdHex: "wallet-a").load().map(\.key), [pending.key]) - } - func testDisconnectWithNoActiveWalletIsRefused() async { let active = ActiveWallet(nil) let (dataSource, _) = makeScopedDataSource(active: active) do { - try await dataSource.disconnect(id: Self.twoQRRow(status: .active).id, scope: nil) + try await dataSource.disconnect(id: Self.twoQRRow(status: .active).id, scope: nil, includingUnrecorded: false) XCTFail("disconnected with no wallet") } catch { guard case DashConnectPlatformError.noWallet = error else { @@ -3108,7 +2221,7 @@ final class AppConnectLoginTests: XCTestCase { let dataSource = PlatformDashConnectDataSource( supportedNetwork: .testnet, store: connections, - responseStore: UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .connections(connections)), + intentStore: UserDefaultsAppConnectIntentStore(defaults: defaults, scope: .connections(connections)), activeWalletIdHex: { active.idHex }, networkEndpoint: { endpoint.url }, notificationCenter: notificationCenter, @@ -3148,58 +2261,10 @@ final class AppConnectLoginTests: XCTestCase { updatedAt: Date(timeIntervalSince1970: 1_773_132_300)) } - func testAPinnedHandedInScopeDoesNotFollowItsProvider() { - var scope: String? = "scope-a" - let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { scope } - let grant = Self.grant(sessionKeyId: 6) - - let pinned = store.pinned(toWalletIdHex: "wallet-a") - scope = "scope-b" - pinned.save([grant]) - - XCTAssertEqual(store.load(), []) - scope = "scope-a" - XCTAssertEqual(store.load(), [grant]) - } - private static let now = Date(timeIntervalSince1970: 1_800_000_000) private static let nowMilliseconds: Int64 = 1_800_000_000_000 private static let app = Data(repeating: 0xA1, count: 32) private static let sessionKeyHash = Data(repeating: 0x11, count: 20) - private static let terms = AppConnect.SessionKeyTerms(budgetCredits: 500, lifetime: 3_600) - - /// Key 9 as the one-QR login registers it, within `terms`. - private static func sessionKey( - purpose: KeyPurpose = .authentication, - securityLevel: SecurityLevel = .high, - disabledAt: Int64? = nil, - totalBudget: UInt64? = terms.budgetCredits, - expiresAt: Int64? = nowMilliseconds + 3_600_000 - ) -> ManagedIdentity.IdentityPublicKeyInfo { - key( - keyId: 9, purpose: purpose, securityLevel: securityLevel, data: sessionKeyHash, - disabledAt: disabledAt, totalBudget: totalBudget, expiresAt: expiresAt) - } - - /// The state of the session key for `app`; by default the store shows - /// key 9 bound to it. - private static func sessionKeyState( - keys: [ManagedIdentity.IdentityPublicKeyInfo], - bindings: [AppConnect.KeyBinding] = [ - AppConnect.KeyBinding(keyId: 9, data: sessionKeyHash, singleContractId: app), - ], - grantedKeyIds: Set = [] - ) -> AppConnect.SessionKeyState { - AppConnect.sessionKeyState( - publicKeyHash160: sessionKeyHash, - currentIdentityPublicKeys: keys, - appContractId: app, - bindings: bindings, - grantedKeyIds: grantedKeyIds, - terms: terms, - now: now) - } - private static func key( keyId: Int32, purpose: KeyPurpose = .authentication, From ded1f5165a489c33e525bbd2d8505667fe04597f Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 3 Nov 2026 16:34:06 +0200 Subject: [PATCH 075/108] refactor(dashconnect): remove the two-QR login and close review findings The two-QR (App Connect v1) login never reached a store release, only internal TestFlight builds. It is removed entirely: a v1 dash-key QR is refused when scanned, a dash-st payload is taken only as a token purchase, and the approved status, the scan-to-complete banner, the v1 key derivation and sealing, the key-registration parser and the devnet login contract setting go with it. Review fixes: - An intent counts as landed only once the keys it turns off are off too; the outstanding disables are submitted on their own when the keys show. - A retry is refused when an encryption key the response carries is off, and when the encryption slots approved now differ from the recorded ones. - DashPay profile keys no intent names are offered, on confirm, with the disconnect of an app given profile access or with no record on that identity, so they stay reachable after a restore. - An unrecorded key on a contract several apps bind shows under each of them, and the disconnect of any of them turns it off on confirm. Co-Authored-By: Claude Opus 5.5 --- DashWallet.xcodeproj/project.pbxproj | 4 - .../SwiftDashSDK/DevnetConfiguration.swift | 28 +- .../Models/DashConnect/AppConnectLogin.swift | 68 +- .../DashConnect/AppConnectProjection.swift | 99 +- .../DashConnect/DashConnectDataSource.swift | 36 +- .../DashConnect/DashConnectModels.swift | 31 +- .../Models/DashConnect/DashConnectStore.swift | 9 +- .../PlatformDashConnectDataSource.swift | 997 +----------------- .../DashConnect/Protocol/DashConnectUri.swift | 20 +- .../Protocol/KeyExchangeCrypto.swift | 113 +- .../Protocol/LoginKeyDerivation.swift | 68 -- .../DashConnect/ApproveConnectionSheet.swift | 34 +- .../Components/ConnectionRow.swift | 50 +- .../Components/ConnectionStatusBadge.swift | 7 +- .../Components/ConnectionsList.swift | 10 +- .../Components/ScanToCompleteBanner.swift | 63 -- .../UI/DashConnect/ConnectionsScreen.swift | 12 +- .../UI/DashConnect/ConnectionsViewModel.swift | 9 +- .../Menu/Settings/DevnetSettingsScreen.swift | 17 +- DashWallet/ar.lproj/Localizable.strings | 14 +- DashWallet/bg.lproj/Localizable.strings | 14 +- DashWallet/ca.lproj/Localizable.strings | 14 +- DashWallet/cs.lproj/Localizable.strings | 14 +- DashWallet/da.lproj/Localizable.strings | 14 +- DashWallet/de.lproj/Localizable.strings | 14 +- DashWallet/el.lproj/Localizable.strings | 14 +- DashWallet/en.lproj/Localizable.strings | 18 +- DashWallet/eo.lproj/Localizable.strings | 14 +- DashWallet/es.lproj/Localizable.strings | 14 +- DashWallet/et.lproj/Localizable.strings | 14 +- DashWallet/fa.lproj/Localizable.strings | 14 +- DashWallet/fi.lproj/Localizable.strings | 14 +- DashWallet/fil.lproj/Localizable.strings | 14 +- DashWallet/fr.lproj/Localizable.strings | 14 +- DashWallet/hr.lproj/Localizable.strings | 14 +- DashWallet/hu.lproj/Localizable.strings | 14 +- DashWallet/id.lproj/Localizable.strings | 14 +- DashWallet/it.lproj/Localizable.strings | 14 +- DashWallet/ja.lproj/Localizable.strings | 14 +- DashWallet/ko.lproj/Localizable.strings | 14 +- DashWallet/mk.lproj/Localizable.strings | 14 +- DashWallet/ms.lproj/Localizable.strings | 14 +- DashWallet/nb.lproj/Localizable.strings | 14 +- DashWallet/nl.lproj/Localizable.strings | 14 +- DashWallet/pl.lproj/Localizable.strings | 14 +- DashWallet/pt.lproj/Localizable.strings | 14 +- DashWallet/ro.lproj/Localizable.strings | 14 +- DashWallet/ru.lproj/Localizable.strings | 14 +- DashWallet/sk.lproj/Localizable.strings | 14 +- DashWallet/sl.lproj/Localizable.strings | 14 +- DashWallet/sl_SI.lproj/Localizable.strings | 14 +- DashWallet/sq.lproj/Localizable.strings | 14 +- DashWallet/sr.lproj/Localizable.strings | 14 +- DashWallet/sv.lproj/Localizable.strings | 14 +- DashWallet/th.lproj/Localizable.strings | 14 +- DashWallet/tr.lproj/Localizable.strings | 14 +- DashWallet/uk.lproj/Localizable.strings | 14 +- DashWallet/vi.lproj/Localizable.strings | 14 +- DashWallet/zh-Hans.lproj/Localizable.strings | 14 +- .../zh-Hant-TW.lproj/Localizable.strings | 14 +- DashWallet/zh.lproj/Localizable.strings | 14 +- DashWallet/zh_TW.lproj/Localizable.strings | 14 +- .../AppConnectProjectionTests.swift | 137 ++- .../DashConnect/AppConnectV2LoginTests.swift | 3 +- .../DashConnectDataSourceTests.swift | 31 +- .../DashConnect/DashConnectStoreTests.swift | 58 +- .../DashConnect/KeyExchangeCryptoTests.swift | 157 --- .../DashConnect/LoginKeyDerivationTests.swift | 82 -- .../PlatformDashConnectDataSourceTests.swift | 976 ++--------------- 69 files changed, 518 insertions(+), 3207 deletions(-) delete mode 100644 DashWallet/Sources/Models/DashConnect/Protocol/LoginKeyDerivation.swift delete mode 100644 DashWallet/Sources/UI/DashConnect/Components/ScanToCompleteBanner.swift delete mode 100644 DashWalletTests/DashConnect/LoginKeyDerivationTests.swift diff --git a/DashWallet.xcodeproj/project.pbxproj b/DashWallet.xcodeproj/project.pbxproj index 9860704612..29c96a68f7 100644 --- a/DashWallet.xcodeproj/project.pbxproj +++ b/DashWallet.xcodeproj/project.pbxproj @@ -1177,7 +1177,6 @@ AA0031032FD0000000000013 /* IconName+DashIconSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA0031012FD0000000000011 /* IconName+DashIconSource.swift */; }; AA00F1012FF0A10000A1B402 /* ExchangeAddressLookupContextTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA00F1002FF0A10000A1B402 /* ExchangeAddressLookupContextTests.swift */; }; AA03A0012FF3000000000001 /* KeyExchangeCryptoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA03A0032FF3000000000003 /* KeyExchangeCryptoTests.swift */; }; - AA03A0022FF3000000000002 /* LoginKeyDerivationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA03A0042FF3000000000004 /* LoginKeyDerivationTests.swift */; }; AA04A0012FF4000000000001 /* DashConnectDataSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA04A0032FF4000000000003 /* DashConnectDataSourceTests.swift */; }; AA05A0012FF5000000000001 /* DashConnectStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA05A0032FF5000000000003 /* DashConnectStoreTests.swift */; }; AA06A0112FF6000000000011 /* AppConnectV2LoginTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA06A0132FF6000000000013 /* AppConnectV2LoginTests.swift */; }; @@ -3364,7 +3363,6 @@ AA0031012FD0000000000011 /* IconName+DashIconSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "IconName+DashIconSource.swift"; sourceTree = ""; }; AA00F1002FF0A10000A1B402 /* ExchangeAddressLookupContextTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExchangeAddressLookupContextTests.swift; sourceTree = ""; }; AA03A0032FF3000000000003 /* KeyExchangeCryptoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = KeyExchangeCryptoTests.swift; path = DashConnect/KeyExchangeCryptoTests.swift; sourceTree = ""; }; - AA03A0042FF3000000000004 /* LoginKeyDerivationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = LoginKeyDerivationTests.swift; path = DashConnect/LoginKeyDerivationTests.swift; sourceTree = ""; }; AA04A0032FF4000000000003 /* DashConnectDataSourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DashConnectDataSourceTests.swift; path = DashConnect/DashConnectDataSourceTests.swift; sourceTree = ""; }; AA05A0032FF5000000000003 /* DashConnectStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DashConnectStoreTests.swift; path = DashConnect/DashConnectStoreTests.swift; sourceTree = ""; }; AA06A0132FF6000000000013 /* AppConnectV2LoginTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppConnectV2LoginTests.swift; path = DashConnect/AppConnectV2LoginTests.swift; sourceTree = ""; }; @@ -7575,7 +7573,6 @@ 2A7CAFFF191922CBF6075212 /* DashConnectUriTests.swift */, 7C172F43568AE0A5AFDB5349 /* Secp256k1Tests.swift */, AA03A0032FF3000000000003 /* KeyExchangeCryptoTests.swift */, - AA03A0042FF3000000000004 /* LoginKeyDerivationTests.swift */, AA04A0032FF4000000000003 /* DashConnectDataSourceTests.swift */, AA05A0032FF5000000000003 /* DashConnectStoreTests.swift */, AA06A0132FF6000000000013 /* AppConnectV2LoginTests.swift */, @@ -10910,7 +10907,6 @@ 0438F3D117619B14594F95E6 /* DashConnectUriTests.swift in Sources */, 8D66A1B0E97F5B50411765B4 /* Secp256k1Tests.swift in Sources */, AA03A0012FF3000000000001 /* KeyExchangeCryptoTests.swift in Sources */, - AA03A0022FF3000000000002 /* LoginKeyDerivationTests.swift in Sources */, AA04A0012FF4000000000001 /* DashConnectDataSourceTests.swift in Sources */, AA05A0012FF5000000000001 /* DashConnectStoreTests.swift in Sources */, AA06A0112FF6000000000011 /* AppConnectV2LoginTests.swift in Sources */, diff --git a/DashWallet/Sources/Infrastructure/SwiftDashSDK/DevnetConfiguration.swift b/DashWallet/Sources/Infrastructure/SwiftDashSDK/DevnetConfiguration.swift index 6e61615a8b..1c9a925b10 100644 --- a/DashWallet/Sources/Infrastructure/SwiftDashSDK/DevnetConfiguration.swift +++ b/DashWallet/Sources/Infrastructure/SwiftDashSDK/DevnetConfiguration.swift @@ -22,8 +22,8 @@ import SwiftDashSDK /// The user-editable devnet coordinates, over UserDefaults. /// -/// Two of the keys are READ DIRECTLY BY SwiftDashSDK and must keep their -/// exact names: +/// Both keys are READ DIRECTLY BY SwiftDashSDK and must keep their exact +/// names: /// - `platformQuorumURL` — `SDK.init(network: .devnet, …)` reads it and /// auto-discovers DAPI addresses from `{quorumURL}/masternodes`. Without /// it, devnet SDK creation fails. @@ -31,17 +31,12 @@ import SwiftDashSDK /// passes it into `PlatformSpvStartConfig.devnetName` so the SPV user /// agent embeds `devnet.devnet-` (Core devnet peers drop the /// handshake without it). -/// The third key is app-owned: the DashConnect `loginKeyResponse` contract -/// id on devnet (the contract is registered separately per devnet, so its id -/// differs from the pinned testnet one). /// /// Values are trimmed on read; empty-after-trim counts as unset. The quorum /// URL and devnet name are seeded with the current team devnet /// (`devnet-moutai`) through the registration domain, so a fresh install can /// select Devnet without typing anything — a user-saved value (including an -/// explicitly emptied one, stored as `""`) always wins over the seed. The -/// DashConnect contract id deliberately has NO default: it is unknown for -/// moutai, and an absent value must surface as a normal error, never a guess. +/// explicitly emptied one, stored as `""`) always wins over the seed. /// /// NOTE: the SDK's own built-in devnet quorum template /// (`https://quorums.devnet..networks.dash.org`) does not match real @@ -53,8 +48,6 @@ enum DevnetConfiguration { static let quorumURLKey = "platformQuorumURL" /// Same key the SwiftDashSDK sample app uses — do not rename. static let devnetNameKey = "platformDevnetName" - /// App-owned: base58 id of the devnet `loginKeyResponse` contract. - static let dashConnectContractIdKey = "devnetDashConnectLoginContractId" /// devnet-moutai, verified reachable 2026-09-01 (13 enabled masternodes, /// Core P2P on :20001, DAPI on :1443). @@ -121,14 +114,6 @@ enum DevnetConfiguration { return nil } - /// The devnet DashConnect `loginKeyResponse` contract id (base58), or nil - /// when unset/blank. Stored as entered; validity (32-byte identifier) is - /// the consumer's check so a typo surfaces as an error there, not a crash. - static var dashConnectContractId: String? { - ensureDefaultsRegistered() - return normalized(UserDefaults.standard.string(forKey: dashConnectContractIdKey)) - } - /// Writers store the raw (trimmed) text — including the empty string, so /// clearing a field genuinely unsets it instead of resurfacing the /// registered default. @@ -142,14 +127,7 @@ enum DevnetConfiguration { UserDefaults.standard.set(value.trimmingCharacters(in: .whitespacesAndNewlines), forKey: devnetNameKey) } - static func setDashConnectContractId(_ value: String) { - ensureDefaultsRegistered() - UserDefaults.standard.set(value.trimmingCharacters(in: .whitespacesAndNewlines), forKey: dashConnectContractIdKey) - } - /// Whether devnet can start: quorum URL AND devnet name are both present. - /// The DashConnect contract id is deliberately not part of this — it only - /// gates DashConnect approvals, not the network itself. static var isConfigured: Bool { quorumURL != nil && devnetName != nil } diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index b2ab7d3ec2..fd3228eeab 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -14,8 +14,7 @@ import SwiftDashSDK /// projection in `AppConnectProjection.swift`. enum AppConnect { /// The protocol version that registers the App Connect system contract. - /// Below it the contract does not exist and the two-QR login is the only - /// one that can work. + /// Below it the contract does not exist and no login can work. static let minimumProtocolVersion: UInt32 = 14 /// Same id on every network (`docs/protocol/app-connect.md` in @@ -33,8 +32,6 @@ enum AppConnect { /// The network did not say which login it takes, so what approving /// would give the app is unknown and there is nothing to approve. case unresolved - /// Registers no key at approval. - case twoQR /// An App Connect request v2: registers the keys of this plan. case appConnect(GrantPlan) /// An App Connect request v2 the wallet will not answer; there is @@ -49,22 +46,17 @@ enum AppConnect { /// Whether the sheet has something to approve. var isApprovable: Bool { switch self { - case .twoQR, .appConnect: return true + case .appConnect: return true case .unresolved, .refused: return false } } } - /// The login a `dash-key:` v1 request gets on a network at - /// `protocolVersion`. From the version that registers the App Connect - /// system contract only a v2 request is answered: a v1 request has no - /// way to say what it asks for. - static func login(protocolVersion: UInt32) -> Login { - guard isAvailable(protocolVersion: protocolVersion) else { return .twoQR } - return .refused(Refusal(.unsupported, NSLocalizedString( - "This app uses an older sign-in that this network no longer takes. Ask the app for a new code.", - comment: "DashConnect App Connect v1"))) - } + /// The answer to a `dash-key:` v1 request: only a v2 request says what + /// it asks for, and the wallet answers no other. + static var v1Refusal: Refusal { Refusal(.unsupported, NSLocalizedString( + "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code.", + comment: "DashConnect App Connect v1")) } /// What the wallet's store of identity keys says about one key: its /// payload, whether it is disabled there, and the contract it is bound to @@ -195,14 +187,6 @@ enum AppConnect { self.encryptedPayload = encryptedPayload } - init(_ sealed: SealedKey) { - self.init( - appEphemeralPubKeyHash: sealed.appEphemeralPubKeyHash.toHexString(), - walletEphemeralPubKey: sealed.walletEphemeralPublicKey.toHexString(), - encryptedPayload: sealed.encryptedPayload.toHexString() - ) - } - /// The document's properties in the form `createDocument` and /// delete-by-values take. func propertiesJSON() throws -> String { @@ -217,44 +201,6 @@ enum AppConnect { } } - /// A 32-byte key encrypted to an app's ephemeral key, with what the app - /// needs to find and open it. The two-QR response carries the login key - /// sealed this way. - struct SealedKey: Equatable { - let appEphemeralPubKeyHash: Data - let walletEphemeralPublicKey: Data - let encryptedPayload: Data - } - - /// Encrypts `key` to the app. `walletEphemeralPrivateKey` is wiped before - /// returning. - static func seal( - _ key: Data, - appEphemeralPubKey: Data, - walletEphemeralPrivateKey: inout Data, - encrypt: (Data, Data, Data) throws -> Data = { key, walletPriv, appPub in - try KeyExchangeCrypto.encryptLoginKey( - key, - walletEphemeralPriv: walletPriv, - appEphemeralPub: appPub - ) - } - ) throws -> SealedKey { - defer { PlatformDashConnectDataSource.zero(&walletEphemeralPrivateKey) } - - let appEphemeralPubKeyHash = try KeyExchangeCrypto.hash160(appEphemeralPubKey) - guard appEphemeralPubKeyHash.count == 20 else { - throw DashConnectPlatformError.invalidHash160 - } - let walletEphemeralPublicKey = try Secp256k1.compressedPublicKey(privateKey: walletEphemeralPrivateKey) - let encryptedPayload = try encrypt(key, walletEphemeralPrivateKey, appEphemeralPubKey) - - return SealedKey( - appEphemeralPubKeyHash: appEphemeralPubKeyHash, - walletEphemeralPublicKey: walletEphemeralPublicKey, - encryptedPayload: encryptedPayload - ) - } } /// Lets one DashConnect operation at a time run for a wallet, across every diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift index cebc9c7df6..a79dd3e37e 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift @@ -15,6 +15,13 @@ import SwiftDashSDK extension AppConnect { // MARK: Stored + /// One encryption slot of an approval: what the key is for, and the + /// contract it is bound to. + struct ApprovedSlot: Codable, Equatable { + let purpose: KeyPurpose + let contractId: Data + } + /// One key an intent submits, exactly as it is submitted. struct IntendedKey: Codable, Equatable { let id: UInt32 @@ -52,6 +59,9 @@ extension AppConnect { /// The identity's encryption keys the response carries without adding /// them, in slot order. let sentEncryptionKeyIds: [UInt32] + /// The encryption slots the user approved, in the plan's order. Nil + /// in a row written before it was kept: a retry of it is refused. + let approvedEncryption: [ApprovedSlot]? /// The ids of earlier auth keys the same update turns off. let disables: [UInt32] /// The response, sealed before the submit, so a retry publishes the @@ -251,12 +261,8 @@ extension AppConnect { /// Every connection the wallet can show for these identities. An app /// with no intent appears when one of its contracts carries a live auth - /// key no intent names. Keys whose payload is in `protected` are never - /// counted as unrecorded: the two-QR login derives its keys again every - /// time, and Platform never re-adds one that was turned off. - static func project( - _ snapshots: [IdentitySnapshot], intents: [ConnectionIntent], protected: Set = [] - ) -> Projection { + /// key no intent names. + static func project(_ snapshots: [IdentitySnapshot], intents: [ConnectionIntent]) -> Projection { let byIdentity = Dictionary(snapshots.map { ($0.identityId, $0) }, uniquingKeysWith: { a, b in b.revision >= a.revision ? b : a }) @@ -269,10 +275,10 @@ extension AppConnect { }.map { IdentityKey(intent.identityId, $0.id) } }) - // The contracts each app's intents bind keys to. - var contractsOfApp: [Data: Set] = [:] + // The contracts each app's intents on each identity bind keys to. + var contractsOfApp: [Data: [Data: Set]] = [:] for intent in intents { - contractsOfApp[intent.appId, default: [intent.appId]] + contractsOfApp[intent.identityId, default: [:]][intent.appId, default: [intent.appId]] .formUnion(intent.authKeys.compactMap(\.bound).filter { !isProfileBound($0) }.map(contractId(of:))) } @@ -281,7 +287,7 @@ extension AppConnect { var unplaced: [Data: [UInt32]] = [:] for snapshot in snapshots { for key in snapshot.keys where isAppConnectAuthKey(key) - && !named.contains(IdentityKey(snapshot.identityId, key.id)) && !protected.contains(key.data) { + && !named.contains(IdentityKey(snapshot.identityId, key.id)) { guard let bound = key.bound else { // The store does not hold the key's bound yet: whose it // is cannot be told, and it is reported as such. @@ -292,15 +298,19 @@ extension AppConnect { profile[snapshot.identityId, default: []].append(key.id) continue } - // A key bound to a system contract is no app's; one bound to - // a contract the intents of several apps bind cannot be - // told to be any one of theirs. Neither is shown or offered. + // A key bound to a system contract is no app's. One bound to + // a contract the intents of several apps bind (on this + // identity first) cannot be told to be any one of theirs: + // each of them shows it, and a disconnect of any of them + // turns it off with the user's confirm. let contract = contractId(of: bound) guard !systemContractIds.contains(contract.toBase58String()) else { continue } - let apps = contractsOfApp.filter { $0.value.contains(contract) }.map(\.key) - guard apps.count <= 1 else { continue } - let app = apps.first ?? contract - unrecorded[app, default: [:]][snapshot.identityId, default: []].append(key.id) + func binding(_ contracts: [Data: Set]) -> [Data] { contracts.filter { $0.value.contains(contract) }.map(\.key) } + var apps = binding(contractsOfApp[snapshot.identityId] ?? [:]) + if apps.isEmpty { apps = Array(Set(contractsOfApp.values.flatMap(binding))) } + for app in apps.isEmpty ? [contract] : apps { + unrecorded[app, default: [:]][snapshot.identityId, default: []].append(key.id) + } } } @@ -334,9 +344,8 @@ extension AppConnect { /// The ids for `count` new keys that no key on the identity and no /// intent on it holds, so a key that may still land is never given to - /// another: above the highest while they fit, then the lowest free ones - /// (a `dash-st:` registration picks its own ids). Nil when the ids run - /// out. + /// another: above the highest while they fit, then the lowest free ones. + /// Nil when the ids run out. static func newKeyIds(count: Int, snapshot: IdentitySnapshot, intents: [ConnectionIntent]) -> [UInt32]? { let taken = Set(snapshot.keys.map(\.id) + intents.filter { $0.identityId == snapshot.identityId }.flatMap { $0.keys.map(\.id) }) @@ -356,6 +365,38 @@ extension AppConnect { return ids } + /// The keys `intent` turns off that are still on. + static func outstandingDisables(of intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> [UInt32] { + intent.disables.filter { id in snapshot.keys.contains { $0.id == id && $0.disabledAt == nil } } + } + + /// Whether `snapshot` shows all of `intent`: every key it adds, and every + /// key it turns off off. Another update may have added the same keys + /// without turning the earlier ones off (the same request approved on + /// another device), so the added keys alone do not tell. + static func hasLanded(_ intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> Bool { + intent.keys.allSatisfy { [.live, .expired, .disabled].contains(presence(of: $0, in: snapshot)) } + && outstandingDisables(of: intent, in: snapshot).isEmpty + } + + /// Whether the DashPay profile keys no intent names are offered with a + /// disconnect of the app on the identity: when its intents there gave it + /// a profile key, and when the wallet has no record of the app there + /// (after a restore no record says which app was given one). Each is + /// turned off only on the user's confirm. + static func offersUnrecordedProfileKeys(_ intents: [ConnectionIntent], appId: Data, identityId: Data) -> Bool { + let own = intents.filter { $0.appId == appId && $0.identityId == identityId } + return own.isEmpty || own.contains { $0.authKeys.contains { $0.bound.map(isProfileBound) ?? false } } + } + + /// Whether the encryption keys `intent`'s response carries can still be + /// used: those it re-sends are live, and those it adds are not off. + static func encryptionKeysUsable(_ intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> Bool { + intent.sentEncryptionKeyIds.allSatisfy { id in + snapshot.keys.contains { $0.id == id && isLive($0, at: snapshot.platformTime) } + } && intent.keys.allSatisfy { $0.isAuthentication || presence(of: $0, in: snapshot) != .disabled } + } + /// Whether a retry of a request may carry on with its intent: its keys /// are live or may still land, and the user has not disconnected it. static func mayResume(_ intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> Bool { @@ -366,12 +407,6 @@ extension AppConnect { } } - /// Whether the app's intents gave it a DashPay profile key. Only then are - /// the profile keys no intent names offered with its disconnect. - static func usesProfileAccess(_ intents: [ConnectionIntent], appId: Data) -> Bool { - intents.contains { $0.appId == appId && $0.authKeys.contains { $0.bound.map(isProfileBound) ?? false } } - } - /// What a disconnect of one app submits on one identity. struct DisconnectPlan: Equatable { /// The app's auth keys still enabled: live or expired. Platform still @@ -389,8 +424,7 @@ extension AppConnect { /// `includeUnrecorded`: also turn off the app's live keys no intent /// names; the user confirms that separately. static func disconnectPlan( - appId: Data, snapshot: IdentitySnapshot, intents: [ConnectionIntent], includeUnrecorded: Bool, - protected: Set = [] + appId: Data, snapshot: IdentitySnapshot, intents: [ConnectionIntent], includeUnrecorded: Bool ) -> DisconnectPlan { var plan = DisconnectPlan() let own = intents.filter { $0.appId == appId && $0.identityId == snapshot.identityId } @@ -404,7 +438,7 @@ extension AppConnect { if !intent.responseRemoved { plan.deleteResponses.append(intent.id) } } if includeUnrecorded { - let projection = project([snapshot], intents: intents, protected: protected) + let projection = project([snapshot], intents: intents) let others = projection.connections.first { $0.appId == appId }?.unrecordedKeyIds[snapshot.identityId] ?? [] plan.disable += others } @@ -440,12 +474,17 @@ extension AppConnect { } } + static func approvedSlots(of plan: GrantPlan) -> [ApprovedSlot] { + plan.encryption.map { ApprovedSlot(purpose: $0.keyPurpose, contractId: $0.binding.contractId) } + } + /// Whether a retry of a request may submit `intent` again under what /// the user approved now: the same keys, each with the level, bound and /// budget the plan grants, and an expiry no later than the plan's. static func isWithinPlan(_ intent: ConnectionIntent, _ plan: GrantPlan) -> Bool { let auth = intent.authKeys - guard intent.appId == plan.appId, auth.count == plan.auth.count else { return false } + guard intent.appId == plan.appId, auth.count == plan.auth.count, + intent.approvedEncryption == approvedSlots(of: plan) else { return false } return zip(auth, plan.auth).allSatisfy { key, grant in key.securityLevel == grant.securityLevel && key.bound == grant.storedBound && key.totalBudget == grant.totalBudget diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index fa34f4cd5c..a5e844e2c0 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -29,9 +29,9 @@ protocol DashConnectDataSource { /// that would give the app something else, or act for another identity, /// wallet or network than it was resolved for, is refused. func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection - /// Parses a scanned `dash-st:` payload and either completes key - /// registration immediately or returns a token purchase that awaits - /// explicit user approval via `approveTokenPurchase(_:)`. + /// Parses a scanned `dash-st:` payload and returns the token purchase it + /// carries, which awaits explicit user approval via + /// `approveTokenPurchase(_:)`. Any other transition is refused. func handleStateTransition(_ request: DashStRequest) async throws -> DashConnectStAction /// Rebuilds, signs and submits a token purchase the user approved. /// @@ -49,10 +49,7 @@ protocol DashConnectDataSource { /// keys no app can be told to hold) are turned off only with /// `includingUnrecorded`; the result says how many are left. The /// connection also stays, and that is thrown, while an approval of the - /// app on another identity of the wallet is not done. For a two-QR - /// connection it only changes the local status: that login derives the - /// same key every time and Platform never re-adds a disabled key, so - /// disabling it would lock the app out for good. + /// app on another identity of the wallet is not done. /// /// `scope` is the `DAppConnection.scope` of the row that was picked: /// both calls act only while it still names the wallet they would act @@ -152,7 +149,9 @@ final class MockDashConnectDataSource: DashConnectDataSource { static let sampleLoginQRCode = DashConnectSampleQR.keyUri(for: sampleLoginRequest) static let sampleRequest: ConnectionRequest = { var request = ConnectionRequest(loginRequest: sampleLoginRequest) - request.login = .twoQR + request.login = .appConnect(AppConnect.GrantPlan( + appId: sampleLoginRequest.contractId, appEphemeralPubKeyHash: Data(repeating: 0, count: 20), + auth: [], encryption: [], connectionId: nil, identityHint: nil, createdAt: 0, callbackHost: nil)) return request }() @@ -169,7 +168,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { #if DEBUG static func previewMixed() -> MockDashConnectDataSource { MockDashConnectDataSource(initial: [ - sample(.approved), + sample(.confirming), DAppConnection( id: "7W6u4NgW63FPUuW8EnTbYzD4KybNQD5n7CUDWydJY234", name: "DashGet", @@ -218,7 +217,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { if DashConnectUri.isKeyUri(trimmed) { let request = try DashConnectUri.parseKeyRequest(trimmed) try validateNetwork(request.network) - return .login(request) + throw AppConnect.v1Refusal } if DashConnectUri.isStUri(trimmed) { @@ -237,13 +236,14 @@ final class MockDashConnectDataSource: DashConnectDataSource { shouldFailNextApprove = false throw DashConnectMockError.approveFailed } + guard consent.login.isApprovable else { throw DashConnectPlatformError.approvalOutOfDate } let connectionRequest = await makeConnectionRequest(from: request) let connection = DAppConnection( id: connectionRequest.appContractId, name: connectionRequest.appLabel.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : connectionRequest.appLabel, url: connectionRequest.appUrl, - status: .approved, + status: .active, updatedAt: Date() ) @@ -262,7 +262,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { walletUsername: nil, walletIdentityId: nil, existingConnection: existingConnection(for: fallback.appContractId), - login: .twoQR + login: .refused(AppConnect.v1Refusal) ) } @@ -278,17 +278,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { @discardableResult func disconnect(id: String, scope: String?, includingUnrecorded: Bool) async throws -> DashConnectDisconnectResult { - let disconnectedAt = Date() - persistAndSend(subject.value.map { connection in - guard connection.id == id else { return connection } - return DAppConnection( - id: connection.id, - name: connection.name, - url: connection.url, - status: .approved, - updatedAt: disconnectedAt - ) - }) + persistAndSend(subject.value.filter { $0.id != id }) return DashConnectDisconnectResult() } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index b9c106a470..01a661d837 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -23,17 +23,14 @@ import SwiftDashSDK enum DashConnectQr: Equatable { case login(DashKeyRequest) /// A `dash-st:` payload — a serialized state transition whose kind is - /// only known once the wallet parses it (key registration or token - /// purchase). + /// only known once the wallet parses it (a token purchase is the only + /// one it takes). case stateTransition(DashStRequest) } /// What the wallet did — or still needs the user to do — with a scanned /// `dash-st:` state transition. enum DashConnectStAction: Equatable { - /// Key registration was validated and published (or the derived keys - /// were already on the identity). - case keyRegistrationCompleted /// The payload is a token purchase; nothing was signed or sent yet — it /// awaits explicit user approval via `approveTokenPurchase(_:)`. case tokenPurchaseApprovalRequired(DashConnectTokenPurchaseRequest) @@ -143,19 +140,10 @@ extension DashConnectTokenPurchaseRequest { } } -/// Lifecycle of an app connection. -/// -/// `approved` means the wallet knows about the app, but it may not be ready to -/// sign in yet: either the required login keys are not on the identity yet, or -/// the user locally turned the connection off from the wallet UI. -/// -/// `active` means the app's login keys are registered on the identity and the -/// wallet has already published the matching `loginKeyResponse`. For an App -/// Connect connection it means an approval's keys are live on an identity of -/// this wallet, whether or not its response was published; `confirming` means -/// its identity update may still land. +/// Lifecycle of an app connection. `active` means an approval's keys are +/// live on an identity of this wallet, whether or not its response was +/// published; `confirming` means its identity update may still land. enum ConnectionStatus: String, Codable, CaseIterable { - case approved /// An App Connect approval whose identity update may still land. case confirming case active @@ -178,14 +166,6 @@ enum ConnectionStatus: String, Codable, CaseIterable { } } -/// Which login made a connection. It decides what turning it off means: -/// an App Connect connection (`oneQR`) has keys on the identity to turn -/// off, a two-QR connection does not (see `DashConnectDataSource.disconnect`). -enum DashConnectLoginKind: String, Codable { - case twoQR - case oneQR -} - /// A connected app identified by its stable contract id. struct DAppConnection: Identifiable, Equatable, Hashable { let id: String @@ -193,7 +173,6 @@ struct DAppConnection: Identifiable, Equatable, Hashable { let url: String let status: ConnectionStatus let updatedAt: Date - var loginKind: DashConnectLoginKind = .twoQR /// Names the wallet and network a data source published this row for; /// `nil` on a row that was built or read from a store. Not stored. It /// goes back with a disconnect or a remove, so a row picked from a list diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift index abcb457cdb..593f948e18 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift @@ -138,8 +138,7 @@ final class UserDefaultsDashConnectStore: DashConnectStore { name: row.label, url: row.url, status: row.status, - updatedAt: row.updatedAt, - loginKind: row.loginKind ?? .twoQR + updatedAt: row.updatedAt ) ) } @@ -164,8 +163,7 @@ final class UserDefaultsDashConnectStore: DashConnectStore { label: $0.name, url: $0.url, status: $0.status, - updatedAt: $0.updatedAt, - loginKind: $0.loginKind == .twoQR ? nil : $0.loginKind + updatedAt: $0.updatedAt ) } @@ -191,9 +189,6 @@ final class UserDefaultsDashConnectStore: DashConnectStore { let url: String let status: ConnectionStatus let updatedAt: Date - /// Absent for a two-QR connection, which is every row written before - /// App Connect existed. - let loginKind: DashConnectLoginKind? } private static func base58Decode(_ string: String) -> Data? { diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 0f0378b8f8..b8d57e9880 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -66,13 +66,8 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case authorizationCancelled case authorizationFailed case randomGenerationFailed(OSStatus) - case invalidHash160 case noAuthenticationKey case existingDocumentLookupFailed - case noApprovedConnectionAwaitingKeyRegistration - case keyRegistrationWrongIdentity - case keyRegistrationUnexpectedMutation - case keyRegistrationMismatchedDerivedKey(KeyPurpose) case tokenPurchaseWrongIdentity case tokenPurchaseTokenIdMismatch case unsupportedStateTransition(String) @@ -89,8 +84,6 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case appConnectKeysUnreadable case walletChanged case ephemeralKeyGenerationFailed - case ambiguousKeyRegistrationConnection - case devnetLoginContractNotConfigured case loginContractUnavailable case tooManyKeysToReplace case tooManyKeysToAdd @@ -117,24 +110,12 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString("Authentication failed", comment: "DashConnect") case .randomGenerationFailed(let status): return "Failed to generate secure random bytes for DashConnect (\(status))." - case .invalidHash160: - return "Failed to compute the app ephemeral public key hash." case .noAuthenticationKey: return "No enabled AUTHENTICATION ECDSA key is available for this identity." case .existingDocumentLookupFailed: - return "The existing loginKeyResponse document could not be located for replacement." - case .noApprovedConnectionAwaitingKeyRegistration: - return "There is no login awaiting key registration — scan the app's login QR first." - case .keyRegistrationWrongIdentity: - return "The scanned key-registration transition targets a different identity." - case .keyRegistrationUnexpectedMutation: - return "The scanned key-registration transition does more than add the expected login keys." + return "The loginKeyResponse document on Platform could not be read." case .ephemeralKeyGenerationFailed: return "Could not generate an ephemeral DashConnect key." - case .ambiguousKeyRegistrationConnection: - return "Could not tell which approved app this login belongs to. Scan the app's QR code again." - case .keyRegistrationMismatchedDerivedKey(let purpose): - return "The scanned key-registration transition adds a \(purpose.name) key we did not derive." case .tokenPurchaseWrongIdentity: return "The scanned token purchase targets a different identity." case .tokenPurchaseTokenIdMismatch: @@ -189,10 +170,6 @@ enum DashConnectPlatformError: LocalizedError, Equatable { "This wallet cannot approve the scanned request (%@).", comment: "DashConnect: the placeholder is the kind of the scanned state transition"), kindName) - case .devnetLoginContractNotConfigured: - return NSLocalizedString( - "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings.", - comment: "DashConnect") case .loginContractUnavailable: return "The DashConnect login contract is not available on this network." case .identityReadBehind: @@ -239,47 +216,6 @@ enum DashConnectPlatformError: LocalizedError, Equatable { } } -struct DashConnectLoginKeyResponseDraft: Equatable { - let properties: [String: AnyHashable] - let walletEphemeralPublicKey: Data - let encryptedPayload: Data -} - -struct DashConnectKeyRegistrationKey: Equatable { - let keyId: UInt32 - let keyType: KeyType - let purpose: KeyPurpose - let securityLevel: SecurityLevel - let publicKeyData: Data - let contractBounds: ContractBounds? - /// Protocol 14 limits the scanned transition put on the key. Carried so - /// the rebuilt registration grants exactly what was asked for. - var totalBudget: UInt64? = nil - var expiresAt: UInt64? = nil -} - -struct DashConnectKeyRegistrationTransition: Equatable { - let identityId: Data - let addPublicKeys: [DashConnectKeyRegistrationKey] - let disablePublicKeyIds: [UInt32] -} - -/// The two keys a `dash-st:` transition was allowed to add, once every check -/// passed, paired with the app contract id they were derived against. -struct DashConnectKeyRegistrationValidationResult: Equatable { - let appContractId: Data - let authenticationKey: DashConnectKeyRegistrationKey - let encryptionKey: DashConnectKeyRegistrationKey -} - -private struct DashConnectKeyRegistrationDerivedMaterial { - var loginKey: Data - var authenticationPrivateKey: Data - let authenticationPublicKeyHash160: Data - var encryptionPrivateKey: Data - let encryptionPublicKey: Data -} - /// A token direct purchase parsed out of a `dash-st:` transition: what the /// approval sheet must show, and what `tokenPurchase(...)` is rebuilt from /// after the user approves it. @@ -297,7 +233,6 @@ struct DashConnectTokenPurchaseTransition: Equatable { /// One `dash-st:` payload reduced to app-level types, discriminated by the /// kind of state transition it carried. enum DashConnectParsedStateTransition: Equatable { - case keyRegistration(DashConnectKeyRegistrationTransition) case tokenPurchase(DashConnectTokenPurchaseTransition) } @@ -324,47 +259,6 @@ struct PlatformWalletDashConnectStateTransitionParser: DashConnectStateTransitio func parse(_ transitionBytes: Data) throws -> DashConnectParsedStateTransition { let transition = try parseTransition(transitionBytes) switch transition.kind { - case .identityUpdate(let parsed): - return .keyRegistration( - DashConnectKeyRegistrationTransition( - identityId: parsed.identityId, - addPublicKeys: try parsed.addPublicKeys.map { key in - DashConnectKeyRegistrationKey( - keyId: key.keyId, - keyType: key.keyType, - purpose: key.purpose, - securityLevel: key.securityLevel, - publicKeyData: key.pubkeyBytes, - contractBounds: try key.contractBounds.map { - switch $0 { - case .singleContract(let id): - return .singleContract(id: id) - case .singleContractDocumentType(let id, let documentTypeName): - return .singleContractDocumentType( - id: id, - documentTypeName: documentTypeName - ) - case .contractGroup: - // The wallet layer reports a contract-group bound since the - // SDK's #4800, and the DPP-layer `ContractBounds` this maps - // into has no case for it (dashpay/platform#4853). Dropping - // the bound is not an option here: the value decides which - // approved app a key registration belongs to, and it is also - // rebuilt into the `IdentityPubkey` handed back to - // `updateIdentity(...)`, so a silently weakened bound would - // mean signing a transition the dApp did not ask for. A key - // bound to a contract group is never one of the login keys - // this flow derives, so refuse the transition instead. - throw DashConnectPlatformError.keyRegistrationUnexpectedMutation - } - }, - totalBudget: key.totalBudget, - expiresAt: key.expiresAt - ) - }, - disablePublicKeyIds: parsed.disablePublicKeyIds - ) - ) case .batch(let batch): // The SDK now describes every batch, where it used to refuse all // but a lone token direct purchase. The approval sheet and the @@ -391,7 +285,7 @@ struct PlatformWalletDashConnectStateTransitionParser: DashConnectStateTransitio totalAgreedPrice: totalAgreedPrice ) ) - case .creditTransfer, .dataContractCreate, .dataContractUpdate, .other: + case .identityUpdate, .creditTransfer, .dataContractCreate, .dataContractUpdate, .other: throw DashConnectPlatformError.unsupportedStateTransition(transition.kindName) } } @@ -477,15 +371,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { subsystem: "org.dashfoundation.dash", category: "dashconnect.platform-data-source") - /// The pinned TESTNET `loginKeyResponse` contract id. Compile-time - /// constant, so the length check can never fire at runtime. - static let testnetLoginKeyExchangeContractId: Data = { - guard let data = Data.identifier(fromBase58: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P"), - data.count == 32 else { - fatalError("DashConnect loginKeyResponse contract id must be a 32-byte identifier.") - } - return data - }() static let loginKeyExchangeDocumentType = "loginKeyResponse" private let supportedNetwork: DashConnectNetwork @@ -604,10 +489,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { appConnect: uri)) } + // A `dash-key:` request other than v2. One that parses as v1 is on + // the right network and is refused; any other is malformed or newer. if DashConnectUri.isKeyUri(trimmed) { let request = try DashConnectUri.parseKeyRequest(trimmed) try validateNetwork(request.network) - return .login(request) + throw AppConnect.v1Refusal } if DashConnectUri.isStUri(trimmed) { @@ -661,7 +548,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { protocolVersion = nil unresolvedLoginReason = error.localizedDescription } - var login = protocolVersion.map(AppConnect.login(protocolVersion:)) ?? .unresolved + var login: AppConnect.Login = loginRequest.appConnect == nil ? .refused(AppConnect.v1Refusal) : .unresolved if let appConnect = loginRequest.appConnect, let protocolVersion { (login, unresolvedLoginReason) = await appConnectLogin( appConnect, protocolVersion: protocolVersion, context: context) @@ -680,7 +567,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } - /// One approval, key registration or disconnect at a time for the active + /// One approval or disconnect at a time for the active /// wallet, whichever data source it came through. The turn is for the /// wallet that was active when it was asked for: if another one is /// active when it comes, the operation does not start. @@ -840,7 +727,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw error } // The sheet was resolved for one identity of one wallet on one - // network, and either login acts for that identity: it has to be + // network, and the login acts for that identity: it has to be // the active one here, and again after the PIN prompt. The same // wallet and identity under another devnet name is not what was // shown. @@ -849,40 +736,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.error("🔗 DASHCONNECT :: the approved sign-in was resolved for another identity, wallet or network") throw DashConnectPlatformError.approvalOutOfDate } - // Which login this network can answer is decided before the PIN - // prompt: from protocol version 14 the response goes to the App - // Connect system contract and the wallet registers the key itself; - // below it that contract does not exist and the two-QR flow runs. - // A pinned SDK reports its pin (testnet is pinned to 14 in - // `SwiftDashSDKHost.platformVersion(for:)`), so testnet gets the App - // Connect login. + // The sheet showed the plan `makeConnectionRequest` resolved for + // this request. The network has to still take App Connect. + guard let appConnect = request.appConnect, let plan = consent.login.grantPlan else { + throw DashConnectPlatformError.approvalOutOfDate + } let protocolVersion: UInt32 do { protocolVersion = try await Self.networkProtocolVersion(sdk: context.sdk, network: context.network) } catch { - // The wallet cannot tell any more whether the login the sheet - // offered is the one this network gets. Nothing was signed. + // The wallet cannot tell any more whether the network takes the + // login the sheet offered. Nothing was signed. Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") throw DashConnectPlatformError.loginUnresolved } - // The sheet showed the login `makeConnectionRequest` resolved. If the - // network now gets another one, what was approved is not what would - // run. - let login = AppConnect.login(protocolVersion: protocolVersion) - // A v2 request was approved with the plan the sheet showed. It has - // to be the plan for this request, and the network has to still take - // App Connect. - let approvedLogin: Bool - if let appConnect = request.appConnect { - guard let plan = consent.login.grantPlan else { - throw DashConnectPlatformError.approvalOutOfDate - } - let requestHash = try KeyExchangeCrypto.hash160(appConnect.request.appEphemeralPubKey) - approvedLogin = AppConnect.isAvailable(protocolVersion: protocolVersion) - && plan.appEphemeralPubKeyHash == requestHash - } else { - approvedLogin = consent.login == login - } + let requestHash = try KeyExchangeCrypto.hash160(appConnect.request.appEphemeralPubKey) + let approvedLogin = AppConnect.isAvailable(protocolVersion: protocolVersion) + && plan.appEphemeralPubKeyHash == requestHash guard approvedLogin else { Self.logger.error("🔗 DASHCONNECT :: the network now answers with another login than the one approved") throw DashConnectPlatformError.approvalOutOfDate @@ -901,101 +771,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } catch DashConnectPlatformError.walletChanged { throw DashConnectPlatformError.approvalOutOfDate } - if let appConnect = request.appConnect, let plan = consent.login.grantPlan { - Self.logger.info("🔗 DASHCONNECT :: authorized; App Connect request v2") - return try await approveAppConnectV2Login(appConnect, plan: plan, consent: consent, context: context) - } - Self.logger.info("🔗 DASHCONNECT :: authorized; deriving login key") - - // `deriveIdentityAuthKeyAtSlot` is main-actor isolated in the SDK. - var chainKey = try await MainActor.run { - try context.wallet.deriveIdentityAuthKeyAtSlot( - identityIndex: context.identityIndex, - keyId: UInt32(LoginKeyDerivation.defaultKeyIndex), - network: context.network - ).privateKeyData - } - defer { Self.zero(&chainKey) } - - var loginKey = try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: chainKey, - identityId: context.identityId, - appContractId: request.contractId - ) - defer { Self.zero(&loginKey) } - - var walletEphemeralPrivateKey = try Self.generateEphemeralPrivateKey() - let draft = try Self.buildLoginKeyResponseDraft( - loginKey: loginKey, - appContractId: request.contractId, - appEphemeralPubKey: request.appEphemeralPubKey, - walletEphemeralPrivateKey: &walletEphemeralPrivateKey - ) - - let signer = KeychainSigner(modelContainer: context.modelContainer) - let propertiesJSON = try Self.makeJSONObjectString(from: draft.properties) - - // Whether this identity already published a login-key response for this - // app is a question about state, so it is answered by asking. Matching - // substrings in the error text instead would break the moment the SDK - // rewords or localizes a message, and "duplicate" also matches unique- - // index failures that have nothing to do with this document. - // Step markers: everything between `approveLogin started` and the - // finish was silent, so a stall anywhere in derive → write → preview - // was indistinguishable from a stall in any other step. - Self.logger.info("🔗 DASHCONNECT :: writing loginKeyResponse document") - try await writeLoginKeyResponseDocument( - context: context, - appContractId: request.contractId, - propertiesJSON: propertiesJSON, - signer: signer - ) - Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse document written") - - let preview = await makeConnectionRequest(from: request) - Self.logger.info("🔗 DASHCONNECT :: connection preview resolved") - let connection: DAppConnection - do { - var derivedMaterial = try Self.deriveKeyRegistrationMaterial( - chainKeyPrivateBytes: chainKey, - identityId: context.identityId, - appContractId: request.contractId - ) - defer { - Self.zero(&derivedMaterial.loginKey) - Self.zero(&derivedMaterial.authenticationPrivateKey) - Self.zero(&derivedMaterial.encryptionPrivateKey) - } - - let currentPublicKeys = try context.wallet - .managedIdentity(identityId: context.identityId) - .getPublicKeys() - // The `dash-st:` registration happens once per (identity, app): - // after it, the app stops emitting that QR. So the status reflects - // whether the derived login keys are on the identity, not which - // step of the flow just ran. - if Self.hasRegisteredLoginKeys( - authenticationPublicKeyHash160: derivedMaterial.authenticationPublicKeyHash160, - encryptionPublicKey: derivedMaterial.encryptionPublicKey, - currentIdentityPublicKeys: currentPublicKeys - ) { - connection = Self.makeConnection(preview: preview, status: .active, updatedAt: now()) - } else { - connection = Self.makeConnection(preview: preview, status: .approved, updatedAt: now()) - } - } catch { - Self.logger.error( - "🔗 DASHCONNECT :: could not confirm registered login keys after approveLogin — \(error.localizedDescription, privacy: .public)" - ) - // Conservative fallback: asking for a QR is safer than claiming the - // registration is already on the identity when we could not verify it. - connection = Self.makeConnection(preview: preview, status: .approved, updatedAt: now()) - } - - await updateRows(in: context.stores) { rows in - rows.filter { $0.id != connection.id } + [connection] - } - return connection + Self.logger.info("🔗 DASHCONNECT :: authorized; App Connect request v2") + return try await approveAppConnectV2Login(appConnect, plan: plan, consent: consent, context: context) } /// The protocol version a login is chosen by. An SDK pinned to a @@ -1053,98 +830,26 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return result } - /// The payloads of the two-QR login's keys, and the apps whose two-QR keys - /// are live, for every app this read concerns: one with an intent of the - /// identity or an App Connect row, and every contract a live App Connect - /// key no intent names is bound to. A key the two-QR login registered - /// must never be offered for turning off: that login derives the same key - /// every time. When they cannot be derived, every such key bound to that - /// contract is kept out the same way. - private func twoQRKeys( - _ snapshot: AppConnect.IdentitySnapshot, - intents: [AppConnect.ConnectionIntent], - context: Context - ) async -> (protected: Set, liveApps: Set) { - // Named as `AppConnect.project` names them: an id held by another key - // is that key's. - let named = Set(intents.filter { $0.identityId == snapshot.identityId }.flatMap { intent in - intent.keys.filter { AppConnect.presence(of: $0, in: snapshot) != .conflicting }.map(\.id) - }) - var candidates: [Data: [Data]] = [:] - for intent in intents where intent.identityId == snapshot.identityId { - candidates[intent.appId, default: []] += [] - } - for row in rows(in: context.stores) where row.loginKind == .oneQR { - if let appId = Self.decodeIdentifier(row.id) { candidates[appId, default: []] += [] } - } - for key in snapshot.keys where AppConnect.isAppConnectAuthKey(key) && !named.contains(key.id) { - guard let bound = key.bound, !AppConnect.isProfileBound(bound) else { continue } - candidates[AppConnect.contractId(of: bound), default: []].append(key.data) - } - let live = Set(snapshot.keys.filter { $0.disabledAt == nil }.map(\.data)) - var protected: Set = [] - var liveApps: Set = [] - // The chain key is derived once (a keychain read and an FFI call on - // the main actor); each app's keys follow from it. - var chainKey: Data? - do { - chainKey = try await MainActor.run { - try context.wallet.deriveIdentityAuthKeyAtSlot( - identityIndex: context.identityIndex, - keyId: UInt32(LoginKeyDerivation.defaultKeyIndex), - network: context.network - ).privateKeyData - } - } catch { - // Without them no unrecorded key can be told from a two-QR key: - // none is offered. - Self.logger.error("🔗 DASHCONNECT :: two-QR keys not derived; unrecorded keys are left alone") - for key in snapshot.keys where AppConnect.isAppConnectAuthKey(key) && !named.contains(key.id) { - protected.insert(key.data) - } - } - defer { if chainKey != nil { Self.zero(&chainKey!) } } - for (contract, payloads) in candidates { - guard let chainKey, - var material = try? Self.deriveKeyRegistrationMaterial( - chainKeyPrivateBytes: chainKey, identityId: snapshot.identityId, appContractId: contract) else { - protected.formUnion(payloads) - continue - } - Self.zero(&material.loginKey) - Self.zero(&material.authenticationPrivateKey) - Self.zero(&material.encryptionPrivateKey) - let derived: Set = [material.authenticationPublicKeyHash160, material.encryptionPublicKey] - protected.formUnion(derived) - if !derived.isDisjoint(with: live) { liveApps.insert(contract.toBase58String()) } - } - return (protected, liveApps) - } - /// Puts the App Connect rows of `stores` in step with what `snapshot` - /// and the intents show. A two-QR row stays unless the app has an App - /// Connect connection to show instead. + /// and the intents show. private func refreshRows(from snapshot: AppConnect.IdentitySnapshot, context: Context) async { let stores = context.stores let all = stores.intents.load() - let twoQR = await twoQRKeys(snapshot, intents: all, context: context) - let projection = AppConnect.project([snapshot], intents: all, protected: twoQR.protected) + let projection = AppConnect.project([snapshot], intents: all) let elsewhere = all.filter { $0.identityId != snapshot.identityId && $0.closedAt == nil } let updatedAt = now() await updateRows(in: stores) { rows in - Self.rows(rows, after: projection, intents: elsewhere, twoQRApps: twoQR.liveApps, at: updatedAt) + Self.rows(rows, after: projection, intents: elsewhere, at: updatedAt) } } /// `rows` with the App Connect connections of `projection`: an app with /// live keys or an update that may still land has a row; one whose keys - /// are all off, or whose update never landed, has none, unless its - /// two-QR keys are live (`twoQRApps`): then it has its two-QR row back. + /// are all off, or whose update never landed, has none. static func rows( _ rows: [DAppConnection], after projection: AppConnect.Projection, intents elsewhere: [AppConnect.ConnectionIntent], - twoQRApps: Set = [], at updatedAt: Date ) -> [DAppConnection] { func shownStatus(_ status: AppConnect.IntentStatus) -> ConnectionStatus? { @@ -1158,9 +863,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // An App Connect row stands for intents: it stays only while another // identity's intents hold it, since this read says nothing of them. let heldElsewhere = Set(elsewhere.map { $0.appId.toBase58String() }) - var result = rows.filter { - !shownIds.contains($0.id) && ($0.loginKind == .twoQR || heldElsewhere.contains($0.id)) - } + var result = rows.filter { !shownIds.contains($0.id) && heldElsewhere.contains($0.id) } for connection in projection.connections { let id = connection.appId.toBase58String() guard let status = shownStatus(connection.status) else { continue } @@ -1174,13 +877,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { name: name.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : name, url: latest?.appUrl ?? existing?.url ?? fallback.url, status: status, - updatedAt: existing?.status == status ? existing?.updatedAt ?? updatedAt : updatedAt, - loginKind: .oneQR)) - } - for id in twoQRApps.subtracting(shownIds) where !result.contains(where: { $0.id == id }) { - guard let existing = rows.first(where: { $0.id == id }) else { continue } - result.append(DAppConnection( - id: id, name: existing.name, url: existing.url, status: .active, updatedAt: updatedAt, loginKind: .twoQR)) + updatedAt: existing?.status == status ? existing?.updatedAt ?? updatedAt : updatedAt)) } return result } @@ -1229,16 +926,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { }) { // A retry: the same keys and response, within what was approved // now, and only while the identity still has the encryption keys - // the response carries. - guard AppConnect.isWithinPlan(earlier, plan) else { throw DashConnectPlatformError.approvalOutOfDate } - // Turned off, expired, or never to land: Platform never adds a key - // twice, so the app has to ask again. - guard AppConnect.mayResume(earlier, in: snapshot) else { + // the response carries. Turned off, expired, never to land, or + // with no record of its slots: Platform never adds a key twice, + // so the app has to ask again. + guard AppConnect.mayResume(earlier, in: snapshot), earlier.approvedEncryption != nil else { throw DashConnectPlatformError.sessionKeyUnusable } - guard earlier.sentEncryptionKeyIds.allSatisfy({ id in - snapshot.keys.contains { $0.id == id && AppConnect.isLive($0, at: snapshot.platformTime) } - }) else { + guard AppConnect.isWithinPlan(earlier, plan) else { throw DashConnectPlatformError.approvalOutOfDate } + guard AppConnect.encryptionKeysUsable(earlier, in: snapshot) else { throw DashConnectPlatformError.appConnectEncryptionKeyChanged } intent = earlier @@ -1285,7 +980,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // Connections opens. Self.logger.info("🔗 DASHCONNECT :: identity not read after the approval; its row is refreshed later") } - return Self.makeConnection(preview: consent, status: .active, updatedAt: now(), loginKind: .oneQR) + return DAppConnection( + id: consent.appContractId, + name: consent.appLabel.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : consent.appLabel, + url: consent.appUrl, + status: .active, + updatedAt: now()) } /// The intent of a new approval: the keys it adds under ids no key or @@ -1397,6 +1097,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { connectionId: plan.connectionId, keys: keys, sentEncryptionKeyIds: encryption.compactMap(\.keyId).filter { !added.contains($0) }, + approvedEncryption: AppConnect.approvedSlots(of: plan), disables: superseded, response: response, responseDocumentId: nil, @@ -1565,9 +1266,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } /// Submits what of `intent` is not on the identity yet, and returns once - /// every key it adds shows. An update that reports a failure may still - /// have landed: the identity is read again, and if the keys are not - /// there the intent stays, shown as confirming, and the failure stands. + /// every key it adds shows and every key it turns off is off. An update + /// that reports a failure may still have landed: the identity is read + /// again, and if it does not show the intent the intent stays, shown as + /// confirming, and the failure stands. private func submitIntent( _ intent: AppConnect.ConnectionIntent, request: AppConnectRequest, @@ -1576,15 +1278,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { context: Context, signer: KeychainSigner ) async throws { - func allShow(_ snapshot: AppConnect.IdentitySnapshot) -> Bool { - intent.keys.allSatisfy { [.live, .expired, .disabled].contains(AppConnect.presence(of: $0, in: snapshot)) } - } - guard !allShow(snapshot) else { + guard !AppConnect.hasLanded(intent, in: snapshot) else { await refreshRows(from: snapshot, context: context) return } let missing = intent.keys.filter { AppConnect.presence(of: $0, in: snapshot) == .missing } - let disable = intent.disables.filter { id in snapshot.keys.contains { $0.id == id && $0.disabledAt == nil } } + let disable = AppConnect.outstandingDisables(of: intent, in: snapshot) // The private keys of the auth keys to add, derived again from the // request, and of the encryption keys, from the wallet. @@ -1640,7 +1339,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { for attempt in 0 ..< 3 { if attempt > 0 { try? await Task.sleep(nanoseconds: 3_000_000_000) } guard let read = try? await identitySnapshot(context: context).snapshot else { continue } - if allShow(read) { + if AppConnect.hasLanded(intent, in: read) { Self.logger.info("🔗 DASHCONNECT :: the identity update landed without confirming") await refreshRows(from: read, context: context) return @@ -1795,16 +1494,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } switch parsed { - case .keyRegistration(let transition): - // Only this branch changes the identity and the rows. Its turn - // is the wallet of the context read above, and the context is - // resolved again once the turn comes: the wait can outlast a - // wallet, network or identity switch. - try await gated(walletIdHex: context.stores.walletIdHex) { - let current = try await contextAfterAuthorization(matching: context) - try await completeKeyRegistration(transition, context: current) - } - return .keyRegistrationCompleted case .tokenPurchase(let purchase): return .tokenPurchaseApprovalRequired( try await makeTokenPurchaseRequest(purchase, context: context) @@ -1812,80 +1501,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - /// The key-registration half of a scanned `dash-st:` payload. Verifies - /// the parsed transition only adds the exact derived login keys for our - /// identity, then rebuilds the equivalent `updateIdentity(...)` call - /// through the SDK. - private func completeKeyRegistration( - _ transition: DashConnectKeyRegistrationTransition, - context: Context - ) async throws { - // The transition was parsed before the connection is chosen: - // `DashStRequest` carries no app identifier, but the transition's - // keys usually do, in their contract bounds. Picking the most - // recently approved connection instead would derive app B's keys for - // a QR scanned from app A. - let pendingConnection = try Self.pendingApprovedConnectionForKeyRegistration( - in: rows(in: context.stores), - boundContractId: Self.boundAppContractId(in: transition) - ) - guard let pendingAppContractId = Self.decodeIdentifier(pendingConnection.id) else { - throw DashConnectPlatformError.noApprovedConnectionAwaitingKeyRegistration - } - - var derivedMaterial = try await deriveKeyRegistrationMaterial( - appContractId: pendingAppContractId, context: context) - defer { - Self.zero(&derivedMaterial.loginKey) - Self.zero(&derivedMaterial.authenticationPrivateKey) - Self.zero(&derivedMaterial.encryptionPrivateKey) - } - - let validated = try Self.validateKeyRegistration( - transition, - identityId: context.identityId, - appContractId: pendingAppContractId, - derivedMaterial: derivedMaterial - ) - - let currentPublicKeys = try context.wallet - .managedIdentity(identityId: context.identityId) - .getPublicKeys() - let missingKeys = Self.missingKeyRegistrationKeys( - validated, - currentIdentityPublicKeys: currentPublicKeys - ) - - guard !missingKeys.isEmpty else { - await markActive(pendingConnection, in: context.stores) - return - } - - try await authorize() - // The keys were derived and checked for the identity above. - let authorized = try await contextAfterAuthorization(matching: context) - - let signer = KeychainSigner(modelContainer: authorized.modelContainer) - try await signer.withAdditionalSigningKeys([ - ( - publicKey: validated.authenticationKey.publicKeyData, - privateKey: derivedMaterial.authenticationPrivateKey - ), - ( - publicKey: validated.encryptionKey.publicKeyData, - privateKey: derivedMaterial.encryptionPrivateKey - ), - ]) { - try await authorized.wallet.updateIdentity( - identityId: authorized.identityId, - addPublicKeys: missingKeys.map(Self.makeManagedIdentityPubkey), - signer: signer - ) - } - - await markActive(pendingConnection, in: authorized.stores) - } - /// The context to go on with after a wait — a PIN prompt, a turn at /// the operation gate — which can outlast a wallet, network or identity /// switch: what is active now, and only while it is still the identity, @@ -1911,24 +1526,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return context } - /// Marks the existing row of a two-QR connection whose keys were - /// registered active. - private func markActive(_ pendingConnection: DAppConnection, in stores: Stores) async { - let activatedAt = now() - await updateRows(in: stores) { rows in - rows.map { connection in - guard connection.id == pendingConnection.id else { return connection } - return DAppConnection( - id: connection.id, - name: connection.name, - url: connection.url, - status: .active, - updatedAt: activatedAt - ) - } - } - } - /// Builds the user-facing approval request for a parsed token purchase, /// refusing purchases that name someone else's identity. Reads the token's /// denomination from the contract over the network (see @@ -2139,26 +1736,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard let appId = Self.decodeIdentifier(id) else { throw DashConnectPlatformError.loginContractUnavailable } - let row = rows(in: stores).first { $0.id == id } - let openIntents = stores.intents.load().filter { $0.appId == appId && $0.closedAt == nil } - // Keys left over from an earlier disconnect of the app are turned off - // the App Connect way, whatever row is left. - guard !openIntents.isEmpty || row?.loginKind == .oneQR || includingUnrecorded else { - // Local-only for a two-QR connection: its `loginKeyResponse` - // document stays, and re-approving the same `dash-key:` QR returns - // it to `.active` while the identity keys are still registered. - let disconnectedAt = now() - await updateRows(in: stores) { rows in - rows.map { connection in - guard connection.id == id else { return connection } - return DAppConnection( - id: connection.id, name: connection.name, url: connection.url, - status: .approved, updatedAt: disconnectedAt) - } - } - return DashConnectDisconnectResult() - } - var context = try await requireContext(pinnedTo: stores) // An intent this build cannot read may name keys of the app that are // still to land: nothing is turned off until it can be read. @@ -2232,19 +1809,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) { let snapshot = try await identitySnapshot(context: context).snapshot let all = context.stores.intents.load() - let protected = await twoQRKeys(snapshot, intents: all, context: context).protected var plan = AppConnect.disconnectPlan( - appId: appId, snapshot: snapshot, intents: all, includeUnrecorded: includingUnrecorded, - protected: protected) + appId: appId, snapshot: snapshot, intents: all, includeUnrecorded: includingUnrecorded) // The same intents as the plan, so the keys counted are the keys it // would turn off. - let projection = AppConnect.project([snapshot], intents: all, protected: protected) + let projection = AppConnect.project([snapshot], intents: all) let unrecordedAppKeys = projection.connections.first { $0.appId == appId }? .unrecordedKeyIds[context.identityId] ?? [] - // DashPay profile keys no intent names are no one app's. They are - // offered with the disconnect of an app that was given profile - // access. - let profileKeys = AppConnect.usesProfileAccess(all, appId: appId) + // DashPay profile keys no intent names are no one app's. + let profileKeys = AppConnect.offersUnrecordedProfileKeys(all, appId: appId, identityId: context.identityId) ? projection.unrecordedProfileKeyIds[context.identityId] ?? [] : [] plan.disable = Array(Set(plan.disable).union(includingUnrecorded ? profileKeys : [])).sorted() @@ -2333,279 +1906,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - static func buildLoginKeyResponseDraft( - loginKey: Data, - appContractId: Data, - appEphemeralPubKey: Data, - walletEphemeralPrivateKey: inout Data, - encryptLoginKey: (Data, Data, Data) throws -> Data = { loginKey, walletPriv, appPub in - try KeyExchangeCrypto.encryptLoginKey( - loginKey, - walletEphemeralPriv: walletPriv, - appEphemeralPub: appPub - ) - } - ) throws -> DashConnectLoginKeyResponseDraft { - let sealed = try AppConnect.seal( - loginKey, - appEphemeralPubKey: appEphemeralPubKey, - walletEphemeralPrivateKey: &walletEphemeralPrivateKey, - encrypt: encryptLoginKey - ) - let values = AppConnect.ResponseValues(sealed) - - return DashConnectLoginKeyResponseDraft( - properties: [ - "contractId": appContractId.toBase58String(), - "appEphemeralPubKeyHash": values.appEphemeralPubKeyHash, - "walletEphemeralPubKey": values.walletEphemeralPubKey, - "encryptedPayload": values.encryptedPayload, - "keyIndex": LoginKeyDerivation.defaultKeyIndex, - ], - walletEphemeralPublicKey: sealed.walletEphemeralPublicKey, - encryptedPayload: sealed.encryptedPayload - ) - } - - static func validateKeyRegistration( - _ transition: DashConnectKeyRegistrationTransition, - chainKeyPrivateBytes: Data, - identityId: Data, - appContractId: Data - ) throws -> DashConnectKeyRegistrationValidationResult { - var derivedMaterial = try deriveKeyRegistrationMaterial( - chainKeyPrivateBytes: chainKeyPrivateBytes, - identityId: identityId, - appContractId: appContractId - ) - defer { - zero(&derivedMaterial.loginKey) - zero(&derivedMaterial.authenticationPrivateKey) - zero(&derivedMaterial.encryptionPrivateKey) - } - - return try validateKeyRegistration( - transition, - identityId: identityId, - appContractId: appContractId, - derivedMaterial: derivedMaterial - ) - } - - /// The two-QR login's keys for the active identity and one app. The - /// caller wipes the returned private keys. - private func deriveKeyRegistrationMaterial( - appContractId: Data, - context: Context - ) async throws -> DashConnectKeyRegistrationDerivedMaterial { - try await deriveKeyRegistrationMaterial( - appContractId: appContractId, - identityId: context.identityId, - identityIndex: context.identityIndex, - context: context) - } - - /// The same for any identity of the active wallet, by its index. - private func deriveKeyRegistrationMaterial( - appContractId: Data, - identityId: Data, - identityIndex: UInt32, - context: Context - ) async throws -> DashConnectKeyRegistrationDerivedMaterial { - // `deriveIdentityAuthKeyAtSlot` is main-actor isolated in the SDK. - var chainKey = try await MainActor.run { - try context.wallet.deriveIdentityAuthKeyAtSlot( - identityIndex: identityIndex, - keyId: UInt32(LoginKeyDerivation.defaultKeyIndex), - network: context.network - ).privateKeyData - } - defer { Self.zero(&chainKey) } - return try Self.deriveKeyRegistrationMaterial( - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - } - - private static func deriveKeyRegistrationMaterial( - chainKeyPrivateBytes: Data, - identityId: Data, - appContractId: Data - ) throws -> DashConnectKeyRegistrationDerivedMaterial { - var loginKey = try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: chainKeyPrivateBytes, - identityId: identityId, - appContractId: appContractId - ) - var authenticationPrivateKey = Data() - var encryptionPrivateKey = Data() - - do { - authenticationPrivateKey = try KeyExchangeCrypto.deriveAuthPrivateKey( - loginKey: loginKey, - identityId: identityId - ) - let authenticationPublicKey = try Secp256k1.compressedPublicKey( - privateKey: authenticationPrivateKey - ) - let authenticationPublicKeyHash160 = try KeyExchangeCrypto.hash160(authenticationPublicKey) - - encryptionPrivateKey = try KeyExchangeCrypto.deriveEncryptionPrivateKey( - loginKey: loginKey, - identityId: identityId - ) - let encryptionPublicKey = try Secp256k1.compressedPublicKey( - privateKey: encryptionPrivateKey - ) - - return DashConnectKeyRegistrationDerivedMaterial( - loginKey: loginKey, - authenticationPrivateKey: authenticationPrivateKey, - authenticationPublicKeyHash160: authenticationPublicKeyHash160, - encryptionPrivateKey: encryptionPrivateKey, - encryptionPublicKey: encryptionPublicKey - ) - } catch { - zero(&loginKey) - zero(&authenticationPrivateKey) - zero(&encryptionPrivateKey) - throw error - } - } - - private static func validateKeyRegistration( - _ transition: DashConnectKeyRegistrationTransition, - identityId: Data, - appContractId: Data, - derivedMaterial: DashConnectKeyRegistrationDerivedMaterial - ) throws -> DashConnectKeyRegistrationValidationResult { - guard transition.identityId == identityId else { - throw DashConnectPlatformError.keyRegistrationWrongIdentity - } - guard transition.disablePublicKeyIds.isEmpty else { - throw DashConnectPlatformError.keyRegistrationUnexpectedMutation - } - guard transition.addPublicKeys.count == 2 else { - throw DashConnectPlatformError.keyRegistrationUnexpectedMutation - } - - var authenticationKey: DashConnectKeyRegistrationKey? - var encryptionKey: DashConnectKeyRegistrationKey? - - for key in transition.addPublicKeys { - switch key.purpose { - case .authentication: - guard authenticationKey == nil, - key.keyType == .ecdsaHash160, - key.securityLevel == .high, - key.publicKeyData == derivedMaterial.authenticationPublicKeyHash160 else { - throw DashConnectPlatformError.keyRegistrationMismatchedDerivedKey(.authentication) - } - authenticationKey = key - case .encryption: - guard encryptionKey == nil, - key.keyType == .ecdsaSecp256k1, - key.securityLevel == .medium, - key.publicKeyData == derivedMaterial.encryptionPublicKey else { - throw DashConnectPlatformError.keyRegistrationMismatchedDerivedKey(.encryption) - } - encryptionKey = key - default: - throw DashConnectPlatformError.keyRegistrationUnexpectedMutation - } - } - - guard let authenticationKey, let encryptionKey else { - throw DashConnectPlatformError.keyRegistrationUnexpectedMutation - } - - return DashConnectKeyRegistrationValidationResult( - appContractId: appContractId, - authenticationKey: authenticationKey, - encryptionKey: encryptionKey - ) - } - - static func hasRegisteredLoginKeys( - authenticationPublicKeyHash160: Data, - encryptionPublicKey: Data, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] - ) -> Bool { - hasRegisteredAuthenticationKey( - authenticationPublicKeyHash160: authenticationPublicKeyHash160, - currentIdentityPublicKeys: currentIdentityPublicKeys - ) && hasRegisteredEncryptionKey( - encryptionPublicKey: encryptionPublicKey, - currentIdentityPublicKeys: currentIdentityPublicKeys - ) - } - - static func missingKeyRegistrationKeys( - _ validated: DashConnectKeyRegistrationValidationResult, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] - ) -> [DashConnectKeyRegistrationKey] { - let hasAuthenticationKey = hasRegisteredAuthenticationKey( - authenticationPublicKeyHash160: validated.authenticationKey.publicKeyData, - currentIdentityPublicKeys: currentIdentityPublicKeys - ) - let hasEncryptionKey = hasRegisteredEncryptionKey( - encryptionPublicKey: validated.encryptionKey.publicKeyData, - currentIdentityPublicKeys: currentIdentityPublicKeys - ) - - var missingKeys: [DashConnectKeyRegistrationKey] = [] - if !hasAuthenticationKey { - missingKeys.append(validated.authenticationKey) - } - if !hasEncryptionKey { - missingKeys.append(validated.encryptionKey) - } - return missingKeys - } - - private static func makeConnection( - preview: ConnectionRequest, - status: ConnectionStatus, - updatedAt: Date, - loginKind: DashConnectLoginKind = .twoQR - ) -> DAppConnection { - DAppConnection( - id: preview.appContractId, - name: preview.appLabel.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : preview.appLabel, - url: preview.appUrl, - status: status, - updatedAt: updatedAt, - loginKind: loginKind - ) - } - - private static func hasRegisteredAuthenticationKey( - authenticationPublicKeyHash160: Data, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] - ) -> Bool { - currentIdentityPublicKeys.contains { - $0.purpose == .authentication - && $0.securityLevel == .high - && $0.keyType == .ecdsaHash160 - && $0.disabledAt == nil - && $0.data == authenticationPublicKeyHash160 - } - } - - private static func hasRegisteredEncryptionKey( - encryptionPublicKey: Data, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] - ) -> Bool { - currentIdentityPublicKeys.contains { - $0.purpose == .encryption - && $0.securityLevel == .medium - && $0.keyType == .ecdsaSecp256k1 - && $0.disabledAt == nil - && $0.data == encryptionPublicKey - } - } - /// The stores fixed to one wallet; `nil` with no wallet. private static func pinnedStores( walletIdHex: String?, @@ -2663,81 +1963,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if shownRows.scope == stores.scope { subject.send(stores.published(sorted)) } } - /// The contract every bounded key in the transition points at, or `nil` - /// when the transition carries no bounds — or carries bounds that disagree, - /// which names no single app and so identifies nothing. - static func boundAppContractId( - in transition: DashConnectKeyRegistrationTransition - ) -> Data? { - let boundIds = transition.addPublicKeys.compactMap { key -> Data? in - switch key.contractBounds { - case .singleContract(let id): - return id - case .singleContractDocumentType(let id, _): - return id - case nil: - return nil - } - } - - guard let first = boundIds.first, boundIds.allSatisfy({ $0 == first }) else { - return nil - } - return first - } - - static func pendingApprovedConnectionForKeyRegistration( - in connections: [DAppConnection], - boundContractId: Data? - ) throws -> DAppConnection { - let approved = connections.filter { $0.status == .approved } - guard !approved.isEmpty else { - throw DashConnectPlatformError.noApprovedConnectionAwaitingKeyRegistration - } - - // The transition names its app whenever its keys are bounded. That is - // an exact answer, so it wins over any ordering heuristic. - if let boundContractId { - guard let match = approved.first(where: { - Self.decodeIdentifier($0.id) == boundContractId - }) else { - throw DashConnectPlatformError.noApprovedConnectionAwaitingKeyRegistration - } - return match - } - - // Unbounded transitions are valid but anonymous. Recency is only safe - // when there is nothing to confuse it with: with two apps approved, - // guessing wrong derives the wrong keys and rejects a legitimate scan. - guard approved.count == 1 else { - throw DashConnectPlatformError.ambiguousKeyRegistrationConnection - } - return approved[0] - } - - /// The `loginKeyResponse` contract id for the network this data source - /// serves. Testnet is pinned; devnet reads the user-entered id from - /// `DevnetConfiguration` and throws a normal, user-visible error when it - /// is absent or not a 32-byte base58 identifier — never a crash on - /// user input. - private func loginKeyExchangeContractId() throws -> Data { - switch supportedNetwork { - case .testnet: - return Self.testnetLoginKeyExchangeContractId - case .devnet: - guard let raw = DevnetConfiguration.dashConnectContractId, - let data = Data.identifier(fromBase58: raw), - data.count == 32 else { - throw DashConnectPlatformError.devnetLoginContractNotConfigured - } - return data - case .mainnet: - // Unreachable through the app (mainnet gets the mock data - // source); fail closed rather than publish against a guess. - throw DashConnectPlatformError.loginContractUnavailable - } - } - private func validateNetwork(_ network: DashConnectNetwork) throws { guard network == supportedNetwork else { throw DashConnectPlatformError.unsupportedRequestNetwork( @@ -2918,96 +2143,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return context.storedUsername } - /// Publishes the login-key response, replacing the existing document when - /// this identity already has one for this app. - private func writeLoginKeyResponseDocument( - context: Context, - appContractId: Data, - propertiesJSON: String, - signer: KeychainSigner - ) async throws { - func replace(documentId: Data) async throws { - let signingKeyId = try selectDocumentSigningKeyId( - wallet: context.wallet, - identityId: context.identityId - ) - _ = try await context.wallet.replaceDocument( - ownerIdentityId: context.identityId, - contractId: try loginKeyExchangeContractId(), - documentType: Self.loginKeyExchangeDocumentType, - documentId: documentId, - propertiesJSON: propertiesJSON, - signingKeyId: signingKeyId, - signer: signer - ) - } - - if let existingDocumentId = try await findLoginKeyResponseDocumentId( - ownerIdentityId: context.identityId, - appContractId: appContractId, - sdk: context.sdk - ) { - try await replace(documentId: existingDocumentId) - return - } - - do { - _ = try await context.wallet.createDocument( - ownerIdentityId: context.identityId, - contractId: try loginKeyExchangeContractId(), - documentType: Self.loginKeyExchangeDocumentType, - propertiesJSON: propertiesJSON, - signer: signer - ) - } catch { - // The document can appear between the lookup and the create. Ask - // once more: if it is there now, the create lost that race and a - // replace is correct; if it is not, this failure is something else - // and has to surface. - guard let racedDocumentId = try? await findLoginKeyResponseDocumentId( - ownerIdentityId: context.identityId, - appContractId: appContractId, - sdk: context.sdk - ) else { - throw error - } - - try await replace(documentId: racedDocumentId) - } - } - - /// `nil` means no such document exists; a failed lookup throws. The - /// create-or-replace branch is decided on this result, so "absent" and - /// "could not tell" must not collapse into the same value. - private func findLoginKeyResponseDocumentId( - ownerIdentityId: Data, - appContractId: Data, - sdk: SDK - ) async throws -> Data? { - let whereClause = """ - [["$ownerId","==","\(ownerIdentityId.toBase58String())"],["contractId","==","\(appContractId.toBase58String())"]] - """ - - let response = try await sdk.documentList( - dataContractId: try loginKeyExchangeContractId().toBase58String(), - documentType: Self.loginKeyExchangeDocumentType, - whereClause: whereClause, - limit: 1 - ) - - guard let documents = response["documents"] as? [[String: Any]] else { - throw DashConnectPlatformError.existingDocumentLookupFailed - } - - guard let id = documents.first?["$id"] as? String else { return nil } - - guard let identifier = Self.decodeIdentifier(id), identifier.count == 32 else { - throw DashConnectPlatformError.existingDocumentLookupFailed - } - - return identifier - } - private func selectDocumentSigningKeyId( wallet: ManagedPlatformWallet, identityId: Data @@ -3064,35 +2199,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - private static func makeManagedIdentityPubkey( - from key: DashConnectKeyRegistrationKey - ) -> ManagedPlatformWallet.IdentityPubkey { - ManagedPlatformWallet.IdentityPubkey( - keyId: key.keyId, - keyType: key.keyType, - purpose: key.purpose, - securityLevel: key.securityLevel, - pubkeyBytes: key.publicKeyData, - contractBounds: key.contractBounds.map { - switch $0 { - case .singleContract(let id): - return .singleContract(id: id) - case .singleContractDocumentType(let id, let documentTypeName): - return .singleContractDocumentType(id: id, documentTypeName: documentTypeName) - } - }, - totalBudget: key.totalBudget, - expiresAt: key.expiresAt - ) - } - /// A random 32-byte value is a valid secp256k1 scalar with overwhelming /// probability, so this exits on the first pass in practice. The bound is /// for the other failure mode: if `Secp256k1` is failing for a reason that /// has nothing to do with the candidate, an unbounded loop would hang /// `approveLogin` forever instead of surfacing an error. private static let ephemeralKeyGenerationAttempts = 8 - private static func generateEphemeralPrivateKey() throws -> Data { for _ in 0 ..< ephemeralKeyGenerationAttempts { var candidate = try randomBytes(count: 32) @@ -3127,15 +2239,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return nil } - private static func makeJSONObjectString(from properties: [String: AnyHashable]) throws -> String { - let dictionary = Dictionary(uniqueKeysWithValues: properties.map { ($0.key, $0.value.base) }) - let data = try JSONSerialization.data(withJSONObject: dictionary, options: [.sortedKeys]) - guard let string = String(data: data, encoding: .utf8) else { - throw CocoaError(.coderInvalidValue) - } - return string - } - /// Every key this wallet derives for one encryption grant /// (`AppConnect.derivableEncryptionKeys`): rotations at the DIP-13 path /// with the rotation level, and on testnet and devnet the path without diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift index 4515172688..9b3d191412 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift @@ -77,17 +77,15 @@ enum DashConnectUri { /// `dash-key:` is fully specified: version + compressed point + contract id /// + label length + label. /// - /// `dash-st:` carries one `IdentityUpdateTransition` that adds the two - /// login keys: identity id, revision, nonce, two key entries with their - /// contract bounds and per-key signatures, and the transition signature — - /// well under a kilobyte. The ceiling is deliberately not Platform's own - /// state-transition limit, which is far larger than this format ever needs - /// and which the decode below cannot afford: its cost is quadratic in the - /// encoded length, so a 32 KiB ceiling would admit a ~44,800-character body - /// worth ~1.5 billion inner iterations — seconds of CPU per link, from any - /// installed app. 4 KiB costs ~23 million, tens of milliseconds, and still - /// leaves several times the headroom a longer key form or an added field - /// would need. + /// `dash-st:` carries the one state transition the wallet takes, a token + /// purchase — well under a kilobyte. The ceiling is deliberately not + /// Platform's own state-transition limit, which is far larger than this + /// format ever needs and which the decode below cannot afford: its cost + /// is quadratic in the encoded length, so a 32 KiB ceiling would admit a + /// ~44,800-character body worth ~1.5 billion inner iterations — seconds + /// of CPU per link, from any installed app. 4 KiB costs ~23 million, tens + /// of milliseconds, and still leaves several times the headroom an added + /// field would need. private static let maxKeyPayloadLength = minKeyPayloadLength + maxLabelLength private static let maxStPayloadLength = 4 * 1024 /// The largest App Connect request the format defines today (a 64-byte diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/KeyExchangeCrypto.swift b/DashWallet/Sources/Models/DashConnect/Protocol/KeyExchangeCrypto.swift index 92f3f36261..9fff999229 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/KeyExchangeCrypto.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/KeyExchangeCrypto.swift @@ -6,10 +6,7 @@ import SwiftDashSDK enum KeyExchangeCrypto { private enum CryptoError: LocalizedError { case invalidSharedXLength - case invalidLoginKeyLength - case invalidIdentityIdLength case invalidNonceLength - case invalidPayloadLength case randomNonceGenerationFailed(OSStatus) case invalidEncryptedPayload case hash160Failed @@ -20,14 +17,8 @@ enum KeyExchangeCrypto { switch self { case .invalidSharedXLength: "The ECDH shared X coordinate must be exactly 32 bytes." - case .invalidLoginKeyLength: - "DashConnect login keys must be exactly 32 bytes." - case .invalidIdentityIdLength: - "DashConnect identity IDs must be exactly 32 bytes." case .invalidNonceLength: "DashConnect AES-GCM nonces must be exactly 12 bytes." - case .invalidPayloadLength: - "DashConnect encrypted login-key payloads must be exactly 60 bytes." case .randomNonceGenerationFailed(let status): "Failed to generate a random AES-GCM nonce (\(status))." case .invalidEncryptedPayload: @@ -46,13 +37,10 @@ enum KeyExchangeCrypto { private static let aesKeyLength = 32 private static let loginKeyLength = 32 private static let nonceLength = 12 - private static let encryptedPayloadLength = 60 private static let keyExchangeSalt = Data("dash:key-exchange:v1".utf8) private static let appConnectInfo = Data("app-connect:v2".utf8) private static let appConnectAssociatedDataPrefix = Data("dash:app-connect:v2".utf8) private static let maxAppConnectSlots = 17 - private static let authInfo = Data("auth".utf8) - private static let encryptionInfo = Data("encryption".utf8) /// RIPEMD160(SHA256(data)) using the shared Rust FFI helper. /// @@ -93,20 +81,8 @@ enum KeyExchangeCrypto { return result } - /// The returned Data is owned by the caller to clear. - static func deriveAesKey(sharedX: Data) throws -> Data { - try requireLength(sharedX, expected: aesKeyLength, error: CryptoError.invalidSharedXLength) - return try deriveHKDFKey( - inputKeyMaterial: sharedX, - salt: keyExchangeSalt, - info: Data(), - outputByteCount: aesKeyLength - ) - } - - /// The AES key of an App Connect v2 response. Same salt as the legacy - /// exchange with its own `info`, so it never equals a v1 key. The - /// returned Data is owned by the caller to clear. + /// The AES key of an App Connect v2 response. The returned Data is + /// owned by the caller to clear. static func deriveAppConnectAesKey(sharedX: Data) throws -> Data { try requireLength(sharedX, expected: aesKeyLength, error: CryptoError.invalidSharedXLength) return try deriveHKDFKey( @@ -203,18 +179,6 @@ enum KeyExchangeCrypto { } } - /// The returned Data is owned by the caller to clear. - static func encryptLoginKey(_ loginKey: Data, - walletEphemeralPriv: Data, - appEphemeralPub: Data) throws -> Data { - try encryptLoginKey( - loginKey, - walletEphemeralPriv: walletEphemeralPriv, - appEphemeralPub: appEphemeralPub, - nonce: try randomNonce() - ) - } - private static func randomNonce() throws -> Data { var nonceBytes = [UInt8](repeating: 0, count: nonceLength) let status = SecRandomCopyBytes(kSecRandomDefault, nonceBytes.count, &nonceBytes) @@ -228,79 +192,6 @@ enum KeyExchangeCrypto { return nonce } - /// Fixed-nonce variant. Tests only — never call from the login flow. - /// - /// The returned Data is owned by the caller to clear. - static func encryptLoginKey(_ loginKey: Data, - walletEphemeralPriv: Data, - appEphemeralPub: Data, - nonce: Data) throws -> Data { - try requireLength(loginKey, expected: loginKeyLength, error: CryptoError.invalidLoginKeyLength) - try requireLength(nonce, expected: nonceLength, error: CryptoError.invalidNonceLength) - - let sharedX = try Secp256k1.ecdhSharedX(privateKey: walletEphemeralPriv, publicKey: appEphemeralPub) - let aesKey = try deriveAesKey(sharedX: sharedX) - let symmetricKey = SymmetricKey(data: aesKey) - let sealedBox = try AES.GCM.seal( - loginKey, - using: symmetricKey, - nonce: try AES.GCM.Nonce(data: nonce) - ) - - guard let combined = sealedBox.combined else { - throw CryptoError.invalidEncryptedPayload - } - assert(combined.count == encryptedPayloadLength) - guard combined.count == encryptedPayloadLength else { - throw CryptoError.invalidPayloadLength - } - - return combined - } - - /// Tests only — this exists to verify the key-exchange round trip and is not used by - /// the login flow. The returned Data is owned by the caller to clear. - static func decryptLoginKey(_ payload: Data, - walletEphemeralPriv: Data, - appEphemeralPub: Data) throws -> Data { - try requireLength(payload, expected: encryptedPayloadLength, error: CryptoError.invalidPayloadLength) - - let sharedX = try Secp256k1.ecdhSharedX(privateKey: walletEphemeralPriv, publicKey: appEphemeralPub) - let aesKey = try deriveAesKey(sharedX: sharedX) - let symmetricKey = SymmetricKey(data: aesKey) - let sealedBox = try AES.GCM.SealedBox(combined: payload) - let loginKey = try AES.GCM.open(sealedBox, using: symmetricKey) - - try requireLength(loginKey, expected: loginKeyLength, error: CryptoError.invalidLoginKeyLength) - return loginKey - } - - /// The returned Data is owned by the caller to clear. - static func deriveAuthPrivateKey(loginKey: Data, identityId: Data) throws -> Data { - try requireLength(loginKey, expected: loginKeyLength, error: CryptoError.invalidLoginKeyLength) - try requireLength(identityId, expected: loginKeyLength, error: CryptoError.invalidIdentityIdLength) - - return try deriveHKDFKey( - inputKeyMaterial: loginKey, - salt: identityId, - info: authInfo, - outputByteCount: loginKeyLength - ) - } - - /// The returned Data is owned by the caller to clear. - static func deriveEncryptionPrivateKey(loginKey: Data, identityId: Data) throws -> Data { - try requireLength(loginKey, expected: loginKeyLength, error: CryptoError.invalidLoginKeyLength) - try requireLength(identityId, expected: loginKeyLength, error: CryptoError.invalidIdentityIdLength) - - return try deriveHKDFKey( - inputKeyMaterial: loginKey, - salt: identityId, - info: encryptionInfo, - outputByteCount: loginKeyLength - ) - } - private static func deriveHKDFKey(inputKeyMaterial: Data, salt: Data, info: Data, diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/LoginKeyDerivation.swift b/DashWallet/Sources/Models/DashConnect/Protocol/LoginKeyDerivation.swift deleted file mode 100644 index 8c5eca8c86..0000000000 --- a/DashWallet/Sources/Models/DashConnect/Protocol/LoginKeyDerivation.swift +++ /dev/null @@ -1,68 +0,0 @@ -import CryptoKit -import Foundation - -enum LoginKeyDerivation { - static let defaultKeyIndex = 0 - - private enum DerivationError: LocalizedError { - case invalidChainKeyLength - case invalidIdentityIdLength - case invalidAppContractIdLength - - var errorDescription: String? { - switch self { - case .invalidChainKeyLength: - "The identity auth-chain private key must be exactly 32 bytes." - case .invalidIdentityIdLength: - "DashConnect identity IDs must be exactly 32 bytes." - case .invalidAppContractIdLength: - "DashConnect app contract IDs must be exactly 32 bytes." - } - } - } - - private static let loginKeyInfoPrefix = Data("dash:login-key:v1".utf8) - private static let keyLength = 32 - - /// The returned Data is owned by the caller to clear. - static func deriveLoginKey(chainKeyPrivateBytes: Data, - identityId: Data, - appContractId: Data) throws -> Data { - guard chainKeyPrivateBytes.count == keyLength else { - throw DerivationError.invalidChainKeyLength - } - guard identityId.count == keyLength else { - throw DerivationError.invalidIdentityIdLength - } - guard appContractId.count == keyLength else { - throw DerivationError.invalidAppContractIdLength - } - - var info = loginKeyInfoPrefix - info.append(appContractId) - // The HKDF info is protocol metadata (`dash:login-key:v1` + contract ID), not a - // secret. The returned login key remains caller-owned to clear. - return try deriveHKDFKey( - inputKeyMaterial: chainKeyPrivateBytes, - salt: identityId, - info: info, - outputByteCount: keyLength - ) - } - - private static func deriveHKDFKey(inputKeyMaterial: Data, - salt: Data, - info: Data, - outputByteCount: Int) throws -> Data { - let key = HKDF.deriveKey( - inputKeyMaterial: SymmetricKey(data: inputKeyMaterial), - salt: salt, - info: info, - outputByteCount: outputByteCount - ) - - return key.withUnsafeBytes { bytes in - Data(bytes) - } - } -} diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index 37bbe07b2b..288edc398d 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -93,7 +93,7 @@ struct ApproveConnectionSheet: View { // An App Connect plan gives the app keys with limits of // their own, so its terms are spelled out on a repeat - // sign-in too, and when it replaces a two-QR connection. + // sign-in too. if request.login == .unresolved { Text(NSLocalizedString( "This wallet could not check what this sign-in would give the app.", @@ -116,10 +116,6 @@ struct ApproveConnectionSheet: View { .foregroundColor(.secondaryText) } else if let plan = request.login.grantPlan { appConnectPermissions(plan) - } else if isRelogin { - reloginPermissionsSummary - } else { - fullPermissions } if request.walletUsername != nil || request.walletIdentityId != nil { @@ -224,19 +220,6 @@ struct ApproveConnectionSheet: View { return candidates.first(where: { !$0.isEmpty }) ?? NSLocalizedString("Unknown app", comment: "DashConnect") } - private var fullPermissions: some View { - permissions( - granted: [ - NSLocalizedString("See your username", comment: "DashConnect"), - NSLocalizedString("Verify your identity", comment: "DashConnect"), - ], - withheld: [ - NSLocalizedString("Your private keys", comment: "DashConnect"), - NSLocalizedString("Withdraw funds", comment: "DashConnect"), - ] - ) - } - /// An App Connect request v2: one line per key the app is given, with /// what it can spend and until when, then how old the request is and /// where the wallet returns. A draft: per-binding toggles and budget and @@ -423,17 +406,6 @@ struct ApproveConnectionSheet: View { } } - private var reloginPermissionsSummary: some View { - HStack(spacing: 8) { - Icon(name: .custom("dashconnect.check.circle", maxHeight: 18)) - .frame(width: 18, height: 18) - - Text(NSLocalizedString("Same permissions as before", comment: "DashConnect re-login")) - .font(.subhead) - .foregroundColor(.primaryText) - } - } - private func reloginNotice(_ existingConnection: DAppConnection) -> some View { VStack(alignment: .leading, spacing: 6) { Text(NSLocalizedString("This connection already exists.", comment: "DashConnect re-login")) @@ -532,7 +504,7 @@ private let dashConnectTruncateMiddleCheck: Bool = { ) } -#Preview("Approve Re-Login") { +#Preview("Older Sign-In Refused") { ApproveConnectionSheet( request: ConnectionRequest( loginRequest: MockDashConnectDataSource.sampleLoginRequest, @@ -541,7 +513,7 @@ private let dashConnectTruncateMiddleCheck: Bool = { walletUsername: "dashuser", walletIdentityId: "5DbLwAxEWR695MsqP4KybNQD5n7CUDWydJYNg63FzUo8", existingConnection: MockDashConnectDataSource.sample(.active), - login: .twoQR + login: .refused(AppConnect.v1Refusal) ), onApprove: {}, onDeny: {} diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift index 81d7497f45..1c4a5808aa 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift @@ -20,16 +20,10 @@ import DashUIKit import SwiftUI -/// One connected app: its name and url, the current status, and — once the -/// connection is live — the switch that lets this wallet forget it. -/// -/// An approved connection is not usable yet, so the row carries the prompt to -/// finish the login underneath itself rather than leaving the list to know -/// which rows need it. +/// One connected app: its name and url, the current status, and the switch +/// that turns it off. struct ConnectionRow: View { let connection: DAppConnection - let onPrimaryAction: () -> Void - let onMockScan: () -> Void let onDisconnect: () -> Void private enum Layout { @@ -48,27 +42,19 @@ struct ConnectionRow: View { } var body: some View { - VStack(alignment: .leading, spacing: 2) { - HStack(spacing: 12) { - identity - - ConnectionStatusBadge(status: connection.status, updatedAt: connection.updatedAt) - .fixedSize(horizontal: true, vertical: false) + HStack(spacing: 12) { + identity - // A confirming connection may get its keys yet: turning it - // off makes sure it never does. - if connection.status != .approved { - activeSwitch - } - } - .padding(.horizontal, 14) - .padding(.vertical, 12) - .frame(maxWidth: .infinity, alignment: .leading) + ConnectionStatusBadge(status: connection.status, updatedAt: connection.updatedAt) + .fixedSize(horizontal: true, vertical: false) - if connection.status == .approved { - ScanToCompleteBanner(onScanQR: onPrimaryAction, onMockScan: onMockScan) - } + // A confirming connection may get its keys yet: turning it off + // makes sure it never does. + activeSwitch } + .padding(.horizontal, 14) + .padding(.vertical, 12) + .frame(maxWidth: .infinity, alignment: .leading) } private var identity: some View { @@ -88,13 +74,9 @@ struct ConnectionRow: View { .frame(maxWidth: .infinity, alignment: .topLeading) } - /// Always reads as on: the row shows it for an active or a confirming - /// connection, and only the off direction is reachable from here. What - /// turning it off does depends on the login that made the connection (see - /// `DashConnectDataSource.disconnect`): an App Connect connection has the - /// app's keys turned off on the identity and its row removed; a two-QR - /// connection is downgraded to `.approved` locally and the app keeps its - /// keys. + /// Always reads as on: only the off direction is reachable from here. + /// Turning it off turns the app's keys off on the identity and removes + /// the row (see `DashConnectDataSource.disconnect`). private var activeSwitch: some View { ZStack { SwitchView(isOn: .constant(true)) @@ -122,8 +104,6 @@ struct ConnectionRow: View { status: status, updatedAt: Date(timeIntervalSince1970: 1_754_232_520) ), - onPrimaryAction: {}, - onMockScan: {}, onDisconnect: {} ) } diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionStatusBadge.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionStatusBadge.swift index 5be4c8e719..3a0980161e 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionStatusBadge.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionStatusBadge.swift @@ -53,17 +53,14 @@ struct ConnectionStatusBadge: View { } } - /// Green only once the connection is live; `approved` (waiting for the - /// next scan) and `confirming` (waiting for the network) read as neutral - /// blue. + /// Green only once the connection is live; `confirming` (waiting for the + /// network) reads as neutral blue. private var dotColor: Color { status == .active ? Color.dash.green : Color.dash.blue } private var title: String { switch status { - case .approved: - return NSLocalizedString("Approved", comment: "DashConnect") case .confirming: return NSLocalizedString("Confirming", comment: "DashConnect: an approval whose identity update may still land") case .active: diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionsList.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionsList.swift index 2fbfea899d..81f10ea7c0 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionsList.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionsList.swift @@ -20,12 +20,10 @@ import DashUIKit import SwiftUI -/// The populated state: every connection stacked in one card. Rows carry their -/// own status-specific content, so this only owns the card chrome and scroll. +/// The populated state: every connection stacked in one card. This owns the +/// card chrome and scroll. struct ConnectionsList: View { let connections: [DAppConnection] - let onScanQR: () -> Void - let onMockScan: () -> Void let onDisconnect: (DAppConnection) -> Void var body: some View { @@ -34,8 +32,6 @@ struct ConnectionsList: View { ForEach(connections) { connection in ConnectionRow( connection: connection, - onPrimaryAction: onScanQR, - onMockScan: onMockScan, onDisconnect: { onDisconnect(connection) } ) } @@ -56,8 +52,6 @@ struct ConnectionsList: View { updatedAt: Date() ) }, - onScanQR: {}, - onMockScan: {}, onDisconnect: { _ in } ) .padding(20) diff --git a/DashWallet/Sources/UI/DashConnect/Components/ScanToCompleteBanner.swift b/DashWallet/Sources/UI/DashConnect/Components/ScanToCompleteBanner.swift deleted file mode 100644 index b430344e39..0000000000 --- a/DashWallet/Sources/UI/DashConnect/Components/ScanToCompleteBanner.swift +++ /dev/null @@ -1,63 +0,0 @@ -// -// ScanToCompleteBanner.swift -// DashWallet -// -// Copyright © 2026 Dash Core Group. All rights reserved. -// -// Licensed under the MIT License (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://opensource.org/licenses/MIT -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import DashUIKit -import SwiftUI - -/// Prompt attached to an approved connection: approval alone does not log the -/// user in, and the same button accepts either the follow-up `dash-st:` QR or -/// a fresh `dash-key:` QR for the same app. -struct ScanToCompleteBanner: View { - let onScanQR: () -> Void - let onMockScan: () -> Void - - var body: some View { - HStack(alignment: .top, spacing: 10) { - HStack(alignment: .center, spacing: 0) { - DashIcon.SystemMessage.infoRectSmall.image - .resizable() - .scaledToFit() - .frame(width: 24, height: 24) - } - .frame(width: 30, height: 30, alignment: .center) - - HStack(alignment: .top, spacing: 20) { - Text( - NSLocalizedString("Scan the QR code to complete the login process", comment: "DashConnect") - ) - .dashFont(.subhead) - .foregroundColor(Color.dash.primaryText) - .frame(maxWidth: .infinity, alignment: .leading) - - ScanQRButton(size: .small, onScanQR: onScanQR, onMockScan: onMockScan) - } - .padding(.vertical, 5) - } - .padding(10) - .frame(maxWidth: .infinity, alignment: .topLeading) - .background(Color.dash.blueAlpha5) - .cornerRadius(20) - } -} - -#Preview { - ScanToCompleteBanner(onScanQR: {}, onMockScan: {}) - .padding() - .background(Color.primaryBackground) -} diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 16757b021b..47e0a34256 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -110,8 +110,6 @@ struct ConnectionsScreen: View { } else { ConnectionsList( connections: viewModel.connections, - onScanQR: showScanner, - onMockScan: mockScan, onDisconnect: viewModel.disconnect ) .padding(.horizontal, 20) @@ -218,17 +216,11 @@ struct ConnectionsScreen: View { ) } -#Preview("Approved") { +#Preview("Confirming") { ConnectionsScreen( vc: UINavigationController(), viewModel: ConnectionsViewModel( - dataSource: MockDashConnectDataSource(initial: [.init( - id: MockDashConnectDataSource.sample(.approved).id, - name: MockDashConnectDataSource.sample(.approved).name, - url: MockDashConnectDataSource.sample(.approved).url, - status: .approved, - updatedAt: MockDashConnectDataSource.sample(.approved).updatedAt - )]), + dataSource: MockDashConnectDataSource(initial: [MockDashConnectDataSource.sample(.confirming)]), featureUnavailable: false ) ) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 7b62fd9fbc..3e5898746f 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -101,8 +101,8 @@ final class ConnectionsViewModel: ObservableObject { private var requestGeneration = 0 /// Whether a request is mid-flight. A newer request may supersede one that - /// is still resolving, but nothing may interrupt an approval or a key - /// registration, which are already committing to the network. + /// is still resolving, but nothing may interrupt an approval, which is + /// already committing to the network. private var isResolvingRequest = false init( @@ -194,11 +194,6 @@ final class ConnectionsViewModel: ObservableObject { defer { isProcessingStateTransition = false } switch try await dataSource.handleStateTransition(request) { - case .keyRegistrationCompleted: - message = ConnectionsScreenMessage( - kind: .success, - text: NSLocalizedString("DashConnect key registration completed.", comment: "DashConnect") - ) case let .tokenPurchaseApprovalRequired(purchase): pendingTokenPurchase = purchase } diff --git a/DashWallet/Sources/UI/Menu/Settings/DevnetSettingsScreen.swift b/DashWallet/Sources/UI/Menu/Settings/DevnetSettingsScreen.swift index 6651179536..8313d47454 100644 --- a/DashWallet/Sources/UI/Menu/Settings/DevnetSettingsScreen.swift +++ b/DashWallet/Sources/UI/Menu/Settings/DevnetSettingsScreen.swift @@ -23,7 +23,7 @@ import UIKit // MARK: - DevnetSettingsViewModel -/// Settings → Devnet Settings. Edits the three user-editable devnet values +/// Settings → Devnet Settings. Edits the two user-editable devnet values /// (`DevnetConfiguration`) and, when the wallet is already running on /// devnet, restarts the runtime so a changed quorum URL / devnet name takes /// effect immediately (the SDK reads them only at build/SPV-start time). @@ -31,7 +31,6 @@ import UIKit final class DevnetSettingsViewModel: ObservableObject { @Published var quorumURL: String @Published var devnetName: String - @Published var dashConnectContractId: String @Published var statusMessage: String? /// Why the typed devnet name was refused, shown under the field. Nil /// while the name is usable — including while it is empty, which is how @@ -53,7 +52,6 @@ final class DevnetSettingsViewModel: ObservableObject { let name = DevnetConfiguration.devnetName ?? "" quorumURL = quorum devnetName = name - dashConnectContractId = DevnetConfiguration.dashConnectContractId ?? "" initialQuorumURL = quorum initialDevnetName = name } @@ -71,7 +69,6 @@ final class DevnetSettingsViewModel: ObservableObject { devnetNameError = nil let newQuorumURL = quorumURL.trimmingCharacters(in: .whitespacesAndNewlines) - let newContractId = dashConnectContractId.trimmingCharacters(in: .whitespacesAndNewlines) let networkValuesChanged = newQuorumURL != initialQuorumURL || trimmedName != initialDevnetName let willBeConfigured = !newQuorumURL.isEmpty && !trimmedName.isEmpty @@ -87,8 +84,6 @@ final class DevnetSettingsViewModel: ObservableObject { "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set.", comment: "Devnet") } else if !networkValuesChanged { - // The contract id is read per DashConnect approval; no runtime - // restart is needed for it. statusMessage = NSLocalizedString("Saved.", comment: "Devnet") } else { statusMessage = NSLocalizedString( @@ -113,7 +108,6 @@ final class DevnetSettingsViewModel: ObservableObject { ) { DevnetConfiguration.setQuorumURL(newQuorumURL) DevnetConfiguration.setDevnetName(trimmedName) - DevnetConfiguration.setDashConnectContractId(newContractId) } self?.isApplying = false } @@ -165,15 +159,6 @@ struct DevnetSettingsScreen: View { comment: "Devnet"), error: viewModel.devnetNameError) - field( - title: NSLocalizedString("DashConnect Contract ID", comment: "Devnet"), - placeholder: NSLocalizedString("Base58 identifier (optional)", comment: "Devnet"), - text: $viewModel.dashConnectContractId, - keyboard: .default, - helper: NSLocalizedString( - "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise.", - comment: "Devnet")) - DashButton( text: NSLocalizedString("Save", comment: ""), style: .filled, diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 535c40a9ed..0c408e60a2 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 0826135ca6..3e38104895 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 17495379b6..cd5ee99858 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 3f9800214e..4cdb9c49e4 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 966f2638c2..54d2ee1948 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 43525d617e..14eb5a1fd2 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index efb710a39d..329936d7ee 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index c2a26e1e1c..15942cf50f 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -188,14 +188,10 @@ /* Devnet */ "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -/* Devnet */ -"Base58 identifier (optional)" = "Base58 identifier (optional)"; /* DashConnect token purchase */ "Contract %@" = "Contract %@"; -/* Devnet */ -"DashConnect Contract ID" = "DashConnect Contract ID"; /* DashConnect */ "Deny" = "Deny"; @@ -248,8 +244,6 @@ /* DashPay Notifications */ "Search notifications" = "Search notifications"; -/* DashConnect */ -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; /* Devnet */ "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; @@ -260,8 +254,6 @@ /* Devnet */ "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -/* Devnet */ -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; /* DashConnect token purchase */ "The purchase was submitted but its result is unknown: %@. Check this identity's tokens and credit balance before buying again — approving a second time would pay twice." = "The purchase was submitted but its result is unknown: %@. Check this identity's tokens and credit balance before buying again — approving a second time would pay twice."; @@ -6111,6 +6103,9 @@ "App contract" = "App contract"; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6120,8 +6115,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6259,7 +6252,6 @@ "Another wallet operation is already in progress." = "Another wallet operation is already in progress."; "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; -"Approved" = "Approved"; "Authentication failed." = "Authentication failed."; "Awards each username to the only person who requested it. Available because every selected name has a single requester." = "Awards each username to the only person who requested it. Available because every selected name has a single requester."; "Blocked – %@" = "Blocked – %@"; @@ -6296,7 +6288,6 @@ "Create instant username" = "Create instant username"; "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deposit address is missing. Please refresh and try again." = "Deposit address is missing. Please refresh and try again."; @@ -6393,9 +6384,7 @@ "Reset Wallet is unavailable while multiple wallets are stored. Open Wallets and remove each wallet individually using its recovery phrase." = "Reset Wallet is unavailable while multiple wallets are stored. Open Wallets and remove each wallet individually using its recovery phrase."; "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; -"Same permissions as before" = "Same permissions as before"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "See details" = "See details"; "See your username" = "See your username"; "Select nodes" = "Select nodes"; @@ -6522,7 +6511,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 2d09a2402b..037b94f23a 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 0147d6b5ce..88fa992c04 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index f847ce4653..ea62ba86fe 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index a6a6d12997..3e0fff1d85 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 53c8dd7ddc..3d43358a4c 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index db2be784a1..f5b701555c 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 0d3fffee58..079d0cadd8 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 53be6d82e8..8430867f06 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index c71b686514..6f755cc05b 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 5ed9450ea7..4a80953718 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index f34ec3f078..b0bce8b2d8 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 322aee1c0f..66f29aaf41 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 1314e8cd97..e69dca032c 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 59952e44ec..2067afdb0b 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index b822b88e86..ee3570e4ff 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index b3075b78ad..710ad9f27b 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 6dbd2b724e..42d9d5f901 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index ad14444bcf..65868915be 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 883ac963ed..6afa6e9095 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 161287742b..ad2ec11273 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 8297803ec3..3da335958e 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 54f8ce3738..f87ce5e633 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 18241d761c..8b05269561 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 1042ed20ec..0b97c20a76 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 57627c8954..b98bb06760 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index d4aa9ee62a..7711c80074 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 452919fc30..8781b30d3e 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index bbf1cd097c..fc39e058db 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 7aaec1b600..d6d08422f7 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 9fe02cf9a0..2244f0d3bd 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 1ecd5e15ab..eee300f958 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index cffd04b014..522c1657fa 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 9d4569db67..f8de54a708 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6223,8 +6226,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6361,7 +6362,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6371,7 +6371,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6418,8 +6417,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6574,14 +6571,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6618,10 +6613,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6747,7 +6740,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 1500911dda..ceeaa7dbc5 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 22ee428be9..bc41738446 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect App Connect v1 */ +"This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; + /* DashConnect: an approval whose identity update may still land */ "Confirming" = "Confirming"; @@ -6221,8 +6224,6 @@ /* DashConnect */ "Turn them off" = "Turn them off"; -/* DashConnect App Connect v1 */ -"This app uses an older sign-in that this network no longer takes. Ask the app for a new code." = "This app uses an older sign-in that this network no longer takes. Ask the app for a new code."; /* DashConnect App Connect v2 */ "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again." = "This app's earlier sign-ins left more keys than one approval can replace. Disconnect the app, then sign in again."; @@ -6359,7 +6360,6 @@ "Any username that has a number 2–9 or 20 or more characters will be automatically approved" = "Any username that has a number 2–9 or 20 or more characters will be automatically approved"; "Approve connection to %@?" = "Approve connection to %@?"; "Approve token purchase?" = "Approve token purchase?"; -"Approved" = "Approved"; "Approving pays the total price from this identity's Platform credits." = "Approving pays the total price from this identity's Platform credits."; "Authentication failed." = "Authentication failed."; "Available on test networks only" = "Available on test networks only"; @@ -6369,7 +6369,6 @@ "Balance unavailable" = "Balance unavailable"; "Balance:" = "Balance:"; "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry." = "Base URL of the devnet's quorum-list server. SPV peers and Platform (DAPI) nodes are both auto-discovered from {Quorum URL}/masternodes — no manual peer entry."; -"Base58 identifier (optional)" = "Base58 identifier (optional)"; "Blocked – %@" = "Blocked – %@"; "Broadcast" = "Broadcast"; "Broadcasting…" = "Broadcasting…"; @@ -6416,8 +6415,6 @@ "Create username" = "Create username"; "Creating wallet…" = "Creating wallet…"; "Creating – %@" = "Creating – %@"; -"DashConnect Contract ID" = "DashConnect Contract ID"; -"DashConnect key registration completed." = "DashConnect key registration completed."; "DashConnect login is not yet available on mainnet" = "DashConnect login is not yet available on mainnet"; "Deleting Wallet…" = "Deleting Wallet…"; "Deny" = "Deny"; @@ -6572,14 +6569,12 @@ "Results on %@" = "Results on %@"; "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset." = "Resync armed from height %u. Fully close the app, then launch it again to start. The in-app Restart button does not apply this reset."; "Review transaction first" = "Review transaction first"; -"Same permissions as before" = "Same permissions as before"; "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set." = "Saved, but Devnet needs both a Quorum URL and a Devnet Name — syncing will fail until both are set."; "Saved." = "Saved."; "Saved. Devnet is reconnecting with the new settings." = "Saved. Devnet is reconnecting with the new settings."; "Saved. The values apply when you switch to Devnet." = "Saved. The values apply when you switch to Devnet."; "Scan Dash QR" = "Scan Dash QR"; "Scan invitation QR" = "Scan invitation QR"; -"Scan the QR code to complete the login process" = "Scan the QR code to complete the login process"; "Search notifications" = "Search notifications"; "See details" = "See details"; "See your username" = "See your username"; @@ -6616,10 +6611,8 @@ "The Dash network will vote on this username." = "The Dash network will vote on this username."; "The Dash network will vote on this username. Results by %@." = "The Dash network will vote on this username. Results by %@."; "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history." = "The devnet chain name. It is embedded in the sync user agent (devnet.devnet-) — devnet nodes reject connections without it. Each devnet keeps its own chain state, so naming a different one does not reinterpret this one's history."; -"The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings." = "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings."; "The devnet name cannot contain a slash." = "The devnet name cannot contain a slash."; "The devnet name cannot contain spaces." = "The devnet name cannot contain spaces."; -"The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise." = "The loginKeyResponse data contract id registered on this devnet. Only needed for DashConnect logins; leave empty otherwise."; "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another." = "The masternode list doesn't carry an evonode's Platform P2P port, so it must be confirmed here. 26656 is the standard port — change it only if this node uses another."; "The masternode list hasn't synced yet. Wait for sync to finish and try again." = "The masternode list hasn't synced yet. Wait for sync to finish and try again."; "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes." = "The masternode should return to the valid list within a few blocks. Refresh its details in a few minutes."; @@ -6745,7 +6738,6 @@ "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event." = "Your identity needs an encryption and a decryption key so contact requests can be encrypted between you and other users. Enabling adds whichever of them are missing with a single network transaction. This is a one time event."; "Your Platform balance cannot currently cover the Shield transfer selection headroom." = "Your Platform balance cannot currently cover the Shield transfer selection headroom."; "Your previous payment was found. Continue to finish creating the identity and username without paying again." = "Your previous payment was found. Continue to finish creating the identity and username without paying again."; -"Your private keys" = "Your private keys"; "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted." = "Your requested username will be voted on for 2 weeks. For immediate contacts and payments, you can create a similar instant username.\nIf your original request is approved, it replaces the instant one, preserving contacts and history. If not, continue using the instant one uninterrupted."; "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes." = "Your restored wallet is completing its initial sync. Sending from your Transparent balance will be available once it finishes."; "Your Shielded balance changed. Close this confirmation and tap Max again." = "Your Shielded balance changed. Close this confirmation and tap Max again."; diff --git a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift index 4d2c28aeab..bf52086059 100644 --- a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift +++ b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift @@ -47,7 +47,7 @@ final class AppConnectProjectionTests: XCTestCase { ) -> Intent { Intent( id: UUID(), identityId: identity, appId: app, appLabel: "App", appUrl: "", requestHash: Data(repeating: 0xEE, count: 20), - connectionId: nil, keys: keys, sentEncryptionKeyIds: [], disables: [], + connectionId: nil, keys: keys, sentEncryptionKeyIds: [], approvedEncryption: [], disables: [], response: AppConnect.ResponseValues(appEphemeralPubKeyHash: "ee", walletEphemeralPubKey: "02", encryptedPayload: "00"), responseDocumentId: published ? Data(repeating: 0xDD, count: 32) : nil, responseRemoved: !published, createdAt: Date(timeIntervalSince1970: createdAt), closedAt: nil) } @@ -304,25 +304,23 @@ final class AppConnectProjectionTests: XCTestCase { // MARK: Rows - func testRowsFollowTheProjectionAndLeaveTwoQRRowsAlone() { - let twoQR = DAppConnection(id: "two-qr", name: "Old", url: "", status: .approved, updatedAt: Date(timeIntervalSince1970: 1)) + func testRowsFollowTheProjection() { let gone = DAppConnection( id: Self.otherApp.toBase58String(), name: "Gone", url: "", status: .active, - updatedAt: Date(timeIntervalSince1970: 1), loginKind: .oneQR) + updatedAt: Date(timeIntervalSince1970: 1)) let confirming = Self.intent([Self.authKey(10)]) let projection = AppConnect.project([Self.snapshot([])], intents: [confirming]) let rows = PlatformDashConnectDataSource.rows( - [twoQR, gone], after: projection, intents: [], at: Date(timeIntervalSince1970: 2)) - XCTAssertEqual(rows.map(\.id), ["two-qr", Self.app.toBase58String()]) + [gone], after: projection, intents: [], at: Date(timeIntervalSince1970: 2)) + XCTAssertEqual(rows.map(\.id), [Self.app.toBase58String()]) XCTAssertEqual(rows.last?.status, .confirming) XCTAssertEqual(rows.last?.name, "App") - XCTAssertEqual(rows.last?.loginKind, .oneQR) } func testAnAppConnectRowHeldByAnotherIdentityStays() { let row = DAppConnection( id: Self.otherApp.toBase58String(), name: "Elsewhere", url: "", status: .active, - updatedAt: Date(timeIntervalSince1970: 1), loginKind: .oneQR) + updatedAt: Date(timeIntervalSince1970: 1)) let elsewhere = Self.intent([Self.authKey(10)], app: Self.otherApp, identity: Self.otherIdentity) let rows = PlatformDashConnectDataSource.rows( [row], after: AppConnect.project([Self.snapshot([])], intents: []), intents: [elsewhere], @@ -332,14 +330,18 @@ final class AppConnectProjectionTests: XCTestCase { // MARK: Retry - private static func plan(budget: UInt64? = 1000, expiresAt: UInt64 = now + 1000, critical: Bool = false) -> AppConnect.GrantPlan { + private static func plan( + budget: UInt64? = 1000, expiresAt: UInt64 = now + 1000, critical: Bool = false, + encryption: [AppConnectRequest.EncryptionBinding] = [] + ) -> AppConnect.GrantPlan { let binding = AppConnectRequest.AuthBinding( kind: .singleContract, securityLevel: critical ? .critical : .high, id: app, totalBudget: budget, expiresAt: expiresAt, documentTypeName: nil) return AppConnect.GrantPlan( appId: app, appEphemeralPubKeyHash: Data(repeating: 0xEE, count: 20), auth: [AppConnect.AuthGrant(bindingIndex: 0, binding: binding, totalBudget: budget, expiresAt: expiresAt)], - encryption: [], connectionId: nil, identityHint: nil, createdAt: 0, callbackHost: nil) + encryption: encryption.enumerated().map { AppConnect.EncryptionGrant(bindingIndex: $0.offset, binding: $0.element) }, + connectionId: nil, identityHint: nil, createdAt: 0, callbackHost: nil) } func testARetrySubmitsTheIntentOnlyWithinWhatIsApprovedNow() { @@ -349,6 +351,9 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertFalse(AppConnect.isWithinPlan(intent, Self.plan(expiresAt: Self.now + 10)), "it would outlive what is approved now") XCTAssertFalse(AppConnect.isWithinPlan(intent, Self.plan(budget: 500))) XCTAssertFalse(AppConnect.isWithinPlan(intent, Self.plan(critical: true))) + XCTAssertFalse( + AppConnect.isWithinPlan(intent, Self.plan(encryption: [.init(contractId: Self.app, purpose: .encryption)])), + "the response would carry slots other than the ones approved now") } // MARK: Fence @@ -376,23 +381,46 @@ final class AppConnectProjectionTests: XCTestCase { // MARK: Review fixes - func testATwoQRKeyIsNeverOfferedForTurningOff() { - let twoQR = Self.authKey(20) - let snapshot = Self.snapshot([Self.onPlatform(twoQR)]) - let projection = AppConnect.project([snapshot], intents: [], protected: [twoQR.data]) - XCTAssertTrue(projection.connections.isEmpty) - let plan = AppConnect.disconnectPlan( - appId: Self.app, snapshot: snapshot, intents: [], includeUnrecorded: true, protected: [twoQR.data]) - XCTAssertEqual(plan.disable, []) + func testAnUnrecordedKeyOnAContractSeveralAppsBindIsOfferedWithEachOfThem() { + let shared = Data(repeating: 0xC1, count: 32) + let mine = Self.intent([Self.authKey(10, bound: .singleContract(shared))]) + let theirs = Self.intent([Self.authKey(11, bound: .singleContract(shared))], app: Self.otherApp) + let stray = Self.onPlatform(Self.authKey(20, bound: .singleContract(shared))) + let snapshot = Self.snapshot([stray]) + let projection = AppConnect.project([snapshot], intents: [mine, theirs]) + for app in [Self.app, Self.otherApp] { + XCTAssertEqual(projection.connections.first { $0.appId == app }?.unrecordedKeyIds[Self.identity], [20]) + XCTAssertEqual( + AppConnect.disconnectPlan(appId: app, snapshot: snapshot, intents: [mine, theirs], includeUnrecorded: true).disable, + [20]) + } } - func testAContractSeveralAppsBindIsNoOneAppsForAnUnrecordedKey() { + func testAnUnrecordedKeyOnASharedContractGoesWithTheDisconnectOfAnyAppBindingIt() { let shared = Data(repeating: 0xC1, count: 32) let mine = Self.intent([Self.authKey(10, bound: .singleContract(shared))]) - let theirs = Self.intent([Self.authKey(11, bound: .singleContract(shared))], app: Self.otherApp) + var gone = Self.intent([Self.authKey(11, bound: .singleContract(shared))], app: Self.otherApp) + gone.closedAt = Date(timeIntervalSince1970: 5) let stray = Self.onPlatform(Self.authKey(20, bound: .singleContract(shared))) - let projection = AppConnect.project([Self.snapshot([stray])], intents: [mine, theirs]) - XCTAssertTrue(projection.connections.allSatisfy { $0.unrecordedKeyIds.isEmpty }, "no one app's: not offered") + let projection = AppConnect.project([Self.snapshot([stray])], intents: [mine, gone]) + for app in [Self.app, Self.otherApp] { + XCTAssertEqual(projection.connections.first { $0.appId == app }?.unrecordedKeyIds[Self.identity], [20]) + } + for app in [Self.app, Self.otherApp] { + XCTAssertEqual( + AppConnect.disconnectPlan(appId: app, snapshot: Self.snapshot([stray]), intents: [mine, gone], includeUnrecorded: true).disable, + [20], "a disconnect of either app turns it off") + } + } + + func testAnIntentWithNoRecordOfItsSlotsIsNeverResumed() throws { + let intent = Self.intent([Self.authKey(10)]) + let json = try JSONEncoder().encode(intent) + var object = try XCTUnwrap(JSONSerialization.jsonObject(with: json) as? [String: Any]) + object.removeValue(forKey: "approvedEncryption") + let older = try JSONDecoder().decode(Intent.self, from: JSONSerialization.data(withJSONObject: object)) + XCTAssertNil(older.approvedEncryption) + XCTAssertFalse(AppConnect.isWithinPlan(older, Self.plan())) } func testARetryCarriesOnOnlyWhileTheKeysAreLiveOrMayStillLand() { @@ -408,17 +436,49 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertFalse(AppConnect.mayResume(intent, in: Self.snapshot([Self.onPlatform(key)])), "the user disconnected it") } - func testProfileKeysAreOfferedOnlyWithAnAppThatWasGivenProfileAccess() { + func testAnIntentHasLandedOnlyOnceTheKeysItTurnsOffAreOff() { + let key = Self.authKey(10), earlier = Self.authKey(5) + var intent = Self.intent([key]) + intent = Intent( + id: intent.id, identityId: intent.identityId, appId: intent.appId, appLabel: intent.appLabel, + appUrl: intent.appUrl, requestHash: intent.requestHash, connectionId: nil, keys: intent.keys, + sentEncryptionKeyIds: [], approvedEncryption: [], disables: [5], response: intent.response, responseDocumentId: nil, + responseRemoved: true, createdAt: intent.createdAt, closedAt: nil) + let addedElsewhere = Self.snapshot([Self.onPlatform(key), Self.onPlatform(earlier)]) + XCTAssertFalse(AppConnect.hasLanded(intent, in: addedElsewhere), "the earlier key is still on") + XCTAssertEqual(AppConnect.outstandingDisables(of: intent, in: addedElsewhere), [5]) + XCTAssertTrue(AppConnect.hasLanded( + intent, in: Self.snapshot([Self.onPlatform(key), Self.onPlatform(earlier, disabledAt: 1)]))) + XCTAssertFalse(AppConnect.hasLanded(intent, in: Self.snapshot([Self.onPlatform(earlier, disabledAt: 1)]))) + } + + func testProfileKeysAreOfferedWithAnAppGivenProfileAccessOrOneWithNoRecord() { let profile = Self.intent([Self.authKey(10, bound: .documentType(contractId: Self.dashPay, name: "profile"))]) let plain = Self.intent([Self.authKey(11)], app: Self.otherApp) - XCTAssertTrue(AppConnect.usesProfileAccess([profile, plain], appId: Self.app)) - XCTAssertFalse(AppConnect.usesProfileAccess([profile, plain], appId: Self.otherApp)) + XCTAssertTrue(AppConnect.offersUnrecordedProfileKeys([profile, plain], appId: Self.app, identityId: Self.identity)) + XCTAssertFalse(AppConnect.offersUnrecordedProfileKeys([profile, plain], appId: Self.otherApp, identityId: Self.identity)) + XCTAssertTrue( + AppConnect.offersUnrecordedProfileKeys([profile, plain], appId: Self.appGroup, identityId: Self.identity), + "an app the wallet holds no record of, as after a restore") + XCTAssertTrue( + AppConnect.offersUnrecordedProfileKeys([profile, plain], appId: Self.app, identityId: Self.otherIdentity), + "no record of the app on that identity") + } + + func testAResponseIsResentOnlyWhileItsEncryptionKeysCanBeUsed() { + let added = Self.encryptionKey(12) + let intent = Self.intent([Self.authKey(10), added]) + XCTAssertTrue(AppConnect.encryptionKeysUsable(intent, in: Self.snapshot([])), "not landed yet") + XCTAssertTrue(AppConnect.encryptionKeysUsable(intent, in: Self.snapshot([Self.onPlatform(added)]))) + XCTAssertFalse( + AppConnect.encryptionKeysUsable(intent, in: Self.snapshot([Self.onPlatform(added, disabledAt: 1)])), + "an encryption key it adds was turned off") } func testARowAnotherIdentityHoldsStaysAfterThisOneDisconnected() { let row = DAppConnection( id: Self.app.toBase58String(), name: "App", url: "", status: .active, - updatedAt: Date(timeIntervalSince1970: 1), loginKind: .oneQR) + updatedAt: Date(timeIntervalSince1970: 1)) let closed = Self.intent([Self.authKey(10)]) let projection = AppConnect.project([Self.snapshot([Self.onPlatform(Self.authKey(10), disabledAt: 1)])], intents: [closed]) let elsewhere = Self.intent([Self.authKey(10)], identity: Self.otherIdentity) @@ -427,16 +487,6 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertEqual(rows, [row]) } - func testATwoQRRowStaysWhenTheAppsAppConnectApprovalsAreAllOff() { - let row = DAppConnection( - id: Self.app.toBase58String(), name: "App", url: "", status: .approved, updatedAt: Date(timeIntervalSince1970: 1)) - let closed = Self.intent([Self.authKey(10)]) - let projection = AppConnect.project([Self.snapshot([Self.onPlatform(Self.authKey(10), disabledAt: 1)])], intents: [closed]) - XCTAssertEqual( - PlatformDashConnectDataSource.rows([row], after: projection, intents: [], at: Date(timeIntervalSince1970: 2)), - [row]) - } - func testAFenceKeyCanSpendOneCreditAndNeverExpires() { let key = AppConnect.fenceKey(keyId: 7, publicKeyHash160: Data(repeating: 1, count: 20)) XCTAssertEqual(key.totalBudget, 1) @@ -467,21 +517,6 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertEqual(AppConnect.newKeyIds(count: 2, snapshot: Self.snapshot([last]), intents: []), [0, 1]) } - func testATwoQRRowComesBackWhenTheAppConnectSideEndsAndItsKeysAreLive() { - let id = Self.app.toBase58String() - let row = DAppConnection( - id: id, name: "App", url: "u", status: .active, updatedAt: Date(timeIntervalSince1970: 1), loginKind: .oneQR) - let closed = Self.intent([Self.authKey(10)]) - let projection = AppConnect.project( - [Self.snapshot([Self.onPlatform(Self.authKey(10), disabledAt: 1)])], intents: [closed]) - let rows = PlatformDashConnectDataSource.rows( - [row], after: projection, intents: [], twoQRApps: [id], at: Date(timeIntervalSince1970: 2)) - XCTAssertEqual(rows.map(\.loginKind), [.twoQR]) - XCTAssertEqual(rows.first?.name, "App") - XCTAssertEqual(PlatformDashConnectDataSource.rows( - [row], after: projection, intents: [], at: Date(timeIntervalSince1970: 2)), []) - } - // MARK: Third review round func testAnAppWhoseIntentsAreOnlyOnAnotherIdentityHasNoConnectionInThisRead() { diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 9510756a81..de98019f70 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -776,9 +776,8 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertEqual(AppConnect.Refusal(.invalid("label")).status, .invalid) } - func testOnlyAGrantPlanOrAKnownLoginCanBeApproved() throws { + func testOnlyAGrantPlanCanBeApproved() throws { XCTAssertTrue(AppConnect.Login.appConnect(try Self.vectorPlan()).isApprovable) - XCTAssertTrue(AppConnect.Login.twoQR.isApprovable) XCTAssertFalse(AppConnect.Login.unresolved.isApprovable) XCTAssertFalse(AppConnect.Login.refused(.init(.stale, "old")).isApprovable) } diff --git a/DashWalletTests/DashConnect/DashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/DashConnectDataSourceTests.swift index 27f03143ed..51bd3ba204 100644 --- a/DashWalletTests/DashConnect/DashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/DashConnectDataSourceTests.swift @@ -6,18 +6,15 @@ final class DashConnectDataSourceTests: XCTestCase { private let contractId = Data(repeating: 0xcd, count: 32) private let label = "Login to Yappr" - func testParseQRRoutesValidDashKeyUriToLoginRequest() async throws { + func testParseQRRefusesAVersion1DashKeyUri() async throws { let dataSource = MockDashConnectDataSource() + let uri = try validKeyUri() - let result = try await dataSource.parseQR(try validKeyUri()) - - guard case let .login(request) = result else { - return XCTFail("Expected a login request") + await XCTAssertThrowsErrorAsync({ + try await dataSource.parseQR(uri) + }) { error in + XCTAssertEqual(error as? AppConnect.Refusal, AppConnect.v1Refusal) } - - XCTAssertEqual(request.contractId, contractId) - XCTAssertEqual(request.label, label) - XCTAssertEqual(request.network, .testnet) } func testParseQRRoutesValidDashStUriToStateTransition() async throws { @@ -69,13 +66,11 @@ final class DashConnectDataSourceTests: XCTestCase { func testParseQRToleratesLeadingAndTrailingWhitespace() async throws { let dataSource = MockDashConnectDataSource() - let result = try await dataSource.parseQR(" \n\(try validKeyUri())\n\t ") + let result = try await dataSource.parseQR(" \n\(validStUri())\n\t ") - guard case let .login(request) = result else { - return XCTFail("Expected a login request") + guard case .stateTransition = result else { + return XCTFail("Expected a state transition request") } - - XCTAssertEqual(request.contractId, contractId) } func testHandleStateTransitionThrowsOnMock() async throws { @@ -100,8 +95,8 @@ final class DashConnectDataSourceTests: XCTestCase { XCTAssertEqual(request.existingConnection, existing) } - func testMakeConnectionRequestCarriesApprovedConnection() async { - let existing = MockDashConnectDataSource.sample(.approved) + func testMakeConnectionRequestCarriesAConfirmingConnection() async { + let existing = MockDashConnectDataSource.sample(.confirming) let dataSource = MockDashConnectDataSource(initial: [existing]) let request = await dataSource.makeConnectionRequest(from: MockDashConnectDataSource.sampleLoginRequest) @@ -114,10 +109,10 @@ final class DashConnectDataSourceTests: XCTestCase { // makes the assertion fail on any machine whose clock is set earlier. let initialDate = Date().addingTimeInterval(-60) let existing = DAppConnection( - id: MockDashConnectDataSource.sample(.approved).id, + id: MockDashConnectDataSource.sample(.confirming).id, name: "Yappr", url: "yap.pr", - status: .approved, + status: .confirming, updatedAt: initialDate ) let dataSource = MockDashConnectDataSource(initial: [existing]) diff --git a/DashWalletTests/DashConnect/DashConnectStoreTests.swift b/DashWalletTests/DashConnect/DashConnectStoreTests.swift index 8a4f33f933..7f7f938b4f 100644 --- a/DashWalletTests/DashConnect/DashConnectStoreTests.swift +++ b/DashWalletTests/DashConnect/DashConnectStoreTests.swift @@ -22,9 +22,9 @@ final class DashConnectStoreTests: XCTestCase { func testRoundTripPreservesConnections() { let store = makeStore(network: .testnet, walletIdHex: "wallet-a") let connections = [ - sampleConnection(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: .approved, updatedAt: Date(timeIntervalSince1970: 10)), + sampleConnection(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: .confirming, updatedAt: Date(timeIntervalSince1970: 10)), sampleConnection(id: "7W6u4NgW63FPUuW8EnTbYzD4KybNQD5n7CUDWydJY234", name: "DashGet", url: "dashget.app", status: .active, updatedAt: Date(timeIntervalSince1970: 20)), - sampleConnection(id: "AaC695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNgA9Z", name: "PayKit", url: "paykit.dev", status: .approved, updatedAt: Date(timeIntervalSince1970: 30)), + sampleConnection(id: "AaC695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNgA9Z", name: "PayKit", url: "paykit.dev", status: .confirming, updatedAt: Date(timeIntervalSince1970: 30)), ] store.save(connections) @@ -32,21 +32,6 @@ final class DashConnectStoreTests: XCTestCase { XCTAssertEqual(store.load(), connections) } - func testRoundTripKeepsWhichLoginMadeAConnection() { - let store = makeStore(network: .testnet, walletIdHex: "wallet-a") - var oneQR = sampleConnection( - id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: .active, - updatedAt: Date(timeIntervalSince1970: 10)) - oneQR.loginKind = .oneQR - let twoQR = sampleConnection( - id: "7W6u4NgW63FPUuW8EnTbYzD4KybNQD5n7CUDWydJY234", status: .active, - updatedAt: Date(timeIntervalSince1970: 20)) - - store.save([oneQR, twoQR]) - - XCTAssertEqual(store.load().map(\.loginKind), [.oneQR, .twoQR]) - } - func testUnknownStatusDropsOnlyThatRow() throws { let store = makeStore(network: .testnet, walletIdHex: "wallet-a") let payload: [[String: Any]] = [ @@ -54,7 +39,7 @@ final class DashConnectStoreTests: XCTestCase { "contractId": "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", "label": "Yappr", "url": "yap.pr", - "status": "approved", + "status": "confirming", "updatedAt": 1_773_132_300_000 ], [ @@ -70,10 +55,23 @@ final class DashConnectStoreTests: XCTestCase { XCTAssertEqual( store.load(), - [sampleConnection(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: .approved, updatedAt: Date(timeIntervalSince1970: 1_773_132_300))] + [sampleConnection(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: .confirming, updatedAt: Date(timeIntervalSince1970: 1_773_132_300))] ) } + func testARowOfTheRemovedApprovedStatusIsDroppedAndTheOthersKept() throws { + let store = makeStore(network: .testnet, walletIdHex: "wallet-a") + let payload: [[String: Any]] = [ + ["contractId": "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", "label": "Yappr", "url": "yap.pr", + "status": "approved", "updatedAt": 1_773_132_300_000], + ["contractId": "7W6u4NgW63FPUuW8EnTbYzD4KybNQD5n7CUDWydJY234", "label": "DashGet", "url": "dashget.app", + "status": "active", "updatedAt": 1_773_218_700_000], + ] + defaults.set(try JSONSerialization.data(withJSONObject: payload), forKey: try XCTUnwrap(store.storageKey)) + + XCTAssertEqual(store.load().map(\.id), ["7W6u4NgW63FPUuW8EnTbYzD4KybNQD5n7CUDWydJY234"]) + } + func testMalformedRowIsDropped() throws { let store = makeStore(network: .testnet, walletIdHex: "wallet-a") let payload: [[String: Any]] = [ @@ -81,13 +79,13 @@ final class DashConnectStoreTests: XCTestCase { "contractId": "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", "label": "Yappr", "url": "yap.pr", - "status": "approved", + "status": "confirming", "updatedAt": 1_773_132_300_000 ], [ "label": "Broken", "url": "broken.app", - "status": "approved", + "status": "confirming", "updatedAt": 1_773_132_300_000 ], ] @@ -120,7 +118,7 @@ final class DashConnectStoreTests: XCTestCase { func testSavingEmptyArrayClearsStore() throws { let store = makeStore(network: .testnet, walletIdHex: "wallet-a") - store.save([sampleConnection(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: .approved, updatedAt: Date(timeIntervalSince1970: 10))]) + store.save([sampleConnection(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: .confirming, updatedAt: Date(timeIntervalSince1970: 10))]) store.save([]) @@ -131,7 +129,7 @@ final class DashConnectStoreTests: XCTestCase { func testNetworksAreIsolated() throws { let testnetStore = makeStore(network: .testnet, walletIdHex: "wallet-a") let mainnetStore = makeStore(network: .mainnet, walletIdHex: "wallet-a") - let testnetConnection = sampleConnection(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: .approved, updatedAt: Date(timeIntervalSince1970: 10)) + let testnetConnection = sampleConnection(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: .confirming, updatedAt: Date(timeIntervalSince1970: 10)) let mainnetConnection = sampleConnection(id: "7W6u4NgW63FPUuW8EnTbYzD4KybNQD5n7CUDWydJY234", status: .active, updatedAt: Date(timeIntervalSince1970: 20)) testnetStore.save([testnetConnection]) @@ -147,7 +145,7 @@ final class DashConnectStoreTests: XCTestCase { func testWalletIdsAreIsolated() { let walletAStore = makeStore(network: .testnet, walletIdHex: "wallet-a") let walletBStore = makeStore(network: .testnet, walletIdHex: "wallet-b") - let walletAConnection = sampleConnection(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: .approved, updatedAt: Date(timeIntervalSince1970: 10)) + let walletAConnection = sampleConnection(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: .confirming, updatedAt: Date(timeIntervalSince1970: 10)) walletAStore.save([walletAConnection]) @@ -167,7 +165,7 @@ final class DashConnectStoreTests: XCTestCase { XCTAssertEqual(second.connectionsSnapshot.count, 1) XCTAssertEqual(second.connectionsSnapshot.first?.id, "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F") - XCTAssertEqual(second.connectionsSnapshot.first?.status, .approved) + XCTAssertEqual(second.connectionsSnapshot.first?.status, .active) } func testRemovePersistsAcrossFreshMockInstances() async throws { @@ -182,7 +180,7 @@ final class DashConnectStoreTests: XCTestCase { XCTAssertEqual(second.connectionsSnapshot, []) } - func testDisconnectPersistsApprovedStatusAcrossFreshMockInstances() async throws { + func testDisconnectRemovesTheRowAcrossFreshMockInstances() async throws { let store = makeStore(network: .testnet, walletIdHex: "wallet-a") let first = MockDashConnectDataSource( initial: [ @@ -198,9 +196,7 @@ final class DashConnectStoreTests: XCTestCase { try await first.disconnect(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", scope: nil, includingUnrecorded: false) let second = MockDashConnectDataSource(store: store) - XCTAssertEqual(second.connectionsSnapshot.count, 1) - XCTAssertEqual(second.connectionsSnapshot.first?.id, "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F") - XCTAssertEqual(second.connectionsSnapshot.first?.status, .approved) + XCTAssertEqual(second.connectionsSnapshot, []) } func testMainnetAndTestnetKeysAreUnchanged() { @@ -215,7 +211,7 @@ final class DashConnectStoreTests: XCTestCase { let devnetB = makeStore(network: .devnet, walletIdHex: "wallet-a", devnetName: "paloma") let connection = sampleConnection( id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", - status: .approved, + status: .confirming, updatedAt: Date(timeIntervalSince1970: 10)) devnetA.save([connection]) @@ -264,7 +260,7 @@ final class DashConnectStoreTests: XCTestCase { let store = makeStore(network: .devnet, walletIdHex: "wallet-a", devnetName: nil) store.save([sampleConnection( id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", - status: .approved, + status: .confirming, updatedAt: Date(timeIntervalSince1970: 10))]) XCTAssertNil(store.storageKey) diff --git a/DashWalletTests/DashConnect/KeyExchangeCryptoTests.swift b/DashWalletTests/DashConnect/KeyExchangeCryptoTests.swift index 97669c6d4f..5fb6b6105e 100644 --- a/DashWalletTests/DashConnect/KeyExchangeCryptoTests.swift +++ b/DashWalletTests/DashConnect/KeyExchangeCryptoTests.swift @@ -2,70 +2,6 @@ import XCTest @testable import dashpay final class KeyExchangeCryptoTests: XCTestCase { - private let sharedX = Data(hex: "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f")! - private let loginKey = Data(hex: "202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f")! - private let identityId = Data(hex: "404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f")! - private let walletEphemeralPriv = Data(repeating: 0x01, count: 32) - private let appEphemeralPub = Data(hex: "031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f")! - private let fixedNonce = Data(hex: "101112131415161718191a1b")! - private let kotlinAppPrivateKey = Data(repeating: 0x01, count: 32) - private let kotlinWalletPrivateKey = Data(repeating: 0x02, count: 32) - private let kotlinIdentityId = Data(repeating: 0xab, count: 32) - private let kotlinContractId = Data(repeating: 0xcd, count: 32) - private let kotlinFixedNonce = Data((0 ..< 12).map(UInt8.init)) - private let kotlinLoginKey = Data((0 ..< 32).map { UInt8(($0 * 7 + 3) & 0xff) }) - - func testDeriveAesKeyMatchesVector() throws { - let derived = try KeyExchangeCrypto.deriveAesKey(sharedX: sharedX) - XCTAssertEqual(derived.hexEncodedString(), "0d14bc5a19d237e70d82bd357114307629c262c77fcde496d51dfeaa35d124c2") - } - - func testEncryptLoginKeyWithFixedNonceMatchesVector() throws { - let payload = try KeyExchangeCrypto.encryptLoginKey( - loginKey, - walletEphemeralPriv: walletEphemeralPriv, - appEphemeralPub: appEphemeralPub, - nonce: fixedNonce - ) - - XCTAssertEqual(payload.hexEncodedString(), "101112131415161718191a1b914189444d0fee69f81c2da90b6e1f451e003d9ef6196f231601d0dbd93c523969bcb8d144051b2b9badadb6e3a80fc8") - } - - func testEncryptDecryptLoginKeyRoundTrips() throws { - let payload = try KeyExchangeCrypto.encryptLoginKey( - loginKey, - walletEphemeralPriv: walletEphemeralPriv, - appEphemeralPub: appEphemeralPub - ) - let decrypted = try KeyExchangeCrypto.decryptLoginKey( - payload, - walletEphemeralPriv: walletEphemeralPriv, - appEphemeralPub: appEphemeralPub - ) - - XCTAssertEqual(decrypted, loginKey) - } - - func testPayloadHasExpectedLengthAndNoncePrefix() throws { - let payload = try KeyExchangeCrypto.encryptLoginKey( - loginKey, - walletEphemeralPriv: walletEphemeralPriv, - appEphemeralPub: appEphemeralPub, - nonce: fixedNonce - ) - - XCTAssertEqual(payload.count, 60) - XCTAssertEqual(payload.prefix(fixedNonce.count), fixedNonce) - } - - func testDerivedIdentityKeysMatchVectorsAndDifferByInfo() throws { - let auth = try KeyExchangeCrypto.deriveAuthPrivateKey(loginKey: loginKey, identityId: identityId) - let encryption = try KeyExchangeCrypto.deriveEncryptionPrivateKey(loginKey: loginKey, identityId: identityId) - - XCTAssertEqual(auth.hexEncodedString(), "8b37cb699757243ca057a2d691ab43f88479f7422729eee270327a327d0c2bdc") - XCTAssertEqual(encryption.hexEncodedString(), "3b658157640c41f675c6858794d4f184f55112c938715085470e056f2970cfa3") - XCTAssertNotEqual(auth, encryption) - } func testHash160MatchesKnownVector() throws { let input = Data(repeating: 0x00, count: 33) @@ -79,97 +15,6 @@ final class KeyExchangeCryptoTests: XCTestCase { XCTAssertEqual(hash.hexEncodedString(), "9bc4860bb936abf262d7a51f74b4304833fee3b2") } - func testKotlinAuthPrivateKeyVectorMatchesExpectedHex() throws { - let auth = try KeyExchangeCrypto.deriveAuthPrivateKey( - loginKey: kotlinLoginKey, - identityId: kotlinIdentityId - ) - - XCTAssertEqual(auth.hexEncodedString(), "e06ee7ae45f257741dab7379793c854829b67171af111238c664d9fd90603706") - } - - func testKotlinEncryptionPrivateKeyVectorMatchesExpectedHex() throws { - let encryption = try KeyExchangeCrypto.deriveEncryptionPrivateKey( - loginKey: kotlinLoginKey, - identityId: kotlinIdentityId - ) - - XCTAssertEqual(encryption.hexEncodedString(), "6879c11819d1a60026adae34c296e83d13d06559ad63da41d03c44b203a90f80") - } - - func testKotlinFixedNoncePayloadHasExpectedShapeAndRoundTrips() throws { - let appEphemeralPub = try Secp256k1.compressedPublicKey(privateKey: kotlinAppPrivateKey) - let payload = try KeyExchangeCrypto.encryptLoginKey( - kotlinLoginKey, - walletEphemeralPriv: kotlinWalletPrivateKey, - appEphemeralPub: appEphemeralPub, - nonce: kotlinFixedNonce - ) - let decrypted = try KeyExchangeCrypto.decryptLoginKey( - payload, - walletEphemeralPriv: kotlinWalletPrivateKey, - appEphemeralPub: appEphemeralPub - ) - - XCTAssertEqual(payload.count, 60) - XCTAssertEqual(payload.prefix(kotlinFixedNonce.count), kotlinFixedNonce) - XCTAssertEqual(decrypted, kotlinLoginKey) - XCTAssertEqual(kotlinContractId.count, 32) - } - - func testRejectsInvalidLoginKeyLength() { - XCTAssertThrowsError(try KeyExchangeCrypto.encryptLoginKey( - Data(repeating: 0x01, count: 31), - walletEphemeralPriv: walletEphemeralPriv, - appEphemeralPub: appEphemeralPub, - nonce: fixedNonce - )) - } - - func testRejectsInvalidNonceLength() { - XCTAssertThrowsError(try KeyExchangeCrypto.encryptLoginKey( - loginKey, - walletEphemeralPriv: walletEphemeralPriv, - appEphemeralPub: appEphemeralPub, - nonce: Data(repeating: 0x00, count: 11) - )) - } - - func testRejectsInvalidIdentityIdLength() { - XCTAssertThrowsError(try KeyExchangeCrypto.deriveAuthPrivateKey( - loginKey: loginKey, - identityId: Data(repeating: 0x00, count: 31) - )) - XCTAssertThrowsError(try KeyExchangeCrypto.deriveEncryptionPrivateKey( - loginKey: loginKey, - identityId: Data(repeating: 0x00, count: 31) - )) - } - - func testRejectsInvalidPayloadLength() { - XCTAssertThrowsError(try KeyExchangeCrypto.decryptLoginKey( - Data(repeating: 0x00, count: 59), - walletEphemeralPriv: walletEphemeralPriv, - appEphemeralPub: appEphemeralPub - )) - } - - func testTamperedTagFailsToDecrypt() throws { - var tampered = try KeyExchangeCrypto.encryptLoginKey( - loginKey, - walletEphemeralPriv: walletEphemeralPriv, - appEphemeralPub: appEphemeralPub, - nonce: fixedNonce - ) - tampered[tampered.index(before: tampered.endIndex)] ^= 0x01 - - XCTAssertThrowsError(try KeyExchangeCrypto.decryptLoginKey( - tampered, - walletEphemeralPriv: walletEphemeralPriv, - appEphemeralPub: appEphemeralPub - )) - } - // MARK: - App Connect v2 response /// Yappr's published vectors (`vendor/platform-auth/src/app-connect/vectors.json`). @@ -201,8 +46,6 @@ final class KeyExchangeCryptoTests: XCTestCase { privateKey: AppConnectVector.walletEphemeralPriv, publicKey: AppConnectVector.appEphemeralPub) XCTAssertEqual(try KeyExchangeCrypto.deriveAppConnectAesKey(sharedX: sharedX).hexEncodedString(), AppConnectVector.hkdfOutput) - // The legacy exchange derives another key from the same secret. - XCTAssertNotEqual(try KeyExchangeCrypto.deriveAesKey(sharedX: sharedX).hexEncodedString(), AppConnectVector.hkdfOutput) XCTAssertEqual( try KeyExchangeCrypto.appConnectAssociatedData( diff --git a/DashWalletTests/DashConnect/LoginKeyDerivationTests.swift b/DashWalletTests/DashConnect/LoginKeyDerivationTests.swift deleted file mode 100644 index a9b17a9623..0000000000 --- a/DashWalletTests/DashConnect/LoginKeyDerivationTests.swift +++ /dev/null @@ -1,82 +0,0 @@ -import XCTest -@testable import dashpay - -final class LoginKeyDerivationTests: XCTestCase { - private let chainKey = Data(hex: "606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f")! - private let identityId = Data(hex: "404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f")! - private let appContractId = Data(hex: "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f")! - - func testDefaultKeyIndexIsZero() { - XCTAssertEqual(LoginKeyDerivation.defaultKeyIndex, 0) - } - - func testDeriveLoginKeyMatchesVector() throws { - let loginKey = try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - - XCTAssertEqual(loginKey.hexEncodedString(), "0c6ee8098b3618e2cebe7a5fb4a5b3307eb84f410262489fedc386eca0cd882d") - } - - func testDeriveLoginKeyIsDeterministic() throws { - let first = try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - let second = try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - - XCTAssertEqual(first, second) - } - - func testDeriveLoginKeyChangesWhenAnyInputChanges() throws { - let baseline = try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - let differentChainKey = try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: Data(hex: "616162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f")!, - identityId: identityId, - appContractId: appContractId - ) - let differentIdentity = try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: chainKey, - identityId: Data(hex: "414142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f")!, - appContractId: appContractId - ) - let differentContract = try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: Data(hex: "818182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f")! - ) - - XCTAssertNotEqual(baseline, differentChainKey) - XCTAssertNotEqual(baseline, differentIdentity) - XCTAssertNotEqual(baseline, differentContract) - } - - func testRejectsInvalidLengths() { - XCTAssertThrowsError(try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: Data(repeating: 0x00, count: 31), - identityId: identityId, - appContractId: appContractId - )) - XCTAssertThrowsError(try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: chainKey, - identityId: Data(repeating: 0x00, count: 31), - appContractId: appContractId - )) - XCTAssertThrowsError(try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: Data(repeating: 0x00, count: 31) - )) - } -} diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index ff85b02804..b0827521f4 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -97,12 +97,12 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { XCTAssertEqual(request.appContractId, existing.id) } - func testMakeConnectionRequestCarriesApprovedConnection() async { + func testMakeConnectionRequestCarriesAConfirmingConnection() async { let existing = DAppConnection( id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", name: "Yappr", url: "yap.pr", - status: .approved, + status: .confirming, updatedAt: Date(timeIntervalSince1970: 1_773_132_300) ) let dataSource = PlatformDashConnectDataSource( @@ -121,6 +121,20 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { XCTAssertEqual(found, existing) } + func testAVersion1LoginQRIsRefusedWhenScanned() async { + let dataSource = PlatformDashConnectDataSource( + supportedNetwork: .testnet, + store: TestDashConnectStore(initialConnections: []), + activeWalletIdHex: { "wallet" } + ) + do { + _ = try await dataSource.parseQR(MockDashConnectDataSource.sampleLoginQRCode) + XCTFail("a v1 login QR was taken") + } catch { + XCTAssertEqual(error as? AppConnect.Refusal, AppConnect.v1Refusal) + } + } + func testMakeConnectionRequestReturnsNilForUnknownContract() async throws { let existing = DAppConnection( id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", @@ -146,76 +160,17 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { XCTAssertNil(connectionRequest.existingConnection) } - func testRealKeyRegistrationFixtureParsesWithNilContractBounds() throws { + func testParserRefusesAnIdentityUpdate() throws { let wallet = ManagedPlatformWallet(handle: 0, walletId: Data(repeating: 0x00, count: 32)) - let bytes = try XCTUnwrap(Data(hex: Self.realKeyRegistrationFixtureHex)) - let expectedIdentityId = try XCTUnwrap( - Data(hex: "89fd6ddba75136a4fea02dc7d89ef0ca5bcc32ccf12fb8da6a1a03740567ae72") - ) - let expectedAuthHash160 = try XCTUnwrap( - Data(hex: "5e24e38a86e720f61757647996957e322686abb7") - ) - let expectedEncryptionPublicKey = try XCTUnwrap( - Data(hex: "035e8cfb0785b54e8902a3dc17bdaad8a5738c6019a18ebc527f79d1c64a27826a") - ) - - let parsed = try wallet.parseIdentityUpdateTransition(bytes) - - XCTAssertEqual(parsed.identityId, expectedIdentityId) - XCTAssertEqual(parsed.disablePublicKeyIds, []) - XCTAssertEqual(parsed.addPublicKeys.count, 2) - - let authKey = parsed.addPublicKeys[0] - XCTAssertEqual(authKey.keyId, 6) - XCTAssertEqual(authKey.purpose, .authentication) - XCTAssertEqual(authKey.securityLevel, .high) - XCTAssertEqual(authKey.keyType, .ecdsaHash160) - XCTAssertNil(authKey.contractBounds) - XCTAssertEqual(authKey.pubkeyBytes, expectedAuthHash160) - - let encryptionKey = parsed.addPublicKeys[1] - XCTAssertEqual(encryptionKey.keyId, 7) - XCTAssertEqual(encryptionKey.purpose, .encryption) - XCTAssertEqual(encryptionKey.securityLevel, .medium) - XCTAssertEqual(encryptionKey.keyType, .ecdsaSecp256k1) - XCTAssertNil(encryptionKey.contractBounds) - XCTAssertEqual(encryptionKey.pubkeyBytes, expectedEncryptionPublicKey) - } - - func testPlatformWalletParserRoundTripsTaggedAndTaglessIdentityUpdateTransition() throws { - let wallet = ManagedPlatformWallet(handle: 0, walletId: Data(repeating: 0x00, count: 32)) - let taggedBytes = try XCTUnwrap(Data(base64Encoded: Self.taggedIdentityUpdateFixtureBase64)) - let taglessBytes = try XCTUnwrap(Data(base64Encoded: Self.taglessIdentityUpdateFixtureBase64)) - - let tagged = try wallet.parseIdentityUpdateTransition(taggedBytes) - let tagless = try wallet.parseIdentityUpdateTransition(taglessBytes) - - XCTAssertEqual(tagged.identityId, Data(repeating: 0x11, count: 32)) - XCTAssertEqual(tagged.addPublicKeys.map(\.keyId), [17, 18]) - XCTAssertEqual(tagged.disablePublicKeyIds, [4, 8]) - XCTAssertEqual(tagged.addPublicKeys[0].purpose, .authentication) - XCTAssertEqual(tagged.addPublicKeys[1].purpose, .encryption) - XCTAssertEqual( - tagged.addPublicKeys[1].contractBounds, - .singleContractDocumentType( - id: Data(repeating: 0x44, count: 32), - documentTypeName: "profile" - ) - ) - - XCTAssertEqual(tagless.identityId, tagged.identityId) - XCTAssertEqual(tagless.addPublicKeys.map(\.keyId), tagged.addPublicKeys.map(\.keyId)) - XCTAssertEqual(tagless.disablePublicKeyIds, tagged.disablePublicKeyIds) - + let bytes = try XCTUnwrap(Data(base64Encoded: Self.taggedIdentityUpdateFixtureBase64)) let appParser = PlatformWalletDashConnectStateTransitionParser { bytes in Self.parsed(.identityUpdate(try wallet.parseIdentityUpdateTransition(bytes))) } - guard case let .keyRegistration(appTransition) = try appParser.parse(taglessBytes) else { - return XCTFail("Expected a key-registration transition") + XCTAssertThrowsError(try appParser.parse(bytes)) { error in + guard case DashConnectPlatformError.unsupportedStateTransition = error else { + return XCTFail("Expected an unsupported state transition, got \(error)") + } } - XCTAssertEqual(appTransition.identityId, tagged.identityId) - XCTAssertEqual(appTransition.addPublicKeys.map(\.keyId), [17, 18]) - XCTAssertEqual(appTransition.disablePublicKeyIds, [4, 8]) } func testParserMapsATokenPurchaseTransition() throws { @@ -239,43 +194,6 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { XCTAssertEqual(purchase.totalAgreedPrice, 100_000_000) } - func testParserRejectsContractGroupKeysInsteadOfDroppingTheirRestriction() throws { - let parser = PlatformWalletDashConnectStateTransitionParser { _ in - Self.parsed(.identityUpdate(.init( - identityId: Data(repeating: 0x21, count: 32), - addPublicKeys: [.init( - keyId: 1, keyType: .ecdsaSecp256k1, purpose: .authentication, - securityLevel: .high, pubkeyBytes: Data(repeating: 0x22, count: 33), - contractBounds: .contractGroup(id: Data(repeating: 0x23, count: 32)))], - disablePublicKeyIds: []))) - } - XCTAssertThrowsError(try parser.parse(Data([0]))) { - XCTAssertEqual($0 as? DashConnectPlatformError, .keyRegistrationUnexpectedMutation) - } - } - - func testParserKeepsTheLimitsAScannedKeyRegistrationCarries() throws { - let parser = PlatformWalletDashConnectStateTransitionParser { _ in - Self.parsed(.identityUpdate(.init( - identityId: Data(repeating: 0x21, count: 32), - addPublicKeys: [ - .init( - keyId: 1, keyType: .ecdsaHash160, purpose: .authentication, - securityLevel: .high, pubkeyBytes: Data(repeating: 0x22, count: 20), - totalBudget: 7, expiresAt: 9), - .init( - keyId: 2, keyType: .ecdsaSecp256k1, purpose: .encryption, - securityLevel: .medium, pubkeyBytes: Data(repeating: 0x23, count: 33)), - ], - disablePublicKeyIds: []))) - } - guard case let .keyRegistration(transition) = try parser.parse(Data([0])) else { - return XCTFail("Expected a key-registration transition") - } - XCTAssertEqual(transition.addPublicKeys.map(\.totalBudget), [7, nil]) - XCTAssertEqual(transition.addPublicKeys.map(\.expiresAt), [9, nil]) - } - func testParserRefusesABatchThatIsNotALoneCompleteTokenPurchase() { let ownerId = Data(repeating: 0x21, count: 32) let contractId = Data(repeating: 0x22, count: 32) @@ -464,705 +382,6 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { XCTAssertEqual(request.tokenQuantity(locale: Self.enUS).text, "0.000000000000000001") } - func testBuildLoginKeyResponseDraftProducesExactFieldsAndWipesEphemeralPrivateKey() throws { - let loginKey = Data(repeating: 0x11, count: 32) - let appContractId = Data(repeating: 0xcd, count: 32) - let appEphemeralPubKey = try Secp256k1.compressedPublicKey(privateKey: Data(repeating: 0x01, count: 32)) - var walletEphemeralPrivateKey = Data(repeating: 0x02, count: 32) - let fixedPayload = Data(repeating: 0xaa, count: 60) - - let draft = try PlatformDashConnectDataSource.buildLoginKeyResponseDraft( - loginKey: loginKey, - appContractId: appContractId, - appEphemeralPubKey: appEphemeralPubKey, - walletEphemeralPrivateKey: &walletEphemeralPrivateKey, - encryptLoginKey: { loginKeyArg, walletPrivArg, appPubArg in - XCTAssertEqual(loginKeyArg, loginKey) - XCTAssertEqual(walletPrivArg, Data(repeating: 0x02, count: 32)) - XCTAssertEqual(appPubArg, appEphemeralPubKey) - return fixedPayload - } - ) - - XCTAssertEqual( - draft.properties["contractId"]?.base as? String, - appContractId.toBase58String() - ) - XCTAssertEqual( - draft.properties["appEphemeralPubKeyHash"]?.base as? String, - try KeyExchangeCrypto.hash160(appEphemeralPubKey).toHexString() - ) - XCTAssertEqual( - draft.properties["walletEphemeralPubKey"]?.base as? String, - try Secp256k1.compressedPublicKey(privateKey: Data(repeating: 0x02, count: 32)).toHexString() - ) - XCTAssertEqual( - draft.properties["encryptedPayload"]?.base as? String, - fixedPayload.toHexString() - ) - XCTAssertEqual(draft.properties["keyIndex"]?.base as? Int, LoginKeyDerivation.defaultKeyIndex) - XCTAssertEqual(draft.encryptedPayload.count, 60) - XCTAssertEqual(walletEphemeralPrivateKey, Data(repeating: 0x00, count: 32)) - } - - func testValidateKeyRegistrationRejectsTransitionForDifferentIdentity() throws { - let chainKey = Data(repeating: 0x22, count: 32) - let identityId = Data(repeating: 0x33, count: 32) - let appContractId = Data(repeating: 0x44, count: 32) - let transition = try makeValidTransition( - identityId: Data(repeating: 0x55, count: 32), - appContractId: appContractId, - chainKey: chainKey, - walletIdentityId: identityId - ) - - XCTAssertThrowsError( - try PlatformDashConnectDataSource.validateKeyRegistration( - transition, - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - ) { error in - guard let error = error as? DashConnectPlatformError, - case .keyRegistrationWrongIdentity = error else { - return XCTFail("Expected wrong identity error, got \(error)") - } - } - } - - func testValidateKeyRegistrationRejectsAttackerAddedKey() throws { - let chainKey = Data(repeating: 0x22, count: 32) - let identityId = Data(repeating: 0x33, count: 32) - let appContractId = Data(repeating: 0x44, count: 32) - var transition = try makeValidTransition( - identityId: identityId, - appContractId: appContractId, - chainKey: chainKey, - walletIdentityId: identityId - ) - - let attackerPublicKey = try Secp256k1.compressedPublicKey(privateKey: Data(repeating: 0x66, count: 32)) - transition = DashConnectKeyRegistrationTransition( - identityId: transition.identityId, - addPublicKeys: [ - DashConnectKeyRegistrationKey( - keyId: transition.addPublicKeys[0].keyId, - keyType: transition.addPublicKeys[0].keyType, - purpose: transition.addPublicKeys[0].purpose, - securityLevel: transition.addPublicKeys[0].securityLevel, - publicKeyData: try KeyExchangeCrypto.hash160(attackerPublicKey), - contractBounds: transition.addPublicKeys[0].contractBounds - ), - transition.addPublicKeys[1], - ], - disablePublicKeyIds: [] - ) - - XCTAssertThrowsError( - try PlatformDashConnectDataSource.validateKeyRegistration( - transition, - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - ) { error in - guard let error = error as? DashConnectPlatformError, - case .keyRegistrationMismatchedDerivedKey(.authentication) = error else { - return XCTFail("Expected mismatched authentication key error, got \(error)") - } - } - } - - func testValidateKeyRegistrationAcceptsNilContractBoundsWhenDerivedKeysMatch() throws { - let chainKey = Data(repeating: 0x22, count: 32) - let identityId = Data(repeating: 0x33, count: 32) - let appContractId = Data(repeating: 0x44, count: 32) - let transition = try makeValidTransition( - identityId: identityId, - appContractId: appContractId, - chainKey: chainKey, - walletIdentityId: identityId - ) - - let validated = try PlatformDashConnectDataSource.validateKeyRegistration( - transition, - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - - XCTAssertEqual(validated.authenticationKey, transition.addPublicKeys[0]) - XCTAssertEqual(validated.encryptionKey, transition.addPublicKeys[1]) - } - - func testValidateKeyRegistrationRejectsDerivedKeysForDifferentContract() throws { - let chainKey = Data(repeating: 0x22, count: 32) - let identityId = Data(repeating: 0x33, count: 32) - let transitionContractId = Data(repeating: 0x44, count: 32) - let actualContractId = Data(repeating: 0x55, count: 32) - let transition = try makeValidTransition( - identityId: identityId, - appContractId: transitionContractId, - chainKey: chainKey, - walletIdentityId: identityId - ) - - XCTAssertThrowsError( - try PlatformDashConnectDataSource.validateKeyRegistration( - transition, - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: actualContractId - ) - ) { error in - guard let error = error as? DashConnectPlatformError, - case .keyRegistrationMismatchedDerivedKey = error else { - return XCTFail("Expected mismatched derived key error, got \(error)") - } - } - } - - func testValidateKeyRegistrationRejectsAuthenticationKeyUsingRawSecp256k1Encoding() throws { - let chainKey = Data(repeating: 0x22, count: 32) - let identityId = Data(repeating: 0x33, count: 32) - let appContractId = Data(repeating: 0x44, count: 32) - var transition = try makeValidTransition( - identityId: identityId, - appContractId: appContractId, - chainKey: chainKey, - walletIdentityId: identityId - ) - - let loginKey = try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - let authPrivateKey = try KeyExchangeCrypto.deriveAuthPrivateKey(loginKey: loginKey, identityId: identityId) - let authPublicKey = try Secp256k1.compressedPublicKey(privateKey: authPrivateKey) - transition = DashConnectKeyRegistrationTransition( - identityId: transition.identityId, - addPublicKeys: [ - DashConnectKeyRegistrationKey( - keyId: transition.addPublicKeys[0].keyId, - keyType: .ecdsaSecp256k1, - purpose: .authentication, - securityLevel: .high, - publicKeyData: authPublicKey, - contractBounds: nil - ), - transition.addPublicKeys[1], - ], - disablePublicKeyIds: [] - ) - - XCTAssertThrowsError( - try PlatformDashConnectDataSource.validateKeyRegistration( - transition, - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - ) { error in - guard let error = error as? DashConnectPlatformError, - case .keyRegistrationMismatchedDerivedKey(.authentication) = error else { - return XCTFail("Expected authentication mismatch error, got \(error)") - } - } - } - - func testValidateKeyRegistrationRejectsAuthenticationKeyUsingRawPublicKeyData() throws { - let chainKey = Data(repeating: 0x22, count: 32) - let identityId = Data(repeating: 0x33, count: 32) - let appContractId = Data(repeating: 0x44, count: 32) - var transition = try makeValidTransition( - identityId: identityId, - appContractId: appContractId, - chainKey: chainKey, - walletIdentityId: identityId - ) - - let loginKey = try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - let authPrivateKey = try KeyExchangeCrypto.deriveAuthPrivateKey(loginKey: loginKey, identityId: identityId) - let authPublicKey = try Secp256k1.compressedPublicKey(privateKey: authPrivateKey) - transition = DashConnectKeyRegistrationTransition( - identityId: transition.identityId, - addPublicKeys: [ - DashConnectKeyRegistrationKey( - keyId: transition.addPublicKeys[0].keyId, - keyType: .ecdsaHash160, - purpose: .authentication, - securityLevel: .high, - publicKeyData: authPublicKey, - contractBounds: nil - ), - transition.addPublicKeys[1], - ], - disablePublicKeyIds: [] - ) - - XCTAssertThrowsError( - try PlatformDashConnectDataSource.validateKeyRegistration( - transition, - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - ) { error in - guard let error = error as? DashConnectPlatformError, - case .keyRegistrationMismatchedDerivedKey(.authentication) = error else { - return XCTFail("Expected authentication mismatch error, got \(error)") - } - } - } - - func testPendingApprovedConnectionThrowsWhenNothingAwaitsKeyRegistration() { - XCTAssertThrowsError( - try PlatformDashConnectDataSource.pendingApprovedConnectionForKeyRegistration( - in: [ - DAppConnection( - id: "A", - name: "Active App", - url: "active.app", - status: .active, - updatedAt: Date(timeIntervalSince1970: 10) - ), - DAppConnection( - id: "B", - name: "Another Active App", - url: "active-two.app", - status: .active, - updatedAt: Date(timeIntervalSince1970: 20) - ), - ], - boundContractId: nil - ) - ) { error in - XCTAssertEqual(error as? DashConnectPlatformError, .noApprovedConnectionAwaitingKeyRegistration) - } - } - - func testPendingApprovedConnectionErrorTellsUserToScanLoginQrFirst() { - XCTAssertThrowsError( - try PlatformDashConnectDataSource.pendingApprovedConnectionForKeyRegistration(in: [], boundContractId: nil) - ) { error in - XCTAssertEqual( - error.localizedDescription, - "There is no login awaiting key registration — scan the app's login QR first." - ) - } - } - - private static let appAId = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" - private static let appBId = "7W6u4NgW63FPUuW8EnTbYzD4KybNQD5n7CUDWydJY234" - - private func approvedPair() -> (appA: DAppConnection, appB: DAppConnection, active: DAppConnection) { - ( - DAppConnection( - id: Self.appAId, - name: "App A", - url: "a.app", - status: .approved, - updatedAt: Date(timeIntervalSince1970: 10) - ), - DAppConnection( - id: Self.appBId, - name: "App B", - url: "b.app", - status: .approved, - // Approved after A, so recency alone would always pick B. - updatedAt: Date(timeIntervalSince1970: 30) - ), - DAppConnection( - id: "active", - name: "Active", - url: "active.app", - status: .active, - updatedAt: Date(timeIntervalSince1970: 40) - ) - ) - } - - /// Scanning app A's transition while app B is the newer approval used to - /// derive B's keys and reject A. The contract bounds name A, so A wins. - func testPendingApprovedConnectionFollowsContractBoundsNotRecency() throws { - let (appA, appB, active) = approvedPair() - let boundToA = try XCTUnwrap(Data.identifier(fromBase58: Self.appAId)) - - let selected = try PlatformDashConnectDataSource.pendingApprovedConnectionForKeyRegistration( - in: [appA, active, appB], - boundContractId: boundToA - ) - - XCTAssertEqual(selected, appA) - } - - func testPendingApprovedConnectionRejectsBoundsMatchingNoApprovedConnection() throws { - let (appA, appB, _) = approvedPair() - let unrelated = Data(repeating: 0x77, count: 32) - - XCTAssertThrowsError( - try PlatformDashConnectDataSource.pendingApprovedConnectionForKeyRegistration( - in: [appA, appB], - boundContractId: unrelated - ) - ) { error in - XCTAssertEqual(error as? DashConnectPlatformError, .noApprovedConnectionAwaitingKeyRegistration) - } - } - - /// An unbounded transition identifies no app, so with two approvals there is - /// nothing to choose on — guessing is what produced the wrong-key failure. - func testPendingApprovedConnectionRejectsAmbiguousUnboundedTransition() throws { - let (appA, appB, active) = approvedPair() - - XCTAssertThrowsError( - try PlatformDashConnectDataSource.pendingApprovedConnectionForKeyRegistration( - in: [appA, active, appB], - boundContractId: nil - ) - ) { error in - XCTAssertEqual(error as? DashConnectPlatformError, .ambiguousKeyRegistrationConnection) - } - } - - func testPendingApprovedConnectionTakesTheOnlyApprovalWhenUnbounded() throws { - let (appA, _, active) = approvedPair() - - let selected = try PlatformDashConnectDataSource.pendingApprovedConnectionForKeyRegistration( - in: [appA, active], - boundContractId: nil - ) - - XCTAssertEqual(selected, appA) - } - - func testMissingKeyRegistrationKeysReturnsEmptyWhenBothKeysAlreadyRegistered() throws { - let chainKey = Data(repeating: 0x22, count: 32) - let identityId = Data(repeating: 0x33, count: 32) - let appContractId = Data(repeating: 0x44, count: 32) - let transition = try makeValidTransition( - identityId: identityId, - appContractId: appContractId, - chainKey: chainKey, - walletIdentityId: identityId - ) - let validated = try PlatformDashConnectDataSource.validateKeyRegistration( - transition, - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - - let currentKeys = [ - makeIdentityPublicKeyInfo( - keyId: 100, - purpose: .authentication, - securityLevel: .high, - keyType: .ecdsaHash160, - data: validated.authenticationKey.publicKeyData - ), - makeIdentityPublicKeyInfo( - keyId: 101, - purpose: .encryption, - securityLevel: .medium, - keyType: .ecdsaSecp256k1, - data: validated.encryptionKey.publicKeyData - ), - ] - - XCTAssertEqual( - PlatformDashConnectDataSource.missingKeyRegistrationKeys( - validated, - currentIdentityPublicKeys: currentKeys - ), - [] - ) - } - - func testHasRegisteredLoginKeysReturnsTrueWhenBothKeysAreRegistered() throws { - let chainKey = Data(repeating: 0x22, count: 32) - let identityId = Data(repeating: 0x33, count: 32) - let appContractId = Data(repeating: 0x44, count: 32) - let transition = try makeValidTransition( - identityId: identityId, - appContractId: appContractId, - chainKey: chainKey, - walletIdentityId: identityId - ) - let validated = try PlatformDashConnectDataSource.validateKeyRegistration( - transition, - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - - let currentKeys = [ - makeIdentityPublicKeyInfo( - keyId: 100, - purpose: .authentication, - securityLevel: .high, - keyType: .ecdsaHash160, - data: validated.authenticationKey.publicKeyData - ), - makeIdentityPublicKeyInfo( - keyId: 101, - purpose: .encryption, - securityLevel: .medium, - keyType: .ecdsaSecp256k1, - data: validated.encryptionKey.publicKeyData - ), - ] - - XCTAssertTrue( - PlatformDashConnectDataSource.hasRegisteredLoginKeys( - authenticationPublicKeyHash160: validated.authenticationKey.publicKeyData, - encryptionPublicKey: validated.encryptionKey.publicKeyData, - currentIdentityPublicKeys: currentKeys - ) - ) - } - - func testMissingKeyRegistrationKeysReturnsOnlyMissingEncryptionKey() throws { - let chainKey = Data(repeating: 0x22, count: 32) - let identityId = Data(repeating: 0x33, count: 32) - let appContractId = Data(repeating: 0x44, count: 32) - let transition = try makeValidTransition( - identityId: identityId, - appContractId: appContractId, - chainKey: chainKey, - walletIdentityId: identityId - ) - let validated = try PlatformDashConnectDataSource.validateKeyRegistration( - transition, - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - - let currentKeys = [ - makeIdentityPublicKeyInfo( - keyId: 100, - purpose: .authentication, - securityLevel: .high, - keyType: .ecdsaHash160, - data: validated.authenticationKey.publicKeyData - ) - ] - - XCTAssertEqual( - PlatformDashConnectDataSource.missingKeyRegistrationKeys( - validated, - currentIdentityPublicKeys: currentKeys - ), - [validated.encryptionKey] - ) - } - - func testHasRegisteredLoginKeysReturnsFalseWhenAuthenticationKeyIsMissing() throws { - let chainKey = Data(repeating: 0x22, count: 32) - let identityId = Data(repeating: 0x33, count: 32) - let appContractId = Data(repeating: 0x44, count: 32) - let transition = try makeValidTransition( - identityId: identityId, - appContractId: appContractId, - chainKey: chainKey, - walletIdentityId: identityId - ) - let validated = try PlatformDashConnectDataSource.validateKeyRegistration( - transition, - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - - let currentKeys = [ - makeIdentityPublicKeyInfo( - keyId: 101, - purpose: .encryption, - securityLevel: .medium, - keyType: .ecdsaSecp256k1, - data: validated.encryptionKey.publicKeyData - ), - ] - - XCTAssertFalse( - PlatformDashConnectDataSource.hasRegisteredLoginKeys( - authenticationPublicKeyHash160: validated.authenticationKey.publicKeyData, - encryptionPublicKey: validated.encryptionKey.publicKeyData, - currentIdentityPublicKeys: currentKeys - ) - ) - } - - func testMissingKeyRegistrationKeysTreatsDisabledMatchingKeyAsMissing() throws { - let chainKey = Data(repeating: 0x22, count: 32) - let identityId = Data(repeating: 0x33, count: 32) - let appContractId = Data(repeating: 0x44, count: 32) - let transition = try makeValidTransition( - identityId: identityId, - appContractId: appContractId, - chainKey: chainKey, - walletIdentityId: identityId - ) - let validated = try PlatformDashConnectDataSource.validateKeyRegistration( - transition, - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - - let currentKeys = [ - makeIdentityPublicKeyInfo( - keyId: 100, - purpose: .authentication, - securityLevel: .high, - keyType: .ecdsaHash160, - data: validated.authenticationKey.publicKeyData, - disabledAt: 123 - ), - makeIdentityPublicKeyInfo( - keyId: 101, - purpose: .encryption, - securityLevel: .medium, - keyType: .ecdsaSecp256k1, - data: validated.encryptionKey.publicKeyData - ), - ] - - XCTAssertEqual( - PlatformDashConnectDataSource.missingKeyRegistrationKeys( - validated, - currentIdentityPublicKeys: currentKeys - ), - [validated.authenticationKey] - ) - } - - func testHasRegisteredLoginKeysReturnsFalseWhenEncryptionKeyIsMissing() throws { - let chainKey = Data(repeating: 0x22, count: 32) - let identityId = Data(repeating: 0x33, count: 32) - let appContractId = Data(repeating: 0x44, count: 32) - let transition = try makeValidTransition( - identityId: identityId, - appContractId: appContractId, - chainKey: chainKey, - walletIdentityId: identityId - ) - let validated = try PlatformDashConnectDataSource.validateKeyRegistration( - transition, - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - - let currentKeys = [ - makeIdentityPublicKeyInfo( - keyId: 100, - purpose: .authentication, - securityLevel: .high, - keyType: .ecdsaHash160, - data: validated.authenticationKey.publicKeyData - ), - ] - - XCTAssertFalse( - PlatformDashConnectDataSource.hasRegisteredLoginKeys( - authenticationPublicKeyHash160: validated.authenticationKey.publicKeyData, - encryptionPublicKey: validated.encryptionKey.publicKeyData, - currentIdentityPublicKeys: currentKeys - ) - ) - } - - func testHasRegisteredLoginKeysReturnsFalseWhenMatchingKeyIsDisabled() throws { - let chainKey = Data(repeating: 0x22, count: 32) - let identityId = Data(repeating: 0x33, count: 32) - let appContractId = Data(repeating: 0x44, count: 32) - let transition = try makeValidTransition( - identityId: identityId, - appContractId: appContractId, - chainKey: chainKey, - walletIdentityId: identityId - ) - let validated = try PlatformDashConnectDataSource.validateKeyRegistration( - transition, - chainKeyPrivateBytes: chainKey, - identityId: identityId, - appContractId: appContractId - ) - - let currentKeys = [ - makeIdentityPublicKeyInfo( - keyId: 100, - purpose: .authentication, - securityLevel: .high, - keyType: .ecdsaHash160, - data: validated.authenticationKey.publicKeyData, - disabledAt: 123 - ), - makeIdentityPublicKeyInfo( - keyId: 101, - purpose: .encryption, - securityLevel: .medium, - keyType: .ecdsaSecp256k1, - data: validated.encryptionKey.publicKeyData - ), - ] - - XCTAssertFalse( - PlatformDashConnectDataSource.hasRegisteredLoginKeys( - authenticationPublicKeyHash160: validated.authenticationKey.publicKeyData, - encryptionPublicKey: validated.encryptionKey.publicKeyData, - currentIdentityPublicKeys: currentKeys - ) - ) - } - - private func makeValidTransition( - identityId: Data, - appContractId: Data, - chainKey: Data, - walletIdentityId: Data - ) throws -> DashConnectKeyRegistrationTransition { - let loginKey = try LoginKeyDerivation.deriveLoginKey( - chainKeyPrivateBytes: chainKey, - identityId: walletIdentityId, - appContractId: appContractId - ) - let authPrivateKey = try KeyExchangeCrypto.deriveAuthPrivateKey(loginKey: loginKey, identityId: walletIdentityId) - let encryptionPrivateKey = try KeyExchangeCrypto.deriveEncryptionPrivateKey(loginKey: loginKey, identityId: walletIdentityId) - let authPublicKey = try Secp256k1.compressedPublicKey(privateKey: authPrivateKey) - - return DashConnectKeyRegistrationTransition( - identityId: identityId, - addPublicKeys: [ - DashConnectKeyRegistrationKey( - keyId: 6, - keyType: .ecdsaHash160, - purpose: .authentication, - securityLevel: .high, - publicKeyData: try KeyExchangeCrypto.hash160(authPublicKey), - contractBounds: nil - ), - DashConnectKeyRegistrationKey( - keyId: 7, - keyType: .ecdsaSecp256k1, - purpose: .encryption, - securityLevel: .medium, - publicKeyData: try Secp256k1.compressedPublicKey(privateKey: encryptionPrivateKey), - contractBounds: nil - ), - ], - disablePublicKeyIds: [] - ) - } - private func makeLoginRequest(contractId: Data, label: String) throws -> DashKeyRequest { DashKeyRequest( appEphemeralPubKey: try Secp256k1.compressedPublicKey(privateKey: Data(repeating: 0x01, count: 32)), @@ -1188,37 +407,16 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { ) } - private func makeIdentityPublicKeyInfo( - keyId: UInt32, - purpose: KeyPurpose, - securityLevel: SecurityLevel, - keyType: KeyType, - data: Data, - disabledAt: UInt64? = nil - ) -> ManagedIdentity.IdentityPublicKeyInfo { - ManagedIdentity.IdentityPublicKeyInfo( - keyId: Int32(bitPattern: keyId), - purpose: purpose, - securityLevel: securityLevel, - keyType: keyType, - readOnly: false, - disabledAt: disabledAt.map { Int64(bitPattern: $0) }, - data: data, - // Protocol 14 key limits (platform#4798). These fixtures describe - // the keys the QR login flow derives, which carry neither. - totalBudget: nil, - expiresAt: nil - ) - } - private static let taggedIdentityUpdateFixtureBase64 = "BgAREREREREREREREREREREREREREREREREREREREREREQcJAgARAAACAAAhAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICQaqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqABIAAQIBAUREREREREREREREREREREREREREREREREREREREREREB3Byb2ZpbGUBIQMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA0G7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7uwIECAIDQZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ" - private static let taglessIdentityUpdateFixtureBase64 = - "ABERERERERERERERERERERERERERERERERERERERERERBwkCABEAAAIAACECAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJBqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqoAEgABAgEBREREREREREREREREREREREREREREREREREREREREREQHcHJvZmlsZQEhAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDQbu7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7AgQIAgNBmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZk=" - private static let realKeyRegistrationFixtureHex = - "0089fd6ddba75136a4fea02dc7d89ef0ca5bcc32ccf12fb8da6a1a03740567ae7201010200060200020000145e24e38a86e720f61757647996957e322686abb7000007000103000021035e8cfb0785b54e8902a3dc17bdaad8a5738c6019a18ebc527f79d1c64a27826a4120dc911df1d1e6cccf8c95ec0d423c928433397933de6dd9ad006bc40dc0334d6d270d50c6d5e2dcdc5560e40487ddfe28bd1066d0729fad4b26f92ae33f12a04b00000000" +} + +private extension AppConnect.GrantPlan { + static let sample = AppConnect.GrantPlan( + appId: Data(repeating: 0xA1, count: 32), appEphemeralPubKeyHash: Data(repeating: 0xEE, count: 20), + auth: [], encryption: [], connectionId: nil, identityHint: nil, createdAt: 0, callbackHost: nil) } private final class TestDashConnectStore: DashConnectStore { @@ -1521,7 +719,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { walletUsername: nil, walletIdentityId: identityId, existingConnection: nil, - login: .twoQR) + login: .appConnect(.sample)) } private static let connection = DAppConnection( @@ -1807,39 +1005,6 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertFalse(AppConnect.isReadableBound(boundsKind: 4, boundIds: [app])) } - func testResponseCarriesTheSessionKeyOnlyTheAppCanDecrypt() throws { - let sessionPrivateKey = Data(repeating: 0x5a, count: 32) - let appEphemeralPrivateKey = Data(repeating: 0x07, count: 32) - let appEphemeralPubKey = try Secp256k1.compressedPublicKey(privateKey: appEphemeralPrivateKey) - let walletEphemeralPrivateKeyBytes = Data(repeating: 0x09, count: 32) - var walletEphemeralPrivateKey = walletEphemeralPrivateKeyBytes - - let values = AppConnect.ResponseValues(try AppConnect.seal( - sessionPrivateKey, - appEphemeralPubKey: appEphemeralPubKey, - walletEphemeralPrivateKey: &walletEphemeralPrivateKey)) - - XCTAssertEqual(walletEphemeralPrivateKey, Data(repeating: 0, count: 32), "the ephemeral key is wiped") - XCTAssertEqual( - values.appEphemeralPubKeyHash, - try KeyExchangeCrypto.hash160(appEphemeralPubKey).toHexString()) - let walletEphemeralPubKey = try Secp256k1.compressedPublicKey(privateKey: walletEphemeralPrivateKeyBytes) - XCTAssertEqual(values.walletEphemeralPubKey, walletEphemeralPubKey.toHexString()) - // 28-byte envelope plus one 32-byte key: the contract's minimum. - XCTAssertEqual(values.encryptedPayload.count, 60 * 2) - - let payload = try XCTUnwrap(Self.data(hex: values.encryptedPayload)) - // The app's side of the exchange: its private key with the wallet's - // public key. ECDH is symmetric, so the helper's parameters take the - // opposite pair to the one that encrypted. - XCTAssertEqual( - try KeyExchangeCrypto.decryptLoginKey( - payload, - walletEphemeralPriv: appEphemeralPrivateKey, - appEphemeralPub: walletEphemeralPubKey), - sessionPrivateKey) - } - func testPropertiesJsonHoldsExactlyTheThreeContractFields() throws { let values = AppConnect.ResponseValues( appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc") @@ -1881,10 +1046,10 @@ final class AppConnectLoginTests: XCTestCase { func testDisconnectOfARowFromAnotherWalletIsRefusedAndTheListMovesToTheActiveWallet() async { let active = ActiveWallet("wallet-a") - let row = Self.twoQRRow(status: .active) + let row = Self.row(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) let shown = Self.shownRows(dataSource) - let other = Self.twoQRRow(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .approved) + let other = Self.row(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .confirming) active.idHex = "wallet-b" connections.save([other]) @@ -1898,7 +1063,7 @@ final class AppConnectLoginTests: XCTestCase { func testDisconnectIsRefusedWhenTheNewlyActiveWalletHasARowForTheSameApp() async { let active = ActiveWallet("wallet-a") - let row = Self.twoQRRow(status: .active) + let row = Self.row(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) let shown = Self.shownRows(dataSource) active.idHex = "wallet-b" @@ -1911,7 +1076,7 @@ final class AppConnectLoginTests: XCTestCase { func testDisconnectFromAnOldListIsRefusedAfterTheListAlreadyMovedToTheNewWallet() async throws { let active = ActiveWallet("wallet-a") - let row = Self.twoQRRow(status: .active) + let row = Self.row(status: .active) let center = NotificationCenter() let (dataSource, connections) = makeScopedDataSource( active: active, rows: [row], notificationCenter: center) @@ -1934,13 +1099,14 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(connections.load(), [row], "the new wallet's row for the same app is untouched") // The row the new list shows is this wallet's own. let current = Self.shownRows(dataSource) - try await dataSource.disconnect(id: current[0].id, scope: current[0].scope, includingUnrecorded: false) - XCTAssertEqual(connections.load().map(\.status), [.approved]) + await Self.expectNotWalletChanged { + try await dataSource.disconnect(id: current[0].id, scope: current[0].scope, includingUnrecorded: false) + } } func testRemoveDoesNothingForARowPublishedForAnotherWallet() async { let active = ActiveWallet("wallet-a") - let row = Self.twoQRRow(status: .active) + let row = Self.row(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) let shown = Self.shownRows(dataSource) active.idHex = "wallet-b" @@ -1954,23 +1120,11 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(connections.load(), [], "the list is this wallet's now") } - func testDisconnectOfATwoQRRowTurnsItOffInTheActiveWallet() async throws { - let active = ActiveWallet("wallet-a") - let row = Self.twoQRRow(status: .active) - let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) - let shown = Self.shownRows(dataSource) - - try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope, includingUnrecorded: false) - - XCTAssertEqual(connections.load().map(\.status), [.approved]) - XCTAssertEqual(Self.shownRows(dataSource).map(\.status), [.approved]) - } - func testARowShownForADevnetAtOtherNodesIsNotActedOnUnderTheSameName() async throws { let active = ActiveWallet("wallet-a") let endpoint = Endpoint("https://quorums.one.example") let center = NotificationCenter() - let row = Self.twoQRRow(status: .active) + let row = Self.row(status: .active) let (dataSource, connections) = makeScopedDataSource( active: active, rows: [row], notificationCenter: center, endpoint: endpoint) let shown = Self.shownRows(dataSource) @@ -1982,13 +1136,14 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(connections.load().map(\.status), [.active]) let current = Self.shownRows(dataSource) XCTAssertNotEqual(current[0].scope, shown[0].scope) - try await dataSource.disconnect(id: current[0].id, scope: current[0].scope, includingUnrecorded: false) - XCTAssertEqual(connections.load().map(\.status), [.approved]) + await Self.expectNotWalletChanged { + try await dataSource.disconnect(id: current[0].id, scope: current[0].scope, includingUnrecorded: false) + } } func testARowWithNoScopeIsNotActedOn() async { let active = ActiveWallet("wallet-a") - let row = Self.twoQRRow(status: .active) + let row = Self.row(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) await Self.expectWalletChanged { try await dataSource.disconnect(id: row.id, scope: nil, includingUnrecorded: false) } @@ -1999,11 +1154,11 @@ final class AppConnectLoginTests: XCTestCase { func testTheListMovesToTheActiveWalletWhenTheWalletChangeIsAnnounced() async { let active = ActiveWallet("wallet-a") - let row = Self.twoQRRow(status: .active) + let row = Self.row(status: .active) let center = NotificationCenter() let (dataSource, connections) = makeScopedDataSource( active: active, rows: [row], notificationCenter: center) - let other = Self.twoQRRow(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .approved) + let other = Self.row(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .confirming) active.idHex = "wallet-b" connections.save([other]) let moved = expectation(description: "the active wallet's rows are published") @@ -2058,7 +1213,7 @@ final class AppConnectLoginTests: XCTestCase { func testADisconnectWaitsForAnOperationAnotherDataSourceIsRunning() async throws { let gate = DashConnectOperationGate() let active = ActiveWallet("wallet-a") - let row = Self.twoQRRow(status: .active) + let row = Self.row(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row], operationGate: gate) let shown = Self.shownRows(dataSource) let otherStarted = expectation(description: "the other operation is running") @@ -2069,28 +1224,35 @@ final class AppConnectLoginTests: XCTestCase { otherStarted.fulfill() for await _ in release.stream { break } // It wrote a row of its own meanwhile. - connections.save([row, Self.twoQRRow(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .active)]) + connections.save([row, Self.row(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .active)]) } } await fulfillment(of: [otherStarted], timeout: 2) - let disconnect = Task { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope, includingUnrecorded: false) } + // With no wallet to sign, the disconnect fails once its turn comes; + // when it ends is what is checked. + let log = OperationLog() + let disconnect = Task { + _ = try? await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope, includingUnrecorded: false) + await log.add("disconnect ended") + } try await Task.sleep(nanoseconds: 100_000_000) - XCTAssertEqual(connections.load().map(\.status), [.active], "the disconnect has not run yet") + let ended = await log.entries + XCTAssertEqual(ended, [], "the disconnect waits for the other operation") release.continuation.yield() await other.value - try await disconnect.value + await disconnect.value - let rows = connections.load() - XCTAssertEqual(rows.count, 2, "the row the other operation wrote is kept") - XCTAssertEqual(rows.first { $0.id == row.id }?.status, .approved) + let entries = await log.entries + XCTAssertEqual(entries, ["disconnect ended"]) + XCTAssertEqual(connections.load().count, 2, "the row the other operation wrote is kept") } func testAnOperationDoesNotStartForAWalletThatIsNoLongerActiveWhenItsTurnComes() async { let gate = DashConnectOperationGate() let active = ActiveWallet("wallet-a") - let row = Self.twoQRRow(status: .active) + let row = Self.row(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row], operationGate: gate) let shown = Self.shownRows(dataSource) let otherStarted = expectation(description: "the other operation is running") @@ -2141,7 +1303,7 @@ final class AppConnectLoginTests: XCTestCase { walletUsername: nil, walletIdentityId: "identity-a", existingConnection: nil, - login: .twoQR, + login: .appConnect(.sample), scope: "wallet-a devnet-one") XCTAssertTrue(request.wasResolved(forIdentityId: "identity-a", scope: "wallet-a devnet-one")) @@ -2160,7 +1322,7 @@ final class AppConnectLoginTests: XCTestCase { let (dataSource, _) = makeScopedDataSource(active: active) do { - try await dataSource.disconnect(id: Self.twoQRRow(status: .active).id, scope: nil, includingUnrecorded: false) + try await dataSource.disconnect(id: Self.row(status: .active).id, scope: nil, includingUnrecorded: false) XCTFail("disconnected with no wallet") } catch { guard case DashConnectPlatformError.noWallet = error else { @@ -2177,6 +1339,18 @@ final class AppConnectLoginTests: XCTestCase { return rows } + /// The operation is not refused for being another wallet's; it may + /// still fail further on, with no wallet to sign in tests. + private static func expectNotWalletChanged( + _ operation: () async throws -> Void, file: StaticString = #filePath, line: UInt = #line + ) async { + do { + try await operation() + } catch DashConnectPlatformError.walletChanged { + XCTFail("refused as another wallet's", file: file, line: line) + } catch {} + } + private static func expectWalletChanged( _ action: () async throws -> Void, file: StaticString = #filePath, @@ -2252,7 +1426,7 @@ final class AppConnectLoginTests: XCTestCase { defaults.object(forKey: "DashConnect.keptSharedProfileKeys wallet-c t identity-c"), "it runs once") } - private static func twoQRRow( + private static func row( id: String = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: ConnectionStatus ) -> DAppConnection { From 9e87349fd0d7532ba78a5750a9aa96fbadfbafaf Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 3 Nov 2026 17:13:42 +0200 Subject: [PATCH 076/108] fix(dashconnect): keep live keys of a conflicting intent actionable and gate raised limits - An intent keeps an actionable status while any of its auth keys is enabled, even when another of its ids is held by a different key: a live key makes it active, an expired one that is still enabled makes it expired. Such an intent is never resumed and gets no fence; it counts as never landed only once none of its auth keys is enabled. - Before the sealed response is published, the auth keys that were already on the identity (an earlier try, another device) must hold no more than the plan approved now: no larger budget cap, no later expiry. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectProjection.swift | 53 +++++++++++++----- .../PlatformDashConnectDataSource.swift | 21 +++++-- .../AppConnectProjectionTests.swift | 55 ++++++++++++++++++- 3 files changed, 110 insertions(+), 19 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift index a79dd3e37e..ebc6c36983 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift @@ -8,9 +8,11 @@ import SwiftDashSDK /// identity and those intents; nothing computed is stored. /// /// Platform takes an identity update whole or not at all, and refuses one -/// that adds a key id the identity already holds. So an intent's keys either -/// all appear as submitted, or one of their ids is held by another key and the -/// update can never land. Nothing else settles an intent: a key that is absent +/// that adds a key id the identity already holds. So an intent's update +/// either lands as submitted, or one of its ids is held by another key and it +/// can never land. Keys of the intent can still show next to such a conflict +/// (another device submitted the same keys with a different one): those are +/// access the app has. Nothing else settles an intent: a key that is absent /// may still arrive, whatever the revision or the time. extension AppConnect { // MARK: Stored @@ -170,22 +172,23 @@ extension AppConnect { enum IntentStatus: Equatable { /// An auth key is live; `expiresAt` is the earliest expiry among them. + /// It may sit next to an id another key holds. case active(expiresAt: UInt64?) /// No auth key is there yet and none is taken: the update may land. case confirming - /// Every auth key is there and none is live; some expired. + /// No auth key is live, some are expired but still enabled, and none + /// may still land. case expired /// Every auth key is off. case disconnected - /// Another key holds one of its ids: the update never landed and - /// never will. + /// Another key holds one of its ids and none of its auth keys is + /// enabled: the update never landed and never will. case neverLanded } static func status(of intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> IntentStatus { - // One key of the update held by another, encryption keys included, - // and the whole update never lands. - if intent.keys.contains(where: { presence(of: $0, in: snapshot) == .conflicting }) { return .neverLanded } + // A live key of the intent is access the app has, whatever else of + // the update shows. let auth = intent.authKeys.map { ($0, presence(of: $0, in: snapshot)) } let live = auth.filter { $0.1 == .live } if !live.isEmpty { @@ -194,6 +197,13 @@ extension AppConnect { } return .active(expiresAt: expiries.min()) } + // One key of the update held by another, encryption keys included, + // and the rest of it never lands. An expired key that is still + // enabled can be revived by an authorized limits update, so it is + // access the app has. + if hasConflict(intent, in: snapshot) { + return auth.contains(where: { $0.1 == .expired }) ? .expired : .neverLanded + } if auth.contains(where: { $0.1 == .missing }) { return .confirming } if auth.contains(where: { $0.1 == .expired }) { return .expired } return .disconnected @@ -397,10 +407,17 @@ extension AppConnect { } && intent.keys.allSatisfy { $0.isAuthentication || presence(of: $0, in: snapshot) != .disabled } } + /// Whether another key holds an id one of the intent's keys was to take: + /// then the intent's update never lands as a whole. + static func hasConflict(_ intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> Bool { + intent.keys.contains { presence(of: $0, in: snapshot) == .conflicting } + } + /// Whether a retry of a request may carry on with its intent: its keys - /// are live or may still land, and the user has not disconnected it. + /// are live or may still land, none of its ids is held by another key, + /// and the user has not disconnected it. static func mayResume(_ intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> Bool { - guard intent.closedAt == nil else { return false } + guard intent.closedAt == nil, !hasConflict(intent, in: snapshot) else { return false } switch status(of: intent, in: snapshot) { case .active, .confirming: return true case .expired, .disconnected, .neverLanded: return false @@ -431,8 +448,7 @@ extension AppConnect { for intent in own { let auth = intent.authKeys.map { ($0, presence(of: $0, in: snapshot)) } plan.disable += auth.filter { [.live, .expired].contains($0.1) }.map(\.0.id) - if status(of: intent, in: snapshot) != .neverLanded, - let missing = auth.first(where: { $0.1 == .missing })?.0.id { + if !hasConflict(intent, in: snapshot), let missing = auth.first(where: { $0.1 == .missing })?.0.id { plan.fence.append(missing) } if !intent.responseRemoved { plan.deleteResponses.append(intent.id) } @@ -478,6 +494,17 @@ extension AppConnect { plan.encryption.map { ApprovedSlot(purpose: $0.keyPurpose, contractId: $0.binding.contractId) } } + /// Whether the auth keys of `intent` that are on the identity hold no more + /// than `plan` grants now: an authorized limits update may have raised + /// a key's budget or lifetime after it landed. No budget means no cap. + static func landedKeysWithinPlan(_ intent: ConnectionIntent, _ plan: GrantPlan, in snapshot: IdentitySnapshot) -> Bool { + intent.authKeys.count == plan.auth.count && zip(intent.authKeys, plan.auth).allSatisfy { intended, grant in + guard let key = snapshot.keys.first(where: { isSameKey($0, as: intended) }) else { return true } + let budgetWithin = grant.totalBudget.map { cap in key.totalBudget.map { $0 <= cap } ?? false } ?? true + return budgetWithin && (key.expiresAt ?? .max) <= grant.expiresAt + } + } + /// Whether a retry of a request may submit `intent` again under what /// the user approved now: the same keys, each with the level, bound and /// budget the plan grants, and an expiry no later than the plan's. diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index b8d57e9880..e360f1467c 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -950,10 +950,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // the update ends, the user can turn the connection off. await refreshRows(from: snapshot, context: context) - try await submitIntent(intent, request: request, plan: plan, snapshot: snapshot, context: context, signer: signer) + let landed = try await submitIntent( + intent, request: request, plan: plan, snapshot: snapshot, context: context, signer: signer) guard stores.intents.load().first(where: { $0.id == intent.id })?.closedAt == nil else { throw DashConnectPlatformError.sessionKeyUnusable } + // The response carries the keys' secret. Keys that were there before + // this update (an earlier try, another device) are released only + // while they hold no more than the sheet showed; a key this update + // added holds what the plan grants. + if intent.responseDocumentId == nil, + !AppConnect.landedKeysWithinPlan(intent, plan, in: landed ?? snapshot) { + throw DashConnectPlatformError.sessionKeyUnusable + } try await publishResponse(of: intent, responseContractId: responseContractId, context: context, signer: signer) if let read = try? await identitySnapshot(context: context).snapshot { // The earlier grants of this connection are done once their keys @@ -1269,7 +1278,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// every key it adds shows and every key it turns off is off. An update /// that reports a failure may still have landed: the identity is read /// again, and if it does not show the intent the intent stays, shown as - /// confirming, and the failure stands. + /// confirming, and the failure stands. Returns the read that showed the + /// intent there when that was not this update's own answer, else nil. private func submitIntent( _ intent: AppConnect.ConnectionIntent, request: AppConnectRequest, @@ -1277,10 +1287,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { snapshot: AppConnect.IdentitySnapshot, context: Context, signer: KeychainSigner - ) async throws { + ) async throws -> AppConnect.IdentitySnapshot? { guard !AppConnect.hasLanded(intent, in: snapshot) else { await refreshRows(from: snapshot, context: context) - return + return snapshot } let missing = intent.keys.filter { AppConnect.presence(of: $0, in: snapshot) == .missing } let disable = AppConnect.outstandingDisables(of: intent, in: snapshot) @@ -1342,13 +1352,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if AppConnect.hasLanded(intent, in: read) { Self.logger.info("🔗 DASHCONNECT :: the identity update landed without confirming") await refreshRows(from: read, context: context) - return + return read } if attempt == 2 { await refreshRows(from: read, context: context) } } throw error } Self.logger.info("🔗 DASHCONNECT :: identity updated") + return nil } /// Publishes the response `intent` sealed, unless it is already there. diff --git a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift index bf52086059..9969f994ce 100644 --- a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift +++ b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift @@ -69,7 +69,7 @@ final class AppConnectProjectionTests: XCTestCase { ("all there", [Self.onPlatform(a), Self.onPlatform(b)], .active(expiresAt: Self.now + 1000)), ("one there, one missing", [Self.onPlatform(a)], .active(expiresAt: Self.now + 1000)), ("one id taken by another key", [Self.onPlatform(a, data: Data(repeating: 9, count: 20))], .neverLanded), - ("taken id wins over a live key", [Self.onPlatform(a), Self.onPlatform(b, data: Data(repeating: 9, count: 20))], .neverLanded), + ("a live key wins over a taken id", [Self.onPlatform(a), Self.onPlatform(b, data: Data(repeating: 9, count: 20))], .active(expiresAt: Self.now + 1000)), ("all off", [Self.onPlatform(a, disabledAt: 1), Self.onPlatform(b, disabledAt: 1)], .disconnected), ("one off, one missing", [Self.onPlatform(a, disabledAt: 1)], .confirming), ("expired by Platform time", [Self.onPlatform(expired), Self.onPlatform(b, disabledAt: 1)], .expired), @@ -423,6 +423,59 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertFalse(AppConnect.isWithinPlan(older, Self.plan())) } + func testALiveKeyOfAnIntentWithATakenIdStaysActionableButIsNotResumed() { + let a = Self.authKey(10), b = Self.authKey(11) + let intent = Self.intent([a, b]) + let snapshot = Self.snapshot([Self.onPlatform(a), Self.onPlatform(b, data: Data(repeating: 9, count: 20))]) + let projection = AppConnect.project([snapshot], intents: [intent]) + XCTAssertEqual(projection.connections.first?.status, .active(expiresAt: Self.now + 1000), "the app keeps a row") + XCTAssertFalse(AppConnect.mayResume(intent, in: snapshot), "its update never lands as a whole") + let plan = AppConnect.disconnectPlan(appId: Self.app, snapshot: snapshot, intents: [intent], includeUnrecorded: false) + XCTAssertEqual(plan.disable, [10]) + XCTAssertEqual(plan.fence, []) + } + + func testARetryIsRefusedWhenALandedKeyWasGivenMoreSince() { + let key = Self.authKey(10) + let intent = Self.intent([key]) + let raised = AppConnect.PlatformKey( + id: 10, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: key.data, + readOnly: false, bound: key.bound, boundKnown: true, totalBudget: 5000, expiresAt: Self.now + 1000, + disabledAt: nil) + XCTAssertTrue(AppConnect.landedKeysWithinPlan(intent, Self.plan(), in: Self.snapshot([]))) + XCTAssertTrue(AppConnect.landedKeysWithinPlan(intent, Self.plan(), in: Self.snapshot([Self.onPlatform(key)]))) + XCTAssertFalse(AppConnect.landedKeysWithinPlan(intent, Self.plan(), in: Self.snapshot([raised]))) + let longer = AppConnect.PlatformKey( + id: 10, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: key.data, + readOnly: false, bound: key.bound, boundKnown: true, totalBudget: 1000, expiresAt: Self.now + 9000, + disabledAt: nil) + XCTAssertFalse(AppConnect.landedKeysWithinPlan(intent, Self.plan(), in: Self.snapshot([longer]))) + let lowered = AppConnect.PlatformKey( + id: 10, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: key.data, + readOnly: false, bound: key.bound, boundKnown: true, totalBudget: 500, expiresAt: Self.now + 1000, + disabledAt: nil) + XCTAssertTrue(AppConnect.landedKeysWithinPlan(intent, Self.plan(), in: Self.snapshot([lowered])), "less than approved") + let uncapped = AppConnect.PlatformKey( + id: 10, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: key.data, + readOnly: false, bound: key.bound, boundKnown: true, totalBudget: nil, expiresAt: Self.now + 1000, + disabledAt: nil) + XCTAssertFalse(AppConnect.landedKeysWithinPlan(intent, Self.plan(), in: Self.snapshot([uncapped])), "no cap is more") + XCTAssertTrue(AppConnect.landedKeysWithinPlan(intent, Self.plan(budget: nil), in: Self.snapshot([uncapped]))) + } + + func testAnExpiredKeyOfAnIntentWithATakenIdKeepsTheConnection() { + let a = Self.authKey(10, expiresAt: Self.now - 1), b = Self.authKey(11) + let intent = Self.intent([a, b]) + let snapshot = Self.snapshot([Self.onPlatform(a), Self.onPlatform(b, data: Data(repeating: 9, count: 20))]) + XCTAssertEqual(AppConnect.status(of: intent, in: snapshot), .expired) + XCTAssertFalse(AppConnect.mayResume(intent, in: snapshot)) + XCTAssertEqual( + AppConnect.disconnectPlan(appId: Self.app, snapshot: snapshot, intents: [intent], includeUnrecorded: false).disable, + [10]) + let off = Self.snapshot([Self.onPlatform(a, disabledAt: 1), Self.onPlatform(b, data: Data(repeating: 9, count: 20))]) + XCTAssertEqual(AppConnect.status(of: intent, in: off), .neverLanded, "nothing enabled is left") + } + func testARetryCarriesOnOnlyWhileTheKeysAreLiveOrMayStillLand() { let key = Self.authKey(10) var intent = Self.intent([key]) From 8e8aa7e9ffff0a7dcd0b18ff35322aacf13cc94b Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 3 Nov 2026 17:38:08 +0200 Subject: [PATCH 077/108] fix(dashconnect): bind retries to their connection and recheck keys before publishing - A retry carries on only for the same connection id; another connection's intent is never resumed, and the app has to ask again. - Right before the sealed response is published the identity is read again: no encryption key it carries may be off, and the auth keys that were already there may hold no more than the plan approved now. - DashPay profile keys no intent names are offered, on confirm, with the disconnect of any app: no record proves which app was given one. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectProjection.swift | 12 +------ .../PlatformDashConnectDataSource.swift | 35 ++++++++++++------- .../AppConnectProjectionTests.swift | 26 ++++++-------- 3 files changed, 34 insertions(+), 39 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift index ebc6c36983..0d39657324 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift @@ -389,16 +389,6 @@ extension AppConnect { && outstandingDisables(of: intent, in: snapshot).isEmpty } - /// Whether the DashPay profile keys no intent names are offered with a - /// disconnect of the app on the identity: when its intents there gave it - /// a profile key, and when the wallet has no record of the app there - /// (after a restore no record says which app was given one). Each is - /// turned off only on the user's confirm. - static func offersUnrecordedProfileKeys(_ intents: [ConnectionIntent], appId: Data, identityId: Data) -> Bool { - let own = intents.filter { $0.appId == appId && $0.identityId == identityId } - return own.isEmpty || own.contains { $0.authKeys.contains { $0.bound.map(isProfileBound) ?? false } } - } - /// Whether the encryption keys `intent`'s response carries can still be /// used: those it re-sends are live, and those it adds are not off. static func encryptionKeysUsable(_ intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> Bool { @@ -510,7 +500,7 @@ extension AppConnect { /// budget the plan grants, and an expiry no later than the plan's. static func isWithinPlan(_ intent: ConnectionIntent, _ plan: GrantPlan) -> Bool { let auth = intent.authKeys - guard intent.appId == plan.appId, auth.count == plan.auth.count, + guard intent.appId == plan.appId, intent.connectionId == plan.connectionId, auth.count == plan.auth.count, intent.approvedEncryption == approvedSlots(of: plan) else { return false } return zip(auth, plan.auth).allSatisfy { key, grant in key.securityLevel == grant.securityLevel && key.bound == grant.storedBound diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index e360f1467c..387c5d66bb 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -926,10 +926,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { }) { // A retry: the same keys and response, within what was approved // now, and only while the identity still has the encryption keys - // the response carries. Turned off, expired, never to land, or - // with no record of its slots: Platform never adds a key twice, - // so the app has to ask again. - guard AppConnect.mayResume(earlier, in: snapshot), earlier.approvedEncryption != nil else { + // the response carries. Turned off, expired, never to land, with + // no record of its slots, or another connection's: Platform never + // adds a key twice, so the app has to ask again. + guard AppConnect.mayResume(earlier, in: snapshot), earlier.approvedEncryption != nil, + earlier.connectionId == plan.connectionId else { throw DashConnectPlatformError.sessionKeyUnusable } guard AppConnect.isWithinPlan(earlier, plan) else { throw DashConnectPlatformError.approvalOutOfDate } @@ -955,13 +956,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard stores.intents.load().first(where: { $0.id == intent.id })?.closedAt == nil else { throw DashConnectPlatformError.sessionKeyUnusable } - // The response carries the keys' secret. Keys that were there before + // The response carries the keys' secrets. Keys that were there before // this update (an earlier try, another device) are released only // while they hold no more than the sheet showed; a key this update - // added holds what the plan grants. - if intent.responseDocumentId == nil, - !AppConnect.landedKeysWithinPlan(intent, plan, in: landed ?? snapshot) { - throw DashConnectPlatformError.sessionKeyUnusable + // added holds what the plan grants. No encryption key it carries may + // have been turned off meanwhile: the identity is read again for it, + // and the last read the wallet has stands in when that read fails. + if intent.responseDocumentId == nil { + let current = (try? await identitySnapshot(context: context).snapshot) ?? landed ?? snapshot + guard AppConnect.landedKeysWithinPlan(intent, plan, in: current) else { + throw DashConnectPlatformError.sessionKeyUnusable + } + guard AppConnect.encryptionKeysUsable(intent, in: current) else { + throw DashConnectPlatformError.appConnectEncryptionKeyChanged + } } try await publishResponse(of: intent, responseContractId: responseContractId, context: context, signer: signer) if let read = try? await identitySnapshot(context: context).snapshot { @@ -1827,10 +1835,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let projection = AppConnect.project([snapshot], intents: all) let unrecordedAppKeys = projection.connections.first { $0.appId == appId }? .unrecordedKeyIds[context.identityId] ?? [] - // DashPay profile keys no intent names are no one app's. - let profileKeys = AppConnect.offersUnrecordedProfileKeys(all, appId: appId, identityId: context.identityId) - ? projection.unrecordedProfileKeyIds[context.identityId] ?? [] - : [] + // DashPay profile keys no intent names are no one app's: no record + // proves which app was given one, on this device or another. A + // disconnect turns off everything that may be the app's, so they + // are offered with any app's, on the user's confirm. + let profileKeys = projection.unrecordedProfileKeyIds[context.identityId] ?? [] plan.disable = Array(Set(plan.disable).union(includingUnrecorded ? profileKeys : [])).sorted() let appKeysOff = plan.disable.count + plan.fence.count // A fence an earlier try added and could not turn off yet. diff --git a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift index 9969f994ce..5013a2f22f 100644 --- a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift +++ b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift @@ -332,7 +332,7 @@ final class AppConnectProjectionTests: XCTestCase { private static func plan( budget: UInt64? = 1000, expiresAt: UInt64 = now + 1000, critical: Bool = false, - encryption: [AppConnectRequest.EncryptionBinding] = [] + encryption: [AppConnectRequest.EncryptionBinding] = [], connectionId: Data? = nil ) -> AppConnect.GrantPlan { let binding = AppConnectRequest.AuthBinding( kind: .singleContract, securityLevel: critical ? .critical : .high, id: app, @@ -341,7 +341,7 @@ final class AppConnectProjectionTests: XCTestCase { appId: app, appEphemeralPubKeyHash: Data(repeating: 0xEE, count: 20), auth: [AppConnect.AuthGrant(bindingIndex: 0, binding: binding, totalBudget: budget, expiresAt: expiresAt)], encryption: encryption.enumerated().map { AppConnect.EncryptionGrant(bindingIndex: $0.offset, binding: $0.element) }, - connectionId: nil, identityHint: nil, createdAt: 0, callbackHost: nil) + connectionId: connectionId, identityHint: nil, createdAt: 0, callbackHost: nil) } func testARetrySubmitsTheIntentOnlyWithinWhatIsApprovedNow() { @@ -354,6 +354,15 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertFalse( AppConnect.isWithinPlan(intent, Self.plan(encryption: [.init(contractId: Self.app, purpose: .encryption)])), "the response would carry slots other than the ones approved now") + let otherConnection = Intent( + id: intent.id, identityId: intent.identityId, appId: intent.appId, appLabel: intent.appLabel, + appUrl: intent.appUrl, requestHash: intent.requestHash, connectionId: Data(repeating: 0xC0, count: 16), + keys: intent.keys, sentEncryptionKeyIds: [], approvedEncryption: [], disables: [], response: intent.response, + responseDocumentId: nil, responseRemoved: true, createdAt: intent.createdAt, closedAt: nil) + XCTAssertFalse(AppConnect.isWithinPlan(otherConnection, Self.plan()), "another connection's intent") + XCTAssertFalse( + AppConnect.isWithinPlan(intent, Self.plan(connectionId: Data(repeating: 0xC0, count: 16))), + "an intent with no connection under a plan with one") } // MARK: Fence @@ -505,19 +514,6 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertFalse(AppConnect.hasLanded(intent, in: Self.snapshot([Self.onPlatform(earlier, disabledAt: 1)]))) } - func testProfileKeysAreOfferedWithAnAppGivenProfileAccessOrOneWithNoRecord() { - let profile = Self.intent([Self.authKey(10, bound: .documentType(contractId: Self.dashPay, name: "profile"))]) - let plain = Self.intent([Self.authKey(11)], app: Self.otherApp) - XCTAssertTrue(AppConnect.offersUnrecordedProfileKeys([profile, plain], appId: Self.app, identityId: Self.identity)) - XCTAssertFalse(AppConnect.offersUnrecordedProfileKeys([profile, plain], appId: Self.otherApp, identityId: Self.identity)) - XCTAssertTrue( - AppConnect.offersUnrecordedProfileKeys([profile, plain], appId: Self.appGroup, identityId: Self.identity), - "an app the wallet holds no record of, as after a restore") - XCTAssertTrue( - AppConnect.offersUnrecordedProfileKeys([profile, plain], appId: Self.app, identityId: Self.otherIdentity), - "no record of the app on that identity") - } - func testAResponseIsResentOnlyWhileItsEncryptionKeysCanBeUsed() { let added = Self.encryptionKey(12) let intent = Self.intent([Self.authKey(10), added]) From ab339f21174999965170cded82231c6f45b192b2 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 3 Nov 2026 18:41:54 +0200 Subject: [PATCH 078/108] fix(dashconnect): publish a response only while its keys are current and usable - Every encryption key a sealed response carries must be the key Platform names current for the app and purpose; a key the intent still has to register needs no current key yet, or that very key. This is checked on a retry before an update that still has to be sent, and before publishing on an identity read that shows the update, with reads a few seconds apart for a node that is behind. - A retry, and the publication, are refused while any auth key of the intent is off or expired. - A DashPay profile key no intent names stands as a connection of its own, so it can be turned off when no app row is left. - A disconnect reports the identity as out of date while any key it turned off still shows on. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectProjection.swift | 51 ++++++ .../PlatformDashConnectDataSource.swift | 163 +++++++++++++----- .../AppConnectProjectionTests.swift | 59 ++++++- 3 files changed, 223 insertions(+), 50 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift index 0d39657324..2c51d83cbf 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift @@ -264,6 +264,8 @@ extension AppConnect { && key.expiresAt != nil && key.disabledAt == nil } + private static let dashPayContractIdData = Data.identifier(fromBase58: dashPayContractId) + static func isProfileBound(_ bound: StoredBound) -> Bool { guard case .documentType(let contractId, let name) = bound else { return false } return contractId.toBase58String() == dashPayContractId && name == "profile" @@ -305,7 +307,14 @@ extension AppConnect { continue } if isProfileBound(bound) { + // No app can be told to hold it. It is offered with any + // app's disconnect, and stands as a connection of its + // own, so it can be turned off whatever other rows there + // are. profile[snapshot.identityId, default: []].append(key.id) + if let dashPay = dashPayContractIdData { + unrecorded[dashPay, default: [:]][snapshot.identityId, default: []].append(key.id) + } continue } // A key bound to a system contract is no app's. One bound to @@ -397,6 +406,48 @@ extension AppConnect { } && intent.keys.allSatisfy { $0.isAuthentication || presence(of: $0, in: snapshot) != .disabled } } + /// Whether every auth key `intent`'s response carries can still sign: + /// none is off or expired. One that is not there yet may still land. + static func authKeysUsable(_ intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> Bool { + intent.authKeys.allSatisfy { ![.disabled, .expired].contains(presence(of: $0, in: snapshot)) } + } + + /// A key Platform must name current for the app for a response to hold. + struct ExpectedCurrentKey: Equatable { + let id: UInt32 + let data: Data + /// A key the intent registers that the read does not show: none may + /// be current yet, or this one already (the read may be behind). + let mayBeNone: Bool + } + + /// What Platform's current encryption key for the app must be, by + /// purpose, for `intent`'s response to hold: each key it re-sends or + /// added that `snapshot` shows live, and for a key it registers that + /// `snapshot` does not show, that key or none. + static func expectedCurrentEncryptionKeys(of intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> [KeyPurpose: [ExpectedCurrentKey]] { + var keys: [KeyPurpose: [ExpectedCurrentKey]] = [:] + for key in intent.keys where !key.isAuthentication { + switch presence(of: key, in: snapshot) { + case .live: keys[key.purpose, default: []].append(ExpectedCurrentKey(id: key.id, data: key.data, mayBeNone: false)) + case .missing: keys[key.purpose, default: []].append(ExpectedCurrentKey(id: key.id, data: key.data, mayBeNone: true)) + case .conflicting, .expired, .disabled: continue + } + } + for id in intent.sentEncryptionKeyIds { + guard let key = snapshot.keys.first(where: { $0.id == id }), isLive(key, at: snapshot.platformTime) else { continue } + keys[key.purpose, default: []].append(ExpectedCurrentKey(id: id, data: key.data, mayBeNone: false)) + } + return keys + } + + /// Whether Platform's current key, `current`, is what `expected` asks: + /// that very key, enabled, or none at all where none may be. + static func isCurrent(_ current: CurrentContractKey?, as expected: ExpectedCurrentKey) -> Bool { + guard let current else { return expected.mayBeNone } + return !current.isDisabled && current.keyId == expected.id && current.data == expected.data + } + /// Whether another key holds an id one of the intent's keys was to take: /// then the intent's update never lands as a whole. static func hasConflict(_ intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> Bool { diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 387c5d66bb..30b65a2418 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -934,9 +934,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.sessionKeyUnusable } guard AppConnect.isWithinPlan(earlier, plan) else { throw DashConnectPlatformError.approvalOutOfDate } + guard AppConnect.authKeysUsable(earlier, in: snapshot) else { + throw DashConnectPlatformError.sessionKeyUnusable + } + // Checked before the update too: a refusal after it would leave + // the connection's earlier keys off and the new ones undelivered. guard AppConnect.encryptionKeysUsable(earlier, in: snapshot) else { throw DashConnectPlatformError.appConnectEncryptionKeyChanged } + if earlier.responseDocumentId == nil, !AppConnect.hasLanded(earlier, in: snapshot), + try await !encryptionKeysAreCurrent(of: earlier, in: snapshot, context: context) { + throw DashConnectPlatformError.appConnectEncryptionKeyChanged + } intent = earlier } else { intent = try await newAppConnectIntent( @@ -951,23 +960,43 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // the update ends, the user can turn the connection off. await refreshRows(from: snapshot, context: context) - let landed = try await submitIntent( - intent, request: request, plan: plan, snapshot: snapshot, context: context, signer: signer) + try await submitIntent(intent, request: request, plan: plan, snapshot: snapshot, context: context, signer: signer) guard stores.intents.load().first(where: { $0.id == intent.id })?.closedAt == nil else { throw DashConnectPlatformError.sessionKeyUnusable } // The response carries the keys' secrets. Keys that were there before // this update (an earlier try, another device) are released only // while they hold no more than the sheet showed; a key this update - // added holds what the plan grants. No encryption key it carries may - // have been turned off meanwhile: the identity is read again for it, - // and the last read the wallet has stands in when that read fails. + // added holds what the plan grants. No key it carries may have been + // turned off meanwhile, and each encryption key must still be the + // app's current one. The identity is read again for it, until a read + // shows the update (a node may be behind); when none does, nothing is + // published, and a retry takes it up. if intent.responseDocumentId == nil { - let current = (try? await identitySnapshot(context: context).snapshot) ?? landed ?? snapshot - guard AppConnect.landedKeysWithinPlan(intent, plan, in: current) else { + var shown: AppConnect.IdentitySnapshot? + var readFailure: Error? + for attempt in 0 ... 2 where shown == nil { + if attempt > 0 { await Self.pauseForLaggingNode(attempt) } + do { + let read = try await identitySnapshot(context: context).snapshot + readFailure = nil + if AppConnect.hasLanded(intent, in: read) { shown = read } + } catch { + Self.logger.error("🔗 DASHCONNECT :: identity not read before publishing — \(error.localizedDescription, privacy: .public)") + readFailure = error + } + } + guard let current = shown else { + if let readFailure { throw readFailure } + Self.logger.error("🔗 DASHCONNECT :: no read shows the identity update before publishing") + throw DashConnectPlatformError.identityReadBehind + } + guard AppConnect.landedKeysWithinPlan(intent, plan, in: current), + AppConnect.authKeysUsable(intent, in: current) else { throw DashConnectPlatformError.sessionKeyUnusable } - guard AppConnect.encryptionKeysUsable(intent, in: current) else { + guard AppConnect.encryptionKeysUsable(intent, in: current), + try await encryptionKeysAreCurrent(of: intent, in: current, context: context) else { throw DashConnectPlatformError.appConnectEncryptionKeyChanged } } @@ -1180,30 +1209,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let sdk = context.sdk let purposes = Set(plan.encryption.map(\.keyPurpose)).sorted { $0.rawValue < $1.rawValue } func readCurrentKeys() async throws -> [KeyPurpose: AppConnect.CurrentContractKey] { - let response = try await DashConnectPlatformQueries.identityContractKeys( - sdk: sdk, identityId: identityId, contractId: appId, purposes: purposes) - var keys: [KeyPurpose: AppConnect.CurrentContractKey] = [:] - for purpose in purposes { - keys[purpose] = try AppConnect.currentContractKey(from: response, identityId: identityId, purpose: purpose) - } - return keys - } - // An answer this build cannot read reads the same on every try. - func isUnreadableAnswer(_ error: Error) -> Bool { - if let sdkError = error as? SDKError, case .serializationError = sdkError { return true } - return false - } - func failedRead(_ error: Error) -> Error { - Self.logger.error("🔗 DASHCONNECT :: the app's current encryption keys could not be read — \(error.localizedDescription, privacy: .public)") - guard isUnreadableAnswer(error) else { return DashConnectPlatformError.appConnectKeysUnreadable } - return AppConnect.Refusal(.unsupported, NSLocalizedString( - "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet.", - comment: "DashConnect App Connect v2")) - } - // A node one block behind has usually caught up within a second; one - // that has not gets longer. - func pause(_ attempt: Int) async { - try? await Task.sleep(nanoseconds: attempt == 1 ? 1_000_000_000 : 3_000_000_000) + try await Self.readCurrentContractKeys(sdk: sdk, identityId: identityId, appId: appId, purposes: purposes) } var derived: [[AppConnect.DerivedEncryptionKey]] = [] @@ -1223,12 +1229,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { var firstRead: [KeyPurpose: AppConnect.CurrentContractKey]? var failure: Error? - for attempt in 0 ... 2 where firstRead == nil && !(failure.map(isUnreadableAnswer) ?? false) { - if attempt > 0 { await pause(attempt) } + for attempt in 0 ... 2 where firstRead == nil && !(failure.map(Self.isUnreadableAnswer) ?? false) { + if attempt > 0 { await Self.pauseForLaggingNode(attempt) } do { firstRead = try await readCurrentKeys() } catch { failure = error } } guard let currentKeys = firstRead else { - throw failedRead(failure ?? DashConnectPlatformError.appConnectKeysUnreadable) + throw Self.failedCurrentKeyRead(failure ?? DashConnectPlatformError.appConnectKeysUnreadable) } func states(_ currentKeys: [KeyPurpose: AppConnect.CurrentContractKey]) throws -> [AppConnect.EncryptionKeyState] { try plan.encryption.enumerated().map { index, grant in @@ -1250,14 +1256,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let keyStates: [AppConnect.EncryptionKeyState] do { keyStates = try await AppConnect.settle( - currentKeys: currentKeys, states: states, reread: readCurrentKeys, pause: pause, - isFinal: isUnreadableAnswer) + currentKeys: currentKeys, states: states, reread: readCurrentKeys, pause: Self.pauseForLaggingNode, + isFinal: Self.isUnreadableAnswer) } catch let error as DashConnectPlatformError { throw error } catch let refusal as AppConnect.Refusal { throw refusal } catch { - throw failedRead(error) + throw Self.failedCurrentKeyRead(error) } var slots: [EncryptionSlotKey] = [] for (index, state) in keyStates.enumerated() { @@ -1282,12 +1288,77 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return slots } + /// The current key Platform names for `identityId`, the app and each + /// purpose. + private static func readCurrentContractKeys( + sdk: SDK, identityId: String, appId: String, purposes: [KeyPurpose] + ) async throws -> [KeyPurpose: AppConnect.CurrentContractKey] { + let response = try await DashConnectPlatformQueries.identityContractKeys( + sdk: sdk, identityId: identityId, contractId: appId, purposes: purposes) + var keys: [KeyPurpose: AppConnect.CurrentContractKey] = [:] + for purpose in purposes { + keys[purpose] = try AppConnect.currentContractKey(from: response, identityId: identityId, purpose: purpose) + } + return keys + } + + /// An answer this build cannot read reads the same on every try. + private static func isUnreadableAnswer(_ error: Error) -> Bool { + if let sdkError = error as? SDKError, case .serializationError = sdkError { return true } + return false + } + + private static func failedCurrentKeyRead(_ error: Error) -> Error { + logger.error("🔗 DASHCONNECT :: the app's current encryption keys could not be read — \(error.localizedDescription, privacy: .public)") + guard isUnreadableAnswer(error) else { return DashConnectPlatformError.appConnectKeysUnreadable } + return AppConnect.Refusal(.unsupported, NSLocalizedString( + "This version of the wallet cannot read the network's answer about your identity's encryption key for this app. Update the wallet.", + comment: "DashConnect App Connect v2")) + } + + /// A node one block behind has usually caught up within a second; one + /// that has not gets longer. + private static func pauseForLaggingNode(_ attempt: Int) async { + try? await Task.sleep(nanoseconds: attempt == 1 ? 1_000_000_000 : 3_000_000_000) + } + + /// Whether each encryption key `intent`'s response carries is the one + /// Platform names current for the app and its purpose, and no key is + /// current yet for one it is still to register: the app's verifier + /// refuses any other. A node that is behind may not show a key just + /// registered, so a "no" stands only once reads a few seconds apart all + /// say it. Throws when no read answered. + private func encryptionKeysAreCurrent( + of intent: AppConnect.ConnectionIntent, in snapshot: AppConnect.IdentitySnapshot, context: Context + ) async throws -> Bool { + let expected = AppConnect.expectedCurrentEncryptionKeys(of: intent, in: snapshot) + guard !expected.isEmpty else { return true } + let identityId = context.identityId.toBase58String() + let purposes = expected.keys.sorted { $0.rawValue < $1.rawValue } + var failure: Error? + for attempt in 0 ... 2 { + if attempt > 0 { await Self.pauseForLaggingNode(attempt) } + do { + let current = try await Self.readCurrentContractKeys( + sdk: context.sdk, identityId: identityId, appId: intent.appId.toBase58String(), purposes: purposes) + if expected.allSatisfy({ purpose, keys in keys.allSatisfy { AppConnect.isCurrent(current[purpose], as: $0) } }) { + return true + } + } catch { + failure = error + if Self.isUnreadableAnswer(error) { break } + } + } + // A "no" stands only when every read gave it. + if let failure { throw Self.failedCurrentKeyRead(failure) } + return false + } + /// Submits what of `intent` is not on the identity yet, and returns once /// every key it adds shows and every key it turns off is off. An update /// that reports a failure may still have landed: the identity is read /// again, and if it does not show the intent the intent stays, shown as - /// confirming, and the failure stands. Returns the read that showed the - /// intent there when that was not this update's own answer, else nil. + /// confirming, and the failure stands. private func submitIntent( _ intent: AppConnect.ConnectionIntent, request: AppConnectRequest, @@ -1295,10 +1366,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { snapshot: AppConnect.IdentitySnapshot, context: Context, signer: KeychainSigner - ) async throws -> AppConnect.IdentitySnapshot? { + ) async throws { guard !AppConnect.hasLanded(intent, in: snapshot) else { await refreshRows(from: snapshot, context: context) - return snapshot + return } let missing = intent.keys.filter { AppConnect.presence(of: $0, in: snapshot) == .missing } let disable = AppConnect.outstandingDisables(of: intent, in: snapshot) @@ -1360,14 +1431,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if AppConnect.hasLanded(intent, in: read) { Self.logger.info("🔗 DASHCONNECT :: the identity update landed without confirming") await refreshRows(from: read, context: context) - return read + return } if attempt == 2 { await refreshRows(from: read, context: context) } } throw error } Self.logger.info("🔗 DASHCONNECT :: identity updated") - return nil } /// Publishes the response `intent` sealed, unless it is already there. @@ -1799,7 +1869,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // A key turned off is checked on the read after the update; one that // still shows live means that read is behind, or a new key landed. let ownIntents = stores.intents.load().filter { $0.appId == appId && $0.identityId == context.identityId } - guard ownIntents.allSatisfy({ $0.closedAt != nil }) else { + let stillOn = plan.disable.contains { id in after.keys.contains { $0.id == id && $0.disabledAt == nil } } + guard ownIntents.allSatisfy({ $0.closedAt != nil }), !stillOn else { throw DashConnectPlatformError.identityKeysOutOfDate } // The app's intents on another identity of this wallet can only be @@ -1845,7 +1916,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // A fence an earlier try added and could not turn off yet. let fences = try await liveFenceKeyIds(snapshot: snapshot, intents: all, context: context) plan.disable = Array(Set(plan.disable).union(fences)).sorted() - return (plan, snapshot, appKeysOff, unrecordedAppKeys.count + profileKeys.count, + return (plan, snapshot, appKeysOff, Set(unrecordedAppKeys).union(profileKeys).count, projection.unplacedKeyIds[context.identityId]?.count ?? 0) } diff --git a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift index 5013a2f22f..da4b8024a3 100644 --- a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift +++ b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift @@ -153,13 +153,17 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertEqual(projection.connections[0].unrecordedKeyIds, [Self.identity: [20]]) } - func testAProfileKeyNoIntentNamesIsNoAppsAndADisabledOneIsNotShown() { + func testAProfileKeyNoIntentNamesStandsAsAConnectionOfItsOwnAndADisabledOneIsNotShown() { let profile = Self.authKey(20, bound: .documentType(contractId: Self.dashPay, name: "profile")) let off = Self.authKey(21, bound: .singleContract(Self.otherApp)) - let projection = AppConnect.project( - [Self.snapshot([Self.onPlatform(profile), Self.onPlatform(off, disabledAt: 1)])], intents: []) - XCTAssertTrue(projection.connections.isEmpty) + let snapshot = Self.snapshot([Self.onPlatform(profile), Self.onPlatform(off, disabledAt: 1)]) + let projection = AppConnect.project([snapshot], intents: []) + XCTAssertEqual(projection.connections.map(\.appId), [Self.dashPay], "it can be turned off with no other row left") + XCTAssertEqual(projection.connections.first?.unrecordedKeyIds, [Self.identity: [20]]) XCTAssertEqual(projection.unrecordedProfileKeyIds, [Self.identity: [20]]) + XCTAssertEqual( + AppConnect.disconnectPlan(appId: Self.dashPay, snapshot: snapshot, intents: [], includeUnrecorded: true).disable, + [20]) } func testAKeyAStoreCannotBindIsNotGuessedToBeAnApps() { @@ -514,6 +518,53 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertFalse(AppConnect.hasLanded(intent, in: Self.snapshot([Self.onPlatform(earlier, disabledAt: 1)]))) } + func testAResponseIsReleasedOnlyWhileEveryAuthKeyCanSign() { + let a = Self.authKey(10), b = Self.authKey(11) + let intent = Self.intent([a, b]) + XCTAssertTrue(AppConnect.authKeysUsable(intent, in: Self.snapshot([Self.onPlatform(a)])), "one may still land") + XCTAssertFalse( + AppConnect.authKeysUsable(intent, in: Self.snapshot([Self.onPlatform(a), Self.onPlatform(b, disabledAt: 1)])), + "one of two is off") + let expired = Self.authKey(11, expiresAt: Self.now - 1) + XCTAssertFalse(AppConnect.authKeysUsable(Self.intent([a, expired]), in: Self.snapshot([Self.onPlatform(expired)]))) + } + + func testTheResponsesEncryptionKeysAreListedByPurpose() { + let added = Self.encryptionKey(12) + var intent = Self.intent([Self.authKey(10), added]) + intent = Intent( + id: intent.id, identityId: intent.identityId, appId: intent.appId, appLabel: intent.appLabel, + appUrl: intent.appUrl, requestHash: intent.requestHash, connectionId: nil, keys: intent.keys, + sentEncryptionKeyIds: [7], approvedEncryption: [], disables: [], response: intent.response, + responseDocumentId: nil, responseRemoved: true, createdAt: intent.createdAt, closedAt: nil) + let decryption = AppConnect.PlatformKey( + id: 7, purpose: .decryption, securityLevel: .medium, keyType: .ecdsaSecp256k1, data: Data(repeating: 7, count: 33), + readOnly: false, bound: .singleContract(Self.app), boundKnown: true, totalBudget: nil, expiresAt: nil, disabledAt: nil) + typealias Expected = AppConnect.ExpectedCurrentKey + XCTAssertEqual( + AppConnect.expectedCurrentEncryptionKeys(of: intent, in: Self.snapshot([decryption, Self.onPlatform(added)])), + [.encryption: [Expected(id: 12, data: added.data, mayBeNone: false)], .decryption: [Expected(id: 7, data: decryption.data, mayBeNone: false)]]) + XCTAssertEqual( + AppConnect.expectedCurrentEncryptionKeys(of: intent, in: Self.snapshot([decryption])), + [.encryption: [Expected(id: 12, data: added.data, mayBeNone: true)], .decryption: [Expected(id: 7, data: decryption.data, mayBeNone: false)]]) + XCTAssertEqual( + AppConnect.expectedCurrentEncryptionKeys( + of: intent, in: Self.snapshot([decryption, Self.onPlatform(added, data: Data(repeating: 9, count: 33))])), + [.decryption: [Expected(id: 7, data: decryption.data, mayBeNone: false)]], "another key under its id is not asked about") + + let toRegister = Expected(id: 12, data: added.data, mayBeNone: true) + let ours = AppConnect.CurrentContractKey(keyId: 12, keyType: nil, data: added.data, isDisabled: false) + let other = AppConnect.CurrentContractKey(keyId: 5, keyType: nil, data: Data(repeating: 5, count: 33), isDisabled: false) + let disabledOther = AppConnect.CurrentContractKey(keyId: 5, keyType: nil, data: Data(repeating: 5, count: 33), isDisabled: true) + let sameIdOtherKey = AppConnect.CurrentContractKey(keyId: 12, keyType: nil, data: Data(repeating: 9, count: 33), isDisabled: false) + XCTAssertFalse(AppConnect.isCurrent(disabledOther, as: toRegister), "a disabled current key is still a current key") + XCTAssertFalse(AppConnect.isCurrent(sameIdOtherKey, as: toRegister), "another key under its id") + XCTAssertTrue(AppConnect.isCurrent(nil, as: toRegister), "none current yet") + XCTAssertTrue(AppConnect.isCurrent(ours, as: toRegister), "it landed and the identity read was behind") + XCTAssertFalse(AppConnect.isCurrent(other, as: toRegister), "another key became current") + XCTAssertFalse(AppConnect.isCurrent(nil, as: Expected(id: 7, data: decryption.data, mayBeNone: false))) + } + func testAResponseIsResentOnlyWhileItsEncryptionKeysCanBeUsed() { let added = Self.encryptionKey(12) let intent = Self.intent([Self.authKey(10), added]) From 5c4f4dbe2551339dda27c38934aa4fb410b0b987 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 3 Nov 2026 19:07:04 +0200 Subject: [PATCH 079/108] fix(dashconnect): read the app's current encryption key one way Another key current, or the response's own key off, refuses at once, whatever a later read says, since that read may come from a node that is behind. No key current yet for one the identity already shows is read again; a key one read showed current stays so, and one that never shows current is out of date rather than changed. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectProjection.swift | 21 ++++++++++---- .../PlatformDashConnectDataSource.swift | 29 +++++++++++++------ .../AppConnectProjectionTests.swift | 15 ++++++---- 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift index 2c51d83cbf..18aa10f033 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift @@ -441,11 +441,22 @@ extension AppConnect { return keys } - /// Whether Platform's current key, `current`, is what `expected` asks: - /// that very key, enabled, or none at all where none may be. - static func isCurrent(_ current: CurrentContractKey?, as expected: ExpectedCurrentKey) -> Bool { - guard let current else { return expected.mayBeNone } - return !current.isDisabled && current.keyId == expected.id && current.data == expected.data + /// How Platform's current key, `current`, stands against `expected`. + enum CurrentKeyCheck: Equatable { + /// That very key, enabled, or none at all where none may be. + case matches + /// None current yet for a key the identity already shows: the + /// node that answered may be behind. + case notYet + /// Another key is current, or this one is off: no later read that + /// says otherwise can be trusted over it, as that one may be behind. + case differs + } + + static func check(_ current: CurrentContractKey?, against expected: ExpectedCurrentKey) -> CurrentKeyCheck { + guard let current else { return expected.mayBeNone ? .matches : .notYet } + let isIt = !current.isDisabled && current.keyId == expected.id && current.data == expected.data + return isIt ? .matches : .differs } /// Whether another key holds an id one of the intent's keys was to take: diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 30b65a2418..7756e32ddb 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1325,9 +1325,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// Whether each encryption key `intent`'s response carries is the one /// Platform names current for the app and its purpose, and no key is /// current yet for one it is still to register: the app's verifier - /// refuses any other. A node that is behind may not show a key just - /// registered, so a "no" stands only once reads a few seconds apart all - /// say it. Throws when no read answered. + /// refuses any other. Another key current, or this one off, is a "no" + /// at once, whatever a later read says. No key current yet for one the + /// identity shows may be a node that is behind: it is read again, a key + /// one read showed current stays so, and one no read shows current + /// throws `appConnectKeysOutOfDate`. Throws the read's failure when no + /// read answered, or when an answer cannot be read. private func encryptionKeysAreCurrent( of intent: AppConnect.ConnectionIntent, in snapshot: AppConnect.IdentitySnapshot, context: Context ) async throws -> Bool { @@ -1335,23 +1338,31 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard !expected.isEmpty else { return true } let identityId = context.identityId.toBase58String() let purposes = expected.keys.sorted { $0.rawValue < $1.rawValue } + let all = expected.flatMap { purpose, keys in keys.map { (purpose, $0) } } + var matched = Set() + var answered = false var failure: Error? for attempt in 0 ... 2 { if attempt > 0 { await Self.pauseForLaggingNode(attempt) } do { let current = try await Self.readCurrentContractKeys( sdk: context.sdk, identityId: identityId, appId: intent.appId.toBase58String(), purposes: purposes) - if expected.allSatisfy({ purpose, keys in keys.allSatisfy { AppConnect.isCurrent(current[purpose], as: $0) } }) { - return true + answered = true + for (index, (purpose, key)) in all.enumerated() { + switch AppConnect.check(current[purpose], against: key) { + case .differs: return false + case .matches: matched.insert(index) + case .notYet: break + } } + if matched.count == all.count { return true } } catch { failure = error - if Self.isUnreadableAnswer(error) { break } + if Self.isUnreadableAnswer(error) { throw Self.failedCurrentKeyRead(error) } } } - // A "no" stands only when every read gave it. - if let failure { throw Self.failedCurrentKeyRead(failure) } - return false + if !answered, let failure { throw Self.failedCurrentKeyRead(failure) } + throw DashConnectPlatformError.appConnectKeysOutOfDate } /// Submits what of `intent` is not on the identity yet, and returns once diff --git a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift index da4b8024a3..8319715587 100644 --- a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift +++ b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift @@ -553,16 +553,19 @@ final class AppConnectProjectionTests: XCTestCase { [.decryption: [Expected(id: 7, data: decryption.data, mayBeNone: false)]], "another key under its id is not asked about") let toRegister = Expected(id: 12, data: added.data, mayBeNone: true) + let resent = Expected(id: 7, data: decryption.data, mayBeNone: false) let ours = AppConnect.CurrentContractKey(keyId: 12, keyType: nil, data: added.data, isDisabled: false) let other = AppConnect.CurrentContractKey(keyId: 5, keyType: nil, data: Data(repeating: 5, count: 33), isDisabled: false) let disabledOther = AppConnect.CurrentContractKey(keyId: 5, keyType: nil, data: Data(repeating: 5, count: 33), isDisabled: true) let sameIdOtherKey = AppConnect.CurrentContractKey(keyId: 12, keyType: nil, data: Data(repeating: 9, count: 33), isDisabled: false) - XCTAssertFalse(AppConnect.isCurrent(disabledOther, as: toRegister), "a disabled current key is still a current key") - XCTAssertFalse(AppConnect.isCurrent(sameIdOtherKey, as: toRegister), "another key under its id") - XCTAssertTrue(AppConnect.isCurrent(nil, as: toRegister), "none current yet") - XCTAssertTrue(AppConnect.isCurrent(ours, as: toRegister), "it landed and the identity read was behind") - XCTAssertFalse(AppConnect.isCurrent(other, as: toRegister), "another key became current") - XCTAssertFalse(AppConnect.isCurrent(nil, as: Expected(id: 7, data: decryption.data, mayBeNone: false))) + let resentOff = AppConnect.CurrentContractKey(keyId: 7, keyType: nil, data: decryption.data, isDisabled: true) + XCTAssertEqual(AppConnect.check(nil, against: toRegister), .matches, "none current yet") + XCTAssertEqual(AppConnect.check(ours, against: toRegister), .matches, "it landed and the identity read was behind") + XCTAssertEqual(AppConnect.check(other, against: toRegister), .differs, "another key became current") + XCTAssertEqual(AppConnect.check(disabledOther, against: toRegister), .differs, "a disabled current key is still a current key") + XCTAssertEqual(AppConnect.check(sameIdOtherKey, against: toRegister), .differs, "another key under its id") + XCTAssertEqual(AppConnect.check(nil, against: resent), .notYet, "the node that answered may be behind") + XCTAssertEqual(AppConnect.check(resentOff, against: resent), .differs) } func testAResponseIsResentOnlyWhileItsEncryptionKeysCanBeUsed() { From 4f166110519225466f0e6af06b9ae0f3bc676ac3 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 3 Nov 2026 19:56:09 +0200 Subject: [PATCH 080/108] refactor(dashconnect): answer a request at most once; show undelivered connections A request is answered at most once, by any identity of the wallet. Once an approval's intent is recorded, any failure of its update, of the checks before publishing, or of the publish spends the request: the sheet shows why, offers no Approve, the app is told the request failed, and it asks again with a new code. A sealed response is never published by a later attempt, since the wallet cannot prove that what it was sealed for still holds. The retry machinery goes with it (the recorded approved slots, the plan comparison, resumption). A connection whose keys are live but whose response was never published shows as "Not delivered", with Disconnect. A response that landed without confirming is looked up on Platform when the same request is approved again and when Connections refreshes, so a working connection is not shown as undelivered. Superseded grants of the connection are settled whether the approval succeeded or not. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectProjection.swift | 57 +--- .../DashConnect/DashConnectModels.swift | 8 +- .../PlatformDashConnectDataSource.swift | 319 +++++++++++------- .../Components/ConnectionStatusBadge.swift | 13 +- .../UI/DashConnect/ConnectionsScreen.swift | 10 + .../UI/DashConnect/ConnectionsViewModel.swift | 8 +- DashWallet/ar.lproj/Localizable.strings | 3 + DashWallet/bg.lproj/Localizable.strings | 3 + DashWallet/ca.lproj/Localizable.strings | 3 + DashWallet/cs.lproj/Localizable.strings | 3 + DashWallet/da.lproj/Localizable.strings | 3 + DashWallet/de.lproj/Localizable.strings | 3 + DashWallet/el.lproj/Localizable.strings | 3 + DashWallet/en.lproj/Localizable.strings | 3 + DashWallet/eo.lproj/Localizable.strings | 3 + DashWallet/es.lproj/Localizable.strings | 3 + DashWallet/et.lproj/Localizable.strings | 3 + DashWallet/fa.lproj/Localizable.strings | 3 + DashWallet/fi.lproj/Localizable.strings | 3 + DashWallet/fil.lproj/Localizable.strings | 3 + DashWallet/fr.lproj/Localizable.strings | 3 + DashWallet/hr.lproj/Localizable.strings | 3 + DashWallet/hu.lproj/Localizable.strings | 3 + DashWallet/id.lproj/Localizable.strings | 3 + DashWallet/it.lproj/Localizable.strings | 3 + DashWallet/ja.lproj/Localizable.strings | 3 + DashWallet/ko.lproj/Localizable.strings | 3 + DashWallet/mk.lproj/Localizable.strings | 3 + DashWallet/ms.lproj/Localizable.strings | 3 + DashWallet/nb.lproj/Localizable.strings | 3 + DashWallet/nl.lproj/Localizable.strings | 3 + DashWallet/pl.lproj/Localizable.strings | 3 + DashWallet/pt.lproj/Localizable.strings | 3 + DashWallet/ro.lproj/Localizable.strings | 3 + DashWallet/ru.lproj/Localizable.strings | 3 + DashWallet/sk.lproj/Localizable.strings | 3 + DashWallet/sl.lproj/Localizable.strings | 3 + DashWallet/sl_SI.lproj/Localizable.strings | 3 + DashWallet/sq.lproj/Localizable.strings | 3 + DashWallet/sr.lproj/Localizable.strings | 3 + DashWallet/sv.lproj/Localizable.strings | 3 + DashWallet/th.lproj/Localizable.strings | 3 + DashWallet/tr.lproj/Localizable.strings | 3 + DashWallet/uk.lproj/Localizable.strings | 3 + DashWallet/vi.lproj/Localizable.strings | 3 + DashWallet/zh-Hans.lproj/Localizable.strings | 3 + .../zh-Hant-TW.lproj/Localizable.strings | 3 + DashWallet/zh.lproj/Localizable.strings | 3 + DashWallet/zh_TW.lproj/Localizable.strings | 3 + .../AppConnectProjectionTests.swift | 74 ++-- 50 files changed, 394 insertions(+), 224 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift index 18aa10f033..5c680260df 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift @@ -17,13 +17,6 @@ import SwiftDashSDK extension AppConnect { // MARK: Stored - /// One encryption slot of an approval: what the key is for, and the - /// contract it is bound to. - struct ApprovedSlot: Codable, Equatable { - let purpose: KeyPurpose - let contractId: Data - } - /// One key an intent submits, exactly as it is submitted. struct IntendedKey: Codable, Equatable { let id: UInt32 @@ -61,13 +54,10 @@ extension AppConnect { /// The identity's encryption keys the response carries without adding /// them, in slot order. let sentEncryptionKeyIds: [UInt32] - /// The encryption slots the user approved, in the plan's order. Nil - /// in a row written before it was kept: a retry of it is refused. - let approvedEncryption: [ApprovedSlot]? /// The ids of earlier auth keys the same update turns off. let disables: [UInt32] - /// The response, sealed before the submit, so a retry publishes the - /// same values and a disconnect deletes them by those values. + /// The response, sealed before the submit, so a disconnect deletes it + /// by its values. let response: ResponseValues /// Set once the response is known to be on Platform. var responseDocumentId: Data? @@ -220,6 +210,9 @@ extension AppConnect { /// names: granted on another device, or before a restore. Keyed by /// identity. let unrecordedKeyIds: [Data: [UInt32]] + /// The app's live access comes only from approvals whose response + /// was never published: it holds keys it never got. + var isUndelivered = false var id: Data { appId } } @@ -336,13 +329,20 @@ extension AppConnect { let apps = Set(intents.map(\.appId)).union(unrecorded.keys) let connections: [ProjectedConnection] = apps.compactMap { app in let own = intents.filter { $0.appId == app }.sorted { $0.createdAt > $1.createdAt } - var statuses = own.compactMap { intent in byIdentity[intent.identityId].map { status(of: intent, in: $0) } } + let ownStatuses = own.compactMap { intent in byIdentity[intent.identityId].map { (intent, status(of: intent, in: $0)) } } + var statuses = ownStatuses.map(\.1) let others = unrecorded[app] ?? [:] if !others.isEmpty { statuses.append(.active(expiresAt: nil)) } // An app this read says nothing about (its intents are on // identities not read) has no connection here. guard let best = statuses.min(by: { rank($0) < rank($1) }) else { return nil } - return ProjectedConnection(appId: app, status: best, intents: own, unrecordedKeyIds: others) + let delivering = ownStatuses.compactMap { intent, status -> ConnectionIntent? in + guard case .active = status else { return nil } + return intent + } + let isUndelivered = others.isEmpty && !delivering.isEmpty && delivering.allSatisfy { $0.responseDocumentId == nil } + return ProjectedConnection( + appId: app, status: best, intents: own, unrecordedKeyIds: others, isUndelivered: isUndelivered) } return Projection( connections: connections.sorted { $0.appId.lexicographicallyPrecedes($1.appId) }, @@ -465,17 +465,6 @@ extension AppConnect { intent.keys.contains { presence(of: $0, in: snapshot) == .conflicting } } - /// Whether a retry of a request may carry on with its intent: its keys - /// are live or may still land, none of its ids is held by another key, - /// and the user has not disconnected it. - static func mayResume(_ intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> Bool { - guard intent.closedAt == nil, !hasConflict(intent, in: snapshot) else { return false } - switch status(of: intent, in: snapshot) { - case .active, .confirming: return true - case .expired, .disconnected, .neverLanded: return false - } - } - /// What a disconnect of one app submits on one identity. struct DisconnectPlan: Equatable { /// The app's auth keys still enabled: live or expired. Platform still @@ -542,10 +531,6 @@ extension AppConnect { } } - static func approvedSlots(of plan: GrantPlan) -> [ApprovedSlot] { - plan.encryption.map { ApprovedSlot(purpose: $0.keyPurpose, contractId: $0.binding.contractId) } - } - /// Whether the auth keys of `intent` that are on the identity hold no more /// than `plan` grants now: an authorized limits update may have raised /// a key's budget or lifetime after it landed. No budget means no cap. @@ -557,20 +542,6 @@ extension AppConnect { } } - /// Whether a retry of a request may submit `intent` again under what - /// the user approved now: the same keys, each with the level, bound and - /// budget the plan grants, and an expiry no later than the plan's. - static func isWithinPlan(_ intent: ConnectionIntent, _ plan: GrantPlan) -> Bool { - let auth = intent.authKeys - guard intent.appId == plan.appId, intent.connectionId == plan.connectionId, auth.count == plan.auth.count, - intent.approvedEncryption == approvedSlots(of: plan) else { return false } - return zip(auth, plan.auth).allSatisfy { key, grant in - key.securityLevel == grant.securityLevel && key.bound == grant.storedBound - && key.totalBudget == grant.totalBudget - && (key.expiresAt ?? .max) <= grant.expiresAt - } - } - // MARK: Fence /// The leaf a fence key is derived at: one per identity and key id, so diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 01a661d837..0066a8a715 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -141,12 +141,16 @@ extension DashConnectTokenPurchaseRequest { } /// Lifecycle of an app connection. `active` means an approval's keys are -/// live on an identity of this wallet, whether or not its response was -/// published; `confirming` means its identity update may still land. +/// live on an identity of this wallet; `undelivered` means they are live but +/// the app never got its response; `confirming` means an identity update may +/// still land. enum ConnectionStatus: String, Codable, CaseIterable { /// An App Connect approval whose identity update may still land. case confirming case active + /// The app's keys are live, but its response was never published: the + /// app holds keys it cannot use. Only a disconnect or a new QR helps. + case undelivered init(from decoder: Decoder) throws { let container = try decoder.singleValueContainer() diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 7756e32ddb..78fc87e8c7 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -866,7 +866,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { var result = rows.filter { !shownIds.contains($0.id) && heldElsewhere.contains($0.id) } for connection in projection.connections { let id = connection.appId.toBase58String() - guard let status = shownStatus(connection.status) else { continue } + guard var status = shownStatus(connection.status) else { continue } + if status == .active && connection.isUndelivered { status = .undelivered } let existing = rows.first { $0.id == id } let latest = connection.intents.first let fallback = DashConnectFallbackAppMetadata.resolve(contractId: id, unauthenticatedLabel: "") @@ -890,9 +891,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// /// The intent is written before the update is submitted and names every /// key it adds, so whatever happens to the update, the keys are found - /// and can be turned off. Approving the same request again finds its - /// intent, submits what has not landed and publishes the recorded - /// response. + /// and can be turned off. A request is answered at most once: approving + /// it again after it stopped is refused, and the app asks anew. private func approveAppConnectV2Login( _ uri: AppConnectUri, plan: AppConnect.GrantPlan, @@ -915,123 +915,205 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { "This sign-in request has expired. Ask the app for a new one.", comment: "DashConnect App Connect v2")) } - let request = uri.request - let signer = KeychainSigner(modelContainer: context.modelContainer) - let (snapshot, currentPublicKeys) = try await identitySnapshot(context: context) - - let intent: AppConnect.ConnectionIntent + // A request is answered at most once, by any identity of the wallet. + // One this identity answered already is done; any other is spent: a + // sealed response is never published by a later attempt, as what it + // was sealed for may no longer hold. The app asks again. if let earlier = stores.intents.load().first(where: { - $0.identityId == context.identityId && $0.appId == plan.appId - && $0.requestHash == plan.appEphemeralPubKeyHash + $0.appId == plan.appId && $0.requestHash == plan.appEphemeralPubKeyHash }) { - // A retry: the same keys and response, within what was approved - // now, and only while the identity still has the encryption keys - // the response carries. Turned off, expired, never to land, with - // no record of its slots, or another connection's: Platform never - // adds a key twice, so the app has to ask again. - guard AppConnect.mayResume(earlier, in: snapshot), earlier.approvedEncryption != nil, - earlier.connectionId == plan.connectionId else { - throw DashConnectPlatformError.sessionKeyUnusable - } - guard AppConnect.isWithinPlan(earlier, plan) else { throw DashConnectPlatformError.approvalOutOfDate } - guard AppConnect.authKeysUsable(earlier, in: snapshot) else { - throw DashConnectPlatformError.sessionKeyUnusable + guard earlier.identityId == context.identityId, earlier.closedAt == nil else { + throw Self.spentRequest(after: nil) } - // Checked before the update too: a refusal after it would leave - // the connection's earlier keys off and the new ones undelivered. - guard AppConnect.encryptionKeysUsable(earlier, in: snapshot) else { - throw DashConnectPlatformError.appConnectEncryptionKeyChanged - } - if earlier.responseDocumentId == nil, !AppConnect.hasLanded(earlier, in: snapshot), - try await !encryptionKeysAreCurrent(of: earlier, in: snapshot, context: context) { - throw DashConnectPlatformError.appConnectEncryptionKeyChanged - } - intent = earlier - } else { - intent = try await newAppConnectIntent( - request: request, plan: plan, consent: consent, snapshot: snapshot, - currentPublicKeys: currentPublicKeys, context: context) - updateIntents(in: stores) { $0.append(intent) } - guard stores.intents.load().contains(where: { $0.id == intent.id }) else { - throw DashConnectPlatformError.grantNotRecorded + if earlier.responseDocumentId == nil { + // A publish can land without confirming. A lookup that fails + // says nothing, and the approval can be tried again. + guard let published = try await Self.findAppConnectResponse( + ownerIdentityId: context.identityId, appEphemeralPubKeyHash: earlier.requestHash, + responseContractId: responseContractId, sdk: context.sdk) else { + throw Self.spentRequest(after: nil) + } + recordResponse(published.documentId, of: earlier.id, in: stores) + if let read = try? await identitySnapshot(context: context).snapshot { + await refreshRows(from: read, context: context) + } } + return Self.connection(consent: consent, at: now()) + } + let request = uri.request + let signer = KeychainSigner(modelContainer: context.modelContainer) + let (snapshot, currentPublicKeys) = try await identitySnapshot(context: context) + let intent = try await newAppConnectIntent( + request: request, plan: plan, consent: consent, snapshot: snapshot, + currentPublicKeys: currentPublicKeys, context: context) + updateIntents(in: stores) { $0.append(intent) } + guard stores.intents.load().contains(where: { $0.id == intent.id }) else { + throw DashConnectPlatformError.grantNotRecorded } // The row goes with the intent, before anything is submitted: however // the update ends, the user can turn the connection off. await refreshRows(from: snapshot, context: context) + do { + try await submitAndPublish( + intent, request: request, plan: plan, snapshot: snapshot, responseContractId: responseContractId, + context: context, signer: signer) + } catch { + // The request is spent from here on: the row shows where it + // stopped, and the app asks again. + await settle(after: intent, responseContractId: responseContractId, context: context, signer: signer) + throw Self.spentRequest(after: error) + } + await settle(after: intent, responseContractId: responseContractId, context: context, signer: signer) + return Self.connection(consent: consent, at: now()) + } + /// After an approval ends, however it ended: the earlier grants of the + /// connection whose keys are off are done, and their responses go with + /// them; the rows follow a fresh read. + private func settle( + after intent: AppConnect.ConnectionIntent, responseContractId: Data, context: Context, signer: KeychainSigner + ) async { + let stores = context.stores + guard let read = try? await identitySnapshot(context: context).snapshot else { + // The row is put right by the next read, at the latest when + // Connections opens. + Self.logger.info("🔗 DASHCONNECT :: identity not read after the approval; its row is refreshed later") + return + } + let superseded = intent.connectionId.map { connectionId in + stores.intents.load().filter { + $0.id != intent.id && $0.identityId == context.identityId && $0.appId == intent.appId + && $0.connectionId == connectionId + && $0.closedAt == nil && [.disconnected, .neverLanded].contains(AppConnect.status(of: $0, in: read)) + } + } ?? [] + if !superseded.isEmpty { + let closedAt = now() + let ids = Set(superseded.map(\.id)) + updateIntents(in: stores) { intents in + for index in intents.indices where ids.contains(intents[index].id) { intents[index].closedAt = closedAt } + } + await deleteResponses(of: Array(ids), responseContractId: responseContractId, context: context, signer: signer) + } + await refreshRows(from: read, context: context) + } + + /// Submits the new intent's update and publishes its sealed response, + /// once a read shows the update and the keys it carries still hold. + private func submitAndPublish( + _ intent: AppConnect.ConnectionIntent, + request: AppConnectRequest, + plan: AppConnect.GrantPlan, + snapshot: AppConnect.IdentitySnapshot, + responseContractId: Data, + context: Context, + signer: KeychainSigner + ) async throws { try await submitIntent(intent, request: request, plan: plan, snapshot: snapshot, context: context, signer: signer) + let stores = context.stores guard stores.intents.load().first(where: { $0.id == intent.id })?.closedAt == nil else { throw DashConnectPlatformError.sessionKeyUnusable } - // The response carries the keys' secrets. Keys that were there before - // this update (an earlier try, another device) are released only - // while they hold no more than the sheet showed; a key this update - // added holds what the plan grants. No key it carries may have been - // turned off meanwhile, and each encryption key must still be the - // app's current one. The identity is read again for it, until a read - // shows the update (a node may be behind); when none does, nothing is - // published, and a retry takes it up. - if intent.responseDocumentId == nil { - var shown: AppConnect.IdentitySnapshot? - var readFailure: Error? - for attempt in 0 ... 2 where shown == nil { - if attempt > 0 { await Self.pauseForLaggingNode(attempt) } - do { - let read = try await identitySnapshot(context: context).snapshot - readFailure = nil - if AppConnect.hasLanded(intent, in: read) { shown = read } - } catch { - Self.logger.error("🔗 DASHCONNECT :: identity not read before publishing — \(error.localizedDescription, privacy: .public)") - readFailure = error - } - } - guard let current = shown else { - if let readFailure { throw readFailure } - Self.logger.error("🔗 DASHCONNECT :: no read shows the identity update before publishing") - throw DashConnectPlatformError.identityReadBehind - } - guard AppConnect.landedKeysWithinPlan(intent, plan, in: current), - AppConnect.authKeysUsable(intent, in: current) else { - throw DashConnectPlatformError.sessionKeyUnusable - } - guard AppConnect.encryptionKeysUsable(intent, in: current), - try await encryptionKeysAreCurrent(of: intent, in: current, context: context) else { - throw DashConnectPlatformError.appConnectEncryptionKeyChanged + // The response carries the keys' secrets. Its keys may hold no more + // than the sheet showed, none may have been turned off meanwhile, and + // each encryption key must still be the app's current one. The + // identity is read again for it, until a read shows the update (a node + // may be behind); when none does, nothing is published. + var shown: AppConnect.IdentitySnapshot? + var readFailure: Error? + for attempt in 0 ... 2 where shown == nil { + if attempt > 0 { await Self.pauseForLaggingNode(attempt) } + do { + let read = try await identitySnapshot(context: context).snapshot + readFailure = nil + if AppConnect.hasLanded(intent, in: read) { shown = read } + } catch { + Self.logger.error("🔗 DASHCONNECT :: identity not read before publishing — \(error.localizedDescription, privacy: .public)") + readFailure = error } } + guard let current = shown else { + if let readFailure { throw readFailure } + Self.logger.error("🔗 DASHCONNECT :: no read shows the identity update before publishing") + throw DashConnectPlatformError.identityReadBehind + } + guard AppConnect.landedKeysWithinPlan(intent, plan, in: current), + AppConnect.authKeysUsable(intent, in: current) else { + throw DashConnectPlatformError.sessionKeyUnusable + } + guard AppConnect.encryptionKeysUsable(intent, in: current), + try await encryptionKeysAreCurrent(of: intent, in: current, context: context) else { + throw DashConnectPlatformError.appConnectEncryptionKeyChanged + } try await publishResponse(of: intent, responseContractId: responseContractId, context: context, signer: signer) - if let read = try? await identitySnapshot(context: context).snapshot { - // The earlier grants of this connection are done once their keys - // are off; their responses go with them. - let superseded = intent.connectionId.map { connectionId in - stores.intents.load().filter { - $0.id != intent.id && $0.identityId == context.identityId && $0.appId == intent.appId - && $0.connectionId == connectionId - && $0.closedAt == nil && [.disconnected, .neverLanded].contains(AppConnect.status(of: $0, in: read)) - } - } ?? [] - if !superseded.isEmpty { - let closedAt = now() - let ids = Set(superseded.map(\.id)) - updateIntents(in: stores) { intents in - for index in intents.indices where ids.contains(intents[index].id) { intents[index].closedAt = closedAt } + } + + /// Records the response of each open intent whose keys are live but + /// whose response this wallet did not record publishing: a publish can + /// land without confirming, and its row would show "Not delivered". + private func recordPublishedResponses(in snapshot: AppConnect.IdentitySnapshot, context: Context) async { + guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { return } + // A publish lands within the approval that made it, minutes after + // the request; an intent a day old has nothing more to find. + let since = now().addingTimeInterval(-24 * 60 * 60) + let unrecorded = context.stores.intents.load().filter { intent in + guard intent.identityId == snapshot.identityId, intent.closedAt == nil, intent.responseDocumentId == nil, + intent.createdAt > since, case .active = AppConnect.status(of: intent, in: snapshot) else { return false } + return true + } + guard !unrecorded.isEmpty else { return } + let identityId = context.identityId + let sdk = context.sdk + let found = await withTaskGroup(of: (UUID, Data)?.self) { group in + for intent in unrecorded { + group.addTask { + guard let published = try? await Self.findAppConnectResponse( + ownerIdentityId: identityId, appEphemeralPubKeyHash: intent.requestHash, + responseContractId: responseContractId, sdk: sdk) else { return nil } + return (intent.id, published.documentId) } - await deleteResponses( - of: Array(ids), responseContractId: responseContractId, context: context, signer: signer) } - await refreshRows(from: read, context: context) - } else { - // The row is put right by the next read, at the latest when - // Connections opens. - Self.logger.info("🔗 DASHCONNECT :: identity not read after the approval; its row is refreshed later") + return await group.reduce(into: [UUID: Data]()) { found, pair in + if let pair { found[pair.0] = pair.1 } + } } - return DAppConnection( + guard !found.isEmpty else { return } + Self.logger.info("🔗 DASHCONNECT :: \(found.count, privacy: .public) response(s) published without confirming were found") + for (id, documentId) in found { recordResponse(documentId, of: id, in: context.stores) } + } + + /// The error of a request that cannot be approved again: what stopped + /// it, when that says something the user can act on, and that the app has + /// to ask anew. A refusal with the `failed` status, so the sheet offers no + /// Approve and the app is told the request failed. Causes whose own text + /// would advise trying again are logged, not shown. + private static func spentRequest(after cause: Error?) -> AppConnect.Refusal { + let spent = DashConnectPlatformError.sessionKeyUnusable.localizedDescription + guard let cause else { return AppConnect.Refusal(.failed, spent) } + logger.error("🔗 DASHCONNECT :: the request is spent — \(cause.localizedDescription, privacy: .public)") + // A refusal says what to do itself (update the wallet, for one). + if let refusal = cause as? AppConnect.Refusal { return refusal } + let platformError = cause as? DashConnectPlatformError + // Its own text already sends the user to the app. + if platformError == .appConnectEncryptionKeyChanged { return AppConnect.Refusal(.failed, cause.localizedDescription) } + let retrying: [DashConnectPlatformError] = [ + .sessionKeyUnusable, .identityReadBehind, .approvalOutOfDate, .appConnectKeysOutOfDate, .appConnectKeysUnreadable, + .walletChanged, .identityKeysOutOfDate, + ] + if cause is CancellationError || platformError.map(retrying.contains) == true { + return AppConnect.Refusal(.failed, spent) + } + return AppConnect.Refusal(.failed, "\(cause.localizedDescription) \(spent)") + } + + /// The row an answered approval shows. + private static func connection(consent: ConnectionRequest, at updatedAt: Date) -> DAppConnection { + DAppConnection( id: consent.appContractId, name: consent.appLabel.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : consent.appLabel, url: consent.appUrl, status: .active, - updatedAt: now()) + updatedAt: updatedAt) } /// The intent of a new approval: the keys it adds under ids no key or @@ -1143,7 +1225,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { connectionId: plan.connectionId, keys: keys, sentEncryptionKeyIds: encryption.compactMap(\.keyId).filter { !added.contains($0) }, - approvedEncryption: AppConnect.approvedSlots(of: plan), disables: superseded, response: response, responseDocumentId: nil, @@ -1378,10 +1459,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { context: Context, signer: KeychainSigner ) async throws { - guard !AppConnect.hasLanded(intent, in: snapshot) else { - await refreshRows(from: snapshot, context: context) - return - } let missing = intent.keys.filter { AppConnect.presence(of: $0, in: snapshot) == .missing } let disable = AppConnect.outstandingDisables(of: intent, in: snapshot) @@ -1389,8 +1466,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // request, and of the encryption keys, from the wallet. var signingKeys: [(publicKey: Data, privateKey: Data)] = [] defer { for index in signingKeys.indices { Self.zero(&signingKeys[index].privateKey) } } - // Intent auth keys are in the order of the plan's bindings - // (`isWithinPlan`). + // Intent auth keys are in the order of the plan's bindings. let bindingIndexes = Dictionary(uniqueKeysWithValues: zip(intent.authKeys.map(\.id), plan.auth.map(\.bindingIndex))) for key in missing where key.isAuthentication { guard let index = bindingIndexes[key.id] else { throw DashConnectPlatformError.approvalOutOfDate } @@ -1441,29 +1517,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard let read = try? await identitySnapshot(context: context).snapshot else { continue } if AppConnect.hasLanded(intent, in: read) { Self.logger.info("🔗 DASHCONNECT :: the identity update landed without confirming") - await refreshRows(from: read, context: context) return } - if attempt == 2 { await refreshRows(from: read, context: context) } } throw error } Self.logger.info("🔗 DASHCONNECT :: identity updated") } - /// Publishes the response `intent` sealed, unless it is already there. - /// A publish can land without confirming, and the response is unique per - /// request and identity, so a refused retry is checked against Platform. + /// Publishes the response `intent` sealed. A publish can land without + /// confirming, and the response is unique per request and identity, so + /// a failed one is checked against Platform. private func publishResponse( of intent: AppConnect.ConnectionIntent, responseContractId: Data, context: Context, signer: KeychainSigner ) async throws { - guard intent.responseDocumentId == nil else { - Self.logger.info("🔗 DASHCONNECT :: response already published for this request") - return - } Self.logger.info("🔗 DASHCONNECT :: publishing loginKeyResponse") let documentId: Data do { @@ -1475,7 +1545,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer) Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse published") } catch { - guard let published = try? await findAppConnectResponse( + guard let published = try? await Self.findAppConnectResponse( ownerIdentityId: context.identityId, appEphemeralPubKeyHash: intent.requestHash, responseContractId: responseContractId, @@ -1486,8 +1556,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse was already published") documentId = published.documentId } - updateIntents(in: context.stores) { intents in - guard let index = intents.firstIndex(where: { $0.id == intent.id }) else { return } + recordResponse(documentId, of: intent.id, in: context.stores) + } + + /// Records that the response of the intent `id` is on Platform. + private func recordResponse(_ documentId: Data, of id: UUID, in stores: Stores) { + updateIntents(in: stores) { intents in + guard let index = intents.firstIndex(where: { $0.id == id }) else { return } intents[index].responseDocumentId = documentId intents[index].responseRemoved = false } @@ -1506,7 +1581,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { do { // Deleted by the values it has on Platform, which are this // intent's unless another install answered the same request. - guard let found = try await findAppConnectResponse( + guard let found = try await Self.findAppConnectResponse( ownerIdentityId: context.identityId, appEphemeralPubKeyHash: intent.requestHash, responseContractId: responseContractId, @@ -1530,7 +1605,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // A delete can land without confirming; only Platform says. // A lookup that fails says nothing. do { - let remaining = try await findAppConnectResponse( + let remaining = try await Self.findAppConnectResponse( ownerIdentityId: context.identityId, appEphemeralPubKeyHash: intent.requestHash, responseContractId: responseContractId, @@ -1553,7 +1628,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// This identity's response to one request, with the values it has on /// Platform, or `nil` when there is none; a failed lookup or a response /// that cannot be read throws. - private func findAppConnectResponse( + private static func findAppConnectResponse( ownerIdentityId: Data, appEphemeralPubKeyHash: Data, responseContractId: Data, @@ -1807,7 +1882,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { try await gated { guard let stores = await showActiveWalletRows() else { return } let context = try await requireContext(pinnedTo: stores) - await refreshRows(from: try await identitySnapshot(context: context).snapshot, context: context) + let snapshot = try await identitySnapshot(context: context).snapshot + await recordPublishedResponses(in: snapshot, context: context) + await refreshRows(from: snapshot, context: context) } } catch { Self.logger.info("🔗 DASHCONNECT :: connections not refreshed — \(error.localizedDescription, privacy: .public)") diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionStatusBadge.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionStatusBadge.swift index 3a0980161e..5d03863021 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionStatusBadge.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionStatusBadge.swift @@ -53,10 +53,15 @@ struct ConnectionStatusBadge: View { } } - /// Green only once the connection is live; `confirming` (waiting for the - /// network) reads as neutral blue. + /// Green once the connection is live; `confirming` (waiting for the + /// network) reads as neutral blue, and `undelivered` (keys the app never + /// got) as orange. private var dotColor: Color { - status == .active ? Color.dash.green : Color.dash.blue + switch status { + case .active: return Color.dash.green + case .confirming: return Color.dash.blue + case .undelivered: return Color.dash.orange + } } private var title: String { @@ -65,6 +70,8 @@ struct ConnectionStatusBadge: View { return NSLocalizedString("Confirming", comment: "DashConnect: an approval whose identity update may still land") case .active: return NSLocalizedString("Active", comment: "DashConnect") + case .undelivered: + return NSLocalizedString("Not delivered", comment: "DashConnect: keys are on the identity, but the app never got its response") } } } diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 47e0a34256..88bc0494e5 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -226,6 +226,16 @@ struct ConnectionsScreen: View { ) } +#Preview("Not Delivered") { + ConnectionsScreen( + vc: UINavigationController(), + viewModel: ConnectionsViewModel( + dataSource: MockDashConnectDataSource(initial: [MockDashConnectDataSource.sample(.undelivered)]), + featureUnavailable: false + ) + ) +} + #Preview("Active") { ConnectionsScreen( vc: UINavigationController(), diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 3e5898746f..058f01258c 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -255,6 +255,7 @@ final class ConnectionsViewModel: ObservableObject { // instead of Approve; when it can again, the note says why // the approval did not go through. let rebuilt = await dataSource.makeConnectionRequest(from: pendingLoginRequest) + self.pendingFailureStatus = nil self.pendingRequest = rebuilt self.approveError = rebuilt.login == .unresolved ? nil : DashConnectPlatformError.loginUnresolved.localizedDescription @@ -296,9 +297,10 @@ final class ConnectionsViewModel: ObservableObject { func denyPendingRequest() { guard !isApproving else { return } - // A refused request never showed where it would return, so its - // callback is not opened. - if let pendingLoginRequest, pendingRequest?.login.isApprovable == true { + // A request refused when it was read never showed where it would + // return, so its callback is not opened. One that failed on approval + // did, and the app is told. + if let pendingLoginRequest, pendingRequest?.login.isApprovable == true || pendingFailureStatus == .failed { openCallback(of: pendingLoginRequest, status: pendingFailureStatus ?? .declined) } pendingRequest = nil diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 0c408e60a2..8da2f21c2d 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 3e38104895..977835114a 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index cd5ee99858..7a1a58a56a 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 4cdb9c49e4..8bc9858727 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 54d2ee1948..a434661cb6 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 14eb5a1fd2..9ee8c4b8a4 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 329936d7ee..e30a39146e 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 15942cf50f..b79e7f69e9 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6103,6 +6103,9 @@ "App contract" = "App contract"; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 037b94f23a..e142c11ab0 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 88fa992c04..905b282c85 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index ea62ba86fe..e48787c447 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 3e0fff1d85..71e6889434 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 3d43358a4c..84d86cf73b 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index f5b701555c..7878eb10f2 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 079d0cadd8..4906ecc419 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 8430867f06..8d4f94df7c 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 6f755cc05b..78fb5eb1cd 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 4a80953718..2bb3516e81 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index b0bce8b2d8..eb07bad607 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 66f29aaf41..c9d85a41c9 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index e69dca032c..fa95a51df1 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 2067afdb0b..629de6fbee 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index ee3570e4ff..88dc0586a7 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 710ad9f27b..840c0a9c45 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 42d9d5f901..8e35136448 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 65868915be..b34ee32f60 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 6afa6e9095..c0a364c02f 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index ad2ec11273..d865f96b6f 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 3da335958e..610c3f1ce0 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index f87ce5e633..7c56c2bd1d 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 8b05269561..c41309e275 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 0b97c20a76..7f5567a141 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index b98bb06760..ee587d6350 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 7711c80074..c59ce03f2d 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 8781b30d3e..6a17622823 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index fc39e058db..9cae44f14b 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index d6d08422f7..8704f90512 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 2244f0d3bd..98aecd0042 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index eee300f958..2595da3767 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 522c1657fa..f9cf3c5434 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index f8de54a708..388d1d70d3 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index ceeaa7dbc5..f8618eae29 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index bc41738446..a5182e1839 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect: keys are on the identity, but the app never got its response */ +"Not delivered" = "Not delivered"; + /* DashConnect App Connect v1 */ "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code." = "This app uses an older sign-in that this wallet no longer supports. Ask the app for a new code."; diff --git a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift index 8319715587..7b4ca57833 100644 --- a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift +++ b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift @@ -47,7 +47,7 @@ final class AppConnectProjectionTests: XCTestCase { ) -> Intent { Intent( id: UUID(), identityId: identity, appId: app, appLabel: "App", appUrl: "", requestHash: Data(repeating: 0xEE, count: 20), - connectionId: nil, keys: keys, sentEncryptionKeyIds: [], approvedEncryption: [], disables: [], + connectionId: nil, keys: keys, sentEncryptionKeyIds: [], disables: [], response: AppConnect.ResponseValues(appEphemeralPubKeyHash: "ee", walletEphemeralPubKey: "02", encryptedPayload: "00"), responseDocumentId: published ? Data(repeating: 0xDD, count: 32) : nil, responseRemoved: !published, createdAt: Date(timeIntervalSince1970: createdAt), closedAt: nil) } @@ -321,6 +321,23 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertEqual(rows.last?.name, "App") } + func testAConnectionWhoseResponseWasNeverPublishedShowsAsNotDelivered() { + let key = Self.authKey(10) + let snapshot = Self.snapshot([Self.onPlatform(key)]) + let undelivered = AppConnect.project([snapshot], intents: [Self.intent([key])]) + XCTAssertEqual(undelivered.connections.first?.isUndelivered, true) + XCTAssertEqual( + PlatformDashConnectDataSource.rows([], after: undelivered, intents: [], at: Date(timeIntervalSince1970: 2)).map(\.status), + [.undelivered]) + let delivered = AppConnect.project([snapshot], intents: [Self.intent([key], published: true)]) + XCTAssertEqual(delivered.connections.first?.isUndelivered, false) + XCTAssertEqual( + PlatformDashConnectDataSource.rows([], after: delivered, intents: [], at: Date(timeIntervalSince1970: 2)).map(\.status), + [.active]) + let restored = AppConnect.project([Self.snapshot([Self.onPlatform(key)])], intents: []) + XCTAssertEqual(restored.connections.first?.isUndelivered, false, "keys no intent names are not judged undelivered") + } + func testAnAppConnectRowHeldByAnotherIdentityStays() { let row = DAppConnection( id: Self.otherApp.toBase58String(), name: "Elsewhere", url: "", status: .active, @@ -348,27 +365,6 @@ final class AppConnectProjectionTests: XCTestCase { connectionId: connectionId, identityHint: nil, createdAt: 0, callbackHost: nil) } - func testARetrySubmitsTheIntentOnlyWithinWhatIsApprovedNow() { - let intent = Self.intent([Self.authKey(10)]) - XCTAssertTrue(AppConnect.isWithinPlan(intent, Self.plan())) - XCTAssertTrue(AppConnect.isWithinPlan(intent, Self.plan(expiresAt: Self.now + 5000)), "a later expiry now still covers it") - XCTAssertFalse(AppConnect.isWithinPlan(intent, Self.plan(expiresAt: Self.now + 10)), "it would outlive what is approved now") - XCTAssertFalse(AppConnect.isWithinPlan(intent, Self.plan(budget: 500))) - XCTAssertFalse(AppConnect.isWithinPlan(intent, Self.plan(critical: true))) - XCTAssertFalse( - AppConnect.isWithinPlan(intent, Self.plan(encryption: [.init(contractId: Self.app, purpose: .encryption)])), - "the response would carry slots other than the ones approved now") - let otherConnection = Intent( - id: intent.id, identityId: intent.identityId, appId: intent.appId, appLabel: intent.appLabel, - appUrl: intent.appUrl, requestHash: intent.requestHash, connectionId: Data(repeating: 0xC0, count: 16), - keys: intent.keys, sentEncryptionKeyIds: [], approvedEncryption: [], disables: [], response: intent.response, - responseDocumentId: nil, responseRemoved: true, createdAt: intent.createdAt, closedAt: nil) - XCTAssertFalse(AppConnect.isWithinPlan(otherConnection, Self.plan()), "another connection's intent") - XCTAssertFalse( - AppConnect.isWithinPlan(intent, Self.plan(connectionId: Data(repeating: 0xC0, count: 16))), - "an intent with no connection under a plan with one") - } - // MARK: Fence func testAFenceKeyIsTheSameOnEveryTryAndDiffersPerId() { @@ -426,29 +422,18 @@ final class AppConnectProjectionTests: XCTestCase { } } - func testAnIntentWithNoRecordOfItsSlotsIsNeverResumed() throws { - let intent = Self.intent([Self.authKey(10)]) - let json = try JSONEncoder().encode(intent) - var object = try XCTUnwrap(JSONSerialization.jsonObject(with: json) as? [String: Any]) - object.removeValue(forKey: "approvedEncryption") - let older = try JSONDecoder().decode(Intent.self, from: JSONSerialization.data(withJSONObject: object)) - XCTAssertNil(older.approvedEncryption) - XCTAssertFalse(AppConnect.isWithinPlan(older, Self.plan())) - } - - func testALiveKeyOfAnIntentWithATakenIdStaysActionableButIsNotResumed() { + func testALiveKeyOfAnIntentWithATakenIdStaysActionable() { let a = Self.authKey(10), b = Self.authKey(11) let intent = Self.intent([a, b]) let snapshot = Self.snapshot([Self.onPlatform(a), Self.onPlatform(b, data: Data(repeating: 9, count: 20))]) let projection = AppConnect.project([snapshot], intents: [intent]) XCTAssertEqual(projection.connections.first?.status, .active(expiresAt: Self.now + 1000), "the app keeps a row") - XCTAssertFalse(AppConnect.mayResume(intent, in: snapshot), "its update never lands as a whole") let plan = AppConnect.disconnectPlan(appId: Self.app, snapshot: snapshot, intents: [intent], includeUnrecorded: false) XCTAssertEqual(plan.disable, [10]) XCTAssertEqual(plan.fence, []) } - func testARetryIsRefusedWhenALandedKeyWasGivenMoreSince() { + func testAResponseIsNotReleasedForALandedKeyGivenMoreThanApproved() { let key = Self.authKey(10) let intent = Self.intent([key]) let raised = AppConnect.PlatformKey( @@ -481,7 +466,6 @@ final class AppConnectProjectionTests: XCTestCase { let intent = Self.intent([a, b]) let snapshot = Self.snapshot([Self.onPlatform(a), Self.onPlatform(b, data: Data(repeating: 9, count: 20))]) XCTAssertEqual(AppConnect.status(of: intent, in: snapshot), .expired) - XCTAssertFalse(AppConnect.mayResume(intent, in: snapshot)) XCTAssertEqual( AppConnect.disconnectPlan(appId: Self.app, snapshot: snapshot, intents: [intent], includeUnrecorded: false).disable, [10]) @@ -489,26 +473,13 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertEqual(AppConnect.status(of: intent, in: off), .neverLanded, "nothing enabled is left") } - func testARetryCarriesOnOnlyWhileTheKeysAreLiveOrMayStillLand() { - let key = Self.authKey(10) - var intent = Self.intent([key]) - XCTAssertTrue(AppConnect.mayResume(intent, in: Self.snapshot([]))) - XCTAssertTrue(AppConnect.mayResume(intent, in: Self.snapshot([Self.onPlatform(key)]))) - XCTAssertFalse(AppConnect.mayResume(intent, in: Self.snapshot([Self.onPlatform(key, disabledAt: 1)]))) - XCTAssertFalse(AppConnect.mayResume( - Self.intent([Self.authKey(10, expiresAt: Self.now - 1)]), - in: Self.snapshot([Self.onPlatform(Self.authKey(10, expiresAt: Self.now - 1))]))) - intent.closedAt = Date(timeIntervalSince1970: 5) - XCTAssertFalse(AppConnect.mayResume(intent, in: Self.snapshot([Self.onPlatform(key)])), "the user disconnected it") - } - func testAnIntentHasLandedOnlyOnceTheKeysItTurnsOffAreOff() { let key = Self.authKey(10), earlier = Self.authKey(5) var intent = Self.intent([key]) intent = Intent( id: intent.id, identityId: intent.identityId, appId: intent.appId, appLabel: intent.appLabel, appUrl: intent.appUrl, requestHash: intent.requestHash, connectionId: nil, keys: intent.keys, - sentEncryptionKeyIds: [], approvedEncryption: [], disables: [5], response: intent.response, responseDocumentId: nil, + sentEncryptionKeyIds: [], disables: [5], response: intent.response, responseDocumentId: nil, responseRemoved: true, createdAt: intent.createdAt, closedAt: nil) let addedElsewhere = Self.snapshot([Self.onPlatform(key), Self.onPlatform(earlier)]) XCTAssertFalse(AppConnect.hasLanded(intent, in: addedElsewhere), "the earlier key is still on") @@ -535,7 +506,7 @@ final class AppConnectProjectionTests: XCTestCase { intent = Intent( id: intent.id, identityId: intent.identityId, appId: intent.appId, appLabel: intent.appLabel, appUrl: intent.appUrl, requestHash: intent.requestHash, connectionId: nil, keys: intent.keys, - sentEncryptionKeyIds: [7], approvedEncryption: [], disables: [], response: intent.response, + sentEncryptionKeyIds: [7], disables: [], response: intent.response, responseDocumentId: nil, responseRemoved: true, createdAt: intent.createdAt, closedAt: nil) let decryption = AppConnect.PlatformKey( id: 7, purpose: .decryption, securityLevel: .medium, keyType: .ecdsaSecp256k1, data: Data(repeating: 7, count: 33), @@ -609,7 +580,6 @@ final class AppConnectProjectionTests: XCTestCase { totalBudget: nil, expiresAt: nil, disabledAt: nil) let snapshot = Self.snapshot([other]) XCTAssertEqual(AppConnect.status(of: intent, in: snapshot), .neverLanded) - XCTAssertFalse(AppConnect.mayResume(intent, in: snapshot)) XCTAssertEqual( AppConnect.disconnectPlan(appId: Self.app, snapshot: snapshot, intents: [intent], includeUnrecorded: false).fence, []) From e536c441cbb1073eaab14aceb228926c4fa97631 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 3 Nov 2026 20:36:06 +0200 Subject: [PATCH 081/108] fix(dashconnect): check the read that showed the update before publishing When the identity update does not confirm and a re-read shows it landed, that read is the one the checks before publishing run on (limits, keys off, current encryption keys). A later read may come from a node that is behind and show less, so what the landing read saw stands. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 78fc87e8c7..58aafe7aeb 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1009,7 +1009,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { context: Context, signer: KeychainSigner ) async throws { - try await submitIntent(intent, request: request, plan: plan, snapshot: snapshot, context: context, signer: signer) + let landed = try await submitIntent( + intent, request: request, plan: plan, snapshot: snapshot, context: context, signer: signer) let stores = context.stores guard stores.intents.load().first(where: { $0.id == intent.id })?.closedAt == nil else { throw DashConnectPlatformError.sessionKeyUnusable @@ -1018,8 +1019,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // than the sheet showed, none may have been turned off meanwhile, and // each encryption key must still be the app's current one. The // identity is read again for it, until a read shows the update (a node - // may be behind); when none does, nothing is published. - var shown: AppConnect.IdentitySnapshot? + // may be behind); when none does, nothing is published. A read that + // already showed the update is the one checked: what it saw stands, + // as a later read may be behind and show less. + var shown = landed var readFailure: Error? for attempt in 0 ... 2 where shown == nil { if attempt > 0 { await Self.pauseForLaggingNode(attempt) } @@ -1450,7 +1453,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// every key it adds shows and every key it turns off is off. An update /// that reports a failure may still have landed: the identity is read /// again, and if it does not show the intent the intent stays, shown as - /// confirming, and the failure stands. + /// confirming, and the failure stands. Returns the read that showed the + /// update when the update itself did not confirm, else nil. private func submitIntent( _ intent: AppConnect.ConnectionIntent, request: AppConnectRequest, @@ -1458,7 +1462,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { snapshot: AppConnect.IdentitySnapshot, context: Context, signer: KeychainSigner - ) async throws { + ) async throws -> AppConnect.IdentitySnapshot? { let missing = intent.keys.filter { AppConnect.presence(of: $0, in: snapshot) == .missing } let disable = AppConnect.outstandingDisables(of: intent, in: snapshot) @@ -1517,12 +1521,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard let read = try? await identitySnapshot(context: context).snapshot else { continue } if AppConnect.hasLanded(intent, in: read) { Self.logger.info("🔗 DASHCONNECT :: the identity update landed without confirming") - return + return read } } throw error } Self.logger.info("🔗 DASHCONNECT :: identity updated") + return nil } /// Publishes the response `intent` sealed. A publish can land without From dbffc36dcc3597a731317fa87148fbdf6181aa09 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 3 Nov 2026 21:23:50 +0200 Subject: [PATCH 082/108] fix(dashconnect): keep a scan button and access seen on other identities - The Connections list has a Scan QR button in the navigation bar when it is not empty, so a new code can be scanned after a request is spent. - A row records the identities whose last read showed the app keys no approval names. A read of another identity leaves that knowledge alone, so the row stays, shown as active, until that identity is read again. A disconnect finishes on the active identity and says that keys are left on another one, which has to be made active to turn them off. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/DashConnectModels.swift | 25 +++++++++++ .../Models/DashConnect/DashConnectStore.swift | 8 +++- .../PlatformDashConnectDataSource.swift | 43 +++++++++++++++---- .../UI/DashConnect/ConnectionsScreen.swift | 9 ++++ .../UI/DashConnect/ConnectionsViewModel.swift | 18 ++++++-- DashWallet/ar.lproj/Localizable.strings | 3 ++ DashWallet/bg.lproj/Localizable.strings | 3 ++ DashWallet/ca.lproj/Localizable.strings | 3 ++ DashWallet/cs.lproj/Localizable.strings | 3 ++ DashWallet/da.lproj/Localizable.strings | 3 ++ DashWallet/de.lproj/Localizable.strings | 3 ++ DashWallet/el.lproj/Localizable.strings | 3 ++ DashWallet/en.lproj/Localizable.strings | 3 ++ DashWallet/eo.lproj/Localizable.strings | 3 ++ DashWallet/es.lproj/Localizable.strings | 3 ++ DashWallet/et.lproj/Localizable.strings | 3 ++ DashWallet/fa.lproj/Localizable.strings | 3 ++ DashWallet/fi.lproj/Localizable.strings | 3 ++ DashWallet/fil.lproj/Localizable.strings | 3 ++ DashWallet/fr.lproj/Localizable.strings | 3 ++ DashWallet/hr.lproj/Localizable.strings | 3 ++ DashWallet/hu.lproj/Localizable.strings | 3 ++ DashWallet/id.lproj/Localizable.strings | 3 ++ DashWallet/it.lproj/Localizable.strings | 3 ++ DashWallet/ja.lproj/Localizable.strings | 3 ++ DashWallet/ko.lproj/Localizable.strings | 3 ++ DashWallet/mk.lproj/Localizable.strings | 3 ++ DashWallet/ms.lproj/Localizable.strings | 3 ++ DashWallet/nb.lproj/Localizable.strings | 3 ++ DashWallet/nl.lproj/Localizable.strings | 3 ++ DashWallet/pl.lproj/Localizable.strings | 3 ++ DashWallet/pt.lproj/Localizable.strings | 3 ++ DashWallet/ro.lproj/Localizable.strings | 3 ++ DashWallet/ru.lproj/Localizable.strings | 3 ++ DashWallet/sk.lproj/Localizable.strings | 3 ++ DashWallet/sl.lproj/Localizable.strings | 3 ++ DashWallet/sl_SI.lproj/Localizable.strings | 3 ++ DashWallet/sq.lproj/Localizable.strings | 3 ++ DashWallet/sr.lproj/Localizable.strings | 3 ++ DashWallet/sv.lproj/Localizable.strings | 3 ++ DashWallet/th.lproj/Localizable.strings | 3 ++ DashWallet/tr.lproj/Localizable.strings | 3 ++ DashWallet/uk.lproj/Localizable.strings | 3 ++ DashWallet/vi.lproj/Localizable.strings | 3 ++ DashWallet/zh-Hans.lproj/Localizable.strings | 3 ++ .../zh-Hant-TW.lproj/Localizable.strings | 3 ++ DashWallet/zh.lproj/Localizable.strings | 3 ++ DashWallet/zh_TW.lproj/Localizable.strings | 3 ++ .../AppConnectProjectionTests.swift | 37 +++++++++++++--- .../DashConnect/DashConnectStoreTests.swift | 16 +++++++ 50 files changed, 266 insertions(+), 19 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 0066a8a715..579108fb41 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -172,11 +172,32 @@ enum ConnectionStatus: String, Codable, CaseIterable { /// A connected app identified by its stable contract id. struct DAppConnection: Identifiable, Equatable, Hashable { + init(id: String, name: String, url: String, status: ConnectionStatus, updatedAt: Date, seenOn: Set = []) { + self.id = id + self.name = name + self.url = url + self.status = status + self.updatedAt = updatedAt + self.seenOn = seenOn + } + + /// `row` with another status, as of `updatedAt`, and `seenOn`. + init(_ row: DAppConnection, status: ConnectionStatus? = nil, seenOn: Set, at updatedAt: Date? = nil) { + self.init( + id: row.id, name: row.name, url: row.url, status: status ?? row.status, + updatedAt: updatedAt ?? row.updatedAt, seenOn: seenOn) + scope = row.scope + } + let id: String let name: String let url: String let status: ConnectionStatus let updatedAt: Date + /// The identities (Base58) whose last read showed the app live keys no + /// approval of this wallet names. The wallet reads one identity at a + /// time, so access seen on another stays known until that one is read. + let seenOn: Set /// Names the wallet and network a data source published this row for; /// `nil` on a row that was built or read from a store. Not stored. It /// goes back with a disconnect or a remove, so a row picked from a list @@ -197,6 +218,10 @@ struct DashConnectDisconnectResult: Equatable { /// Live App Connect keys whose app the wallet could not tell yet: its key /// store does not hold their bound. None of them was turned off. var keysNotChecked = 0 + /// A read of another identity of this wallet saw keys of the app no + /// approval names. They can be turned off only while that identity is + /// the active one. + var keysOnAnotherIdentity = false } /// A pending request derived from a scanned login QR code. diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift index 593f948e18..4e2431e1d4 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift @@ -138,7 +138,8 @@ final class UserDefaultsDashConnectStore: DashConnectStore { name: row.label, url: row.url, status: row.status, - updatedAt: row.updatedAt + updatedAt: row.updatedAt, + seenOn: Set(row.seenOn ?? []) ) ) } @@ -163,7 +164,8 @@ final class UserDefaultsDashConnectStore: DashConnectStore { label: $0.name, url: $0.url, status: $0.status, - updatedAt: $0.updatedAt + updatedAt: $0.updatedAt, + seenOn: $0.seenOn.isEmpty ? nil : $0.seenOn.sorted() ) } @@ -189,6 +191,8 @@ final class UserDefaultsDashConnectStore: DashConnectStore { let url: String let status: ConnectionStatus let updatedAt: Date + /// Absent in rows written before it was kept. + let seenOn: [String]? } private static func base58Decode(_ string: String) -> Data? { diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 58aafe7aeb..67b691a3ed 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -530,7 +530,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } - let existingConnection = rows(in: context.stores).first { $0.id == fallback.appContractId } + // A row there only for keys another identity's read saw is no + // connection of this identity. + let me = context.identityId.toBase58String() + let ownIntent = context.stores.intents.load().contains { + $0.appId.toBase58String() == fallback.appContractId && $0.identityId == context.identityId && $0.closedAt == nil + } + let existingConnection = rows(in: context.stores).first { + $0.id == fallback.appContractId && ($0.seenOn.isEmpty || $0.seenOn.contains(me) || ownIntent) + } // Which login this network gets is settled here, so the sheet can // show what the app is given. With the version unknown the request @@ -839,19 +847,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let elsewhere = all.filter { $0.identityId != snapshot.identityId && $0.closedAt == nil } let updatedAt = now() await updateRows(in: stores) { rows in - Self.rows(rows, after: projection, intents: elsewhere, at: updatedAt) + Self.rows(rows, after: projection, of: snapshot.identityId, intents: elsewhere, at: updatedAt) } } - /// `rows` with the App Connect connections of `projection`: an app with - /// live keys or an update that may still land has a row; one whose keys - /// are all off, or whose update never landed, has none. + /// `rows` with the App Connect connections of `projection`, the read of + /// `identityId`: an app with live keys or an update that may still land + /// has a row; one whose keys are all off, or whose update never landed, + /// has none, unless another identity's intents hold it or its last read + /// saw keys there no approval names (`seenOn`). static func rows( _ rows: [DAppConnection], after projection: AppConnect.Projection, + of identityId: Data, intents elsewhere: [AppConnect.ConnectionIntent], at updatedAt: Date ) -> [DAppConnection] { + let me = identityId.toBase58String() func shownStatus(_ status: AppConnect.IntentStatus) -> ConnectionStatus? { switch status { case .active, .expired: return .active @@ -863,7 +875,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // An App Connect row stands for intents: it stays only while another // identity's intents hold it, since this read says nothing of them. let heldElsewhere = Set(elsewhere.map { $0.appId.toBase58String() }) - var result = rows.filter { !shownIds.contains($0.id) && heldElsewhere.contains($0.id) } + var result: [DAppConnection] = rows.compactMap { row in + guard !shownIds.contains(row.id) else { return nil } + var seenOn = row.seenOn + seenOn.remove(me) + if heldElsewhere.contains(row.id) { return DAppConnection(row, seenOn: seenOn) } + // Live keys seen on another identity: that is the access left. + guard !seenOn.isEmpty else { return nil } + return DAppConnection(row, status: .active, seenOn: seenOn, at: row.status == .active ? row.updatedAt : updatedAt) + } for connection in projection.connections { let id = connection.appId.toBase58String() guard var status = shownStatus(connection.status) else { continue } @@ -872,13 +892,17 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let latest = connection.intents.first let fallback = DashConnectFallbackAppMetadata.resolve(contractId: id, unauthenticatedLabel: "") let name = latest?.appLabel ?? existing?.name ?? fallback.name + var seenOn = existing?.seenOn ?? [] + seenOn.remove(me) + if connection.unrecordedKeyIds[identityId]?.isEmpty == false { seenOn.insert(me) } result.removeAll { $0.id == id } result.append(DAppConnection( id: id, name: name.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : name, url: latest?.appUrl ?? existing?.url ?? fallback.url, status: status, - updatedAt: existing?.status == status ? existing?.updatedAt ?? updatedAt : updatedAt)) + updatedAt: existing?.status == status ? existing?.updatedAt ?? updatedAt : updatedAt, + seenOn: seenOn)) } return result } @@ -1976,7 +2000,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return DashConnectDisconnectResult( keysTurnedOff: planned.appKeysOff, unrecordedKeysLeft: includingUnrecorded ? 0 : planned.unrecordedLeft, - keysNotChecked: planned.unplaced) + keysNotChecked: planned.unplaced, + // Keys a read of another identity saw stay, and so does the row. + keysOnAnotherIdentity: rows(in: stores).first { $0.id == id }?.seenOn + .subtracting([context.identityId.toBase58String()]).isEmpty == false) } /// What a disconnect of `appId` submits on the active identity, from a diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 88bc0494e5..9237070f7a 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -40,6 +40,15 @@ struct ConnectionsScreen: View { DashUIKit.NavigationBar( leading: { DashUIKit.NavigationBarElement.back.button { vc.popViewController(animated: true) } + }, + trailing: { + // The empty state has its own scan button; a list + // needs one too, for a new code after a request that + // could not be completed. + if !viewModel.featureUnavailable && !viewModel.connections.isEmpty { + DashUIKit.NavigationBarElement.plus.button(action: showScanner) + .accessibilityLabel(Text(NSLocalizedString("Connect an app", comment: "DashConnect"))) + } } ) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 058f01258c..bb97ee886d 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -424,14 +424,24 @@ final class ConnectionsViewModel: ObservableObject { kind: .question, text: String.localizedStringWithFormat(text, result.unrecordedKeysLeft), unrecordedKeysOf: connection) - } else if result.keysNotChecked > 0 { - self.message = ConnectionsScreenMessage( - kind: .success, - text: String.localizedStringWithFormat( + } else if result.keysOnAnotherIdentity || result.keysNotChecked > 0 { + var texts: [String] = [] + if result.keysNotChecked > 0 { + texts.append(String.localizedStringWithFormat( NSLocalizedString( "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them.", comment: "DashConnect: after a disconnect that found keys whose app is not known yet"), result.keysNotChecked)) + } + if result.keysOnAnotherIdentity { + texts.append(DashConnectPlatformError.grantOnAnotherIdentity.localizedDescription) + } + // Nothing turned off here and the app still has keys + // elsewhere: as when its approval on another identity is + // open, that is not a success. + self.message = ConnectionsScreenMessage( + kind: result.keysOnAnotherIdentity && result.keysTurnedOff == 0 ? .error : .success, + text: texts.joined(separator: "\n\n")) } } catch { self.message = ConnectionsScreenMessage( diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 8da2f21c2d..64043c9d5d 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 977835114a..d01090d0b4 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 7a1a58a56a..9a62676c85 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 8bc9858727..c424a005f2 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index a434661cb6..0846e8baea 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 9ee8c4b8a4..690ca61302 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index e30a39146e..45eb5c67ad 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index b79e7f69e9..31ce30acb8 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6103,6 +6103,9 @@ "App contract" = "App contract"; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index e142c11ab0..e87cb5070c 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 905b282c85..a8af32c0c3 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index e48787c447..c2e1456df5 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 71e6889434..df88b82965 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 84d86cf73b..8cecae0e3d 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 7878eb10f2..3705e5ab5f 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 4906ecc419..966f3ebe34 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 8d4f94df7c..c675121242 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 78fb5eb1cd..25ae2f988c 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 2bb3516e81..51322d11d6 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index eb07bad607..71f64d5296 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index c9d85a41c9..2567dd36d8 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index fa95a51df1..3e63f1aeef 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 629de6fbee..cecac54175 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 88dc0586a7..cdefdd8df2 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 840c0a9c45..0f2e46d45c 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 8e35136448..850861fa49 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index b34ee32f60..faa5b9c9a7 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index c0a364c02f..f6f61c573e 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index d865f96b6f..21915363f2 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 610c3f1ce0..84777d9a7a 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 7c56c2bd1d..1083f20b87 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index c41309e275..451dd5d371 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 7f5567a141..a569d0374a 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index ee587d6350..87f05a221e 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index c59ce03f2d..321448842e 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 6a17622823..8a63ef90b6 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 9cae44f14b..550823d5bf 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 8704f90512..8b4019b326 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 98aecd0042..e717f38e3b 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 2595da3767..344711c219 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index f9cf3c5434..2967fc20a0 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 388d1d70d3..8293644711 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6214,6 +6214,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index f8618eae29..0087b32c7d 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index a5182e1839..0650994011 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6212,6 +6212,9 @@ "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; +/* DashConnect */ +"Connect an app" = "Connect an app"; + /* DashConnect: keys are on the identity, but the app never got its response */ "Not delivered" = "Not delivered"; diff --git a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift index 7b4ca57833..ff4e862b6b 100644 --- a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift +++ b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift @@ -315,7 +315,7 @@ final class AppConnectProjectionTests: XCTestCase { let confirming = Self.intent([Self.authKey(10)]) let projection = AppConnect.project([Self.snapshot([])], intents: [confirming]) let rows = PlatformDashConnectDataSource.rows( - [gone], after: projection, intents: [], at: Date(timeIntervalSince1970: 2)) + [gone], after: projection, of: Self.identity, intents: [], at: Date(timeIntervalSince1970: 2)) XCTAssertEqual(rows.map(\.id), [Self.app.toBase58String()]) XCTAssertEqual(rows.last?.status, .confirming) XCTAssertEqual(rows.last?.name, "App") @@ -327,24 +327,51 @@ final class AppConnectProjectionTests: XCTestCase { let undelivered = AppConnect.project([snapshot], intents: [Self.intent([key])]) XCTAssertEqual(undelivered.connections.first?.isUndelivered, true) XCTAssertEqual( - PlatformDashConnectDataSource.rows([], after: undelivered, intents: [], at: Date(timeIntervalSince1970: 2)).map(\.status), + PlatformDashConnectDataSource.rows([], after: undelivered, of: Self.identity, intents: [], at: Date(timeIntervalSince1970: 2)).map(\.status), [.undelivered]) let delivered = AppConnect.project([snapshot], intents: [Self.intent([key], published: true)]) XCTAssertEqual(delivered.connections.first?.isUndelivered, false) XCTAssertEqual( - PlatformDashConnectDataSource.rows([], after: delivered, intents: [], at: Date(timeIntervalSince1970: 2)).map(\.status), + PlatformDashConnectDataSource.rows([], after: delivered, of: Self.identity, intents: [], at: Date(timeIntervalSince1970: 2)).map(\.status), [.active]) let restored = AppConnect.project([Self.snapshot([Self.onPlatform(key)])], intents: []) XCTAssertEqual(restored.connections.first?.isUndelivered, false, "keys no intent names are not judged undelivered") } + func testAccessSeenOnAnotherIdentityKeepsTheRowUntilThatIdentityIsReadAgain() { + let stray = Self.onPlatform(Self.authKey(20)) + let onA = AppConnect.project([Self.snapshot([stray])], intents: []) + let rowsA = PlatformDashConnectDataSource.rows([], after: onA, of: Self.identity, intents: [], at: Date(timeIntervalSince1970: 1)) + XCTAssertEqual(rowsA.first?.seenOn, [Self.identity.toBase58String()]) + let onB = AppConnect.project([Self.snapshot([], identity: Self.otherIdentity)], intents: []) + let rowsB = PlatformDashConnectDataSource.rows(rowsA, after: onB, of: Self.otherIdentity, intents: [], at: Date(timeIntervalSince1970: 2)) + XCTAssertEqual(rowsB.map(\.id), [Self.app.toBase58String()], "B's read says nothing of A") + XCTAssertEqual(rowsB.first?.status, .active) + let againA = AppConnect.project([Self.snapshot([Self.onPlatform(Self.authKey(20), disabledAt: 1)])], intents: []) + XCTAssertEqual( + PlatformDashConnectDataSource.rows(rowsB, after: againA, of: Self.identity, intents: [], at: Date(timeIntervalSince1970: 3)), + [], "A read again shows the key off") + } + + func testARowAnotherIdentityHoldsKeepsWhatOtherIdentitiesSaw() { + let a = Self.identity.toBase58String(), b = Self.otherIdentity.toBase58String() + let row = DAppConnection( + id: Self.app.toBase58String(), name: "App", url: "", status: .active, + updatedAt: Date(timeIntervalSince1970: 1), seenOn: [a, b]) + let elsewhere = Self.intent([Self.authKey(10)], identity: Self.otherIdentity) + let rows = PlatformDashConnectDataSource.rows( + [row], after: AppConnect.project([Self.snapshot([])], intents: []), of: Self.identity, intents: [elsewhere], + at: Date(timeIntervalSince1970: 2)) + XCTAssertEqual(rows.map(\.seenOn), [[b]], "only the identity read now is dropped") + } + func testAnAppConnectRowHeldByAnotherIdentityStays() { let row = DAppConnection( id: Self.otherApp.toBase58String(), name: "Elsewhere", url: "", status: .active, updatedAt: Date(timeIntervalSince1970: 1)) let elsewhere = Self.intent([Self.authKey(10)], app: Self.otherApp, identity: Self.otherIdentity) let rows = PlatformDashConnectDataSource.rows( - [row], after: AppConnect.project([Self.snapshot([])], intents: []), intents: [elsewhere], + [row], after: AppConnect.project([Self.snapshot([])], intents: []), of: Self.identity, intents: [elsewhere], at: Date(timeIntervalSince1970: 2)) XCTAssertEqual(rows, [row]) } @@ -557,7 +584,7 @@ final class AppConnectProjectionTests: XCTestCase { let projection = AppConnect.project([Self.snapshot([Self.onPlatform(Self.authKey(10), disabledAt: 1)])], intents: [closed]) let elsewhere = Self.intent([Self.authKey(10)], identity: Self.otherIdentity) let rows = PlatformDashConnectDataSource.rows( - [row], after: projection, intents: [elsewhere], at: Date(timeIntervalSince1970: 2)) + [row], after: projection, of: Self.identity, intents: [elsewhere], at: Date(timeIntervalSince1970: 2)) XCTAssertEqual(rows, [row]) } diff --git a/DashWalletTests/DashConnect/DashConnectStoreTests.swift b/DashWalletTests/DashConnect/DashConnectStoreTests.swift index 7f7f938b4f..6a90f3a617 100644 --- a/DashWalletTests/DashConnect/DashConnectStoreTests.swift +++ b/DashWalletTests/DashConnect/DashConnectStoreTests.swift @@ -59,6 +59,22 @@ final class DashConnectStoreTests: XCTestCase { ) } + func testWhereAccessWasSeenRoundTripsAndAnOlderRowReadsWithNone() throws { + let store = makeStore(network: .testnet, walletIdHex: "wallet-a") + let row = DAppConnection( + id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", name: "Yappr", url: "yap.pr", status: .active, + updatedAt: Date(timeIntervalSince1970: 10), seenOn: ["identity-a"]) + store.save([row]) + XCTAssertEqual(store.load().first?.seenOn, ["identity-a"]) + + let older: [[String: Any]] = [ + ["contractId": "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", "label": "Yappr", "url": "yap.pr", + "status": "active", "updatedAt": 1_773_132_300_000], + ] + defaults.set(try JSONSerialization.data(withJSONObject: older), forKey: try XCTUnwrap(store.storageKey)) + XCTAssertEqual(store.load().map(\.seenOn), [[]]) + } + func testARowOfTheRemovedApprovedStatusIsDroppedAndTheOthersKept() throws { let store = makeStore(network: .testnet, walletIdHex: "wallet-a") let payload: [[String: Any]] = [ From 3c9445e22d3d0132a70014511fe8ac6332ab3cb1 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 3 Nov 2026 21:46:10 +0200 Subject: [PATCH 083/108] fix(dashconnect): tell an answered request by its whole body A parsed App Connect request carries a SHA-256 of its bytes, and the intent records it. Approving a request again counts as already answered only when that digest matches: a request that reuses the key but differs in anything else (connection, bindings, budgets, expiries) is refused as spent. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectProjection.swift | 3 +++ .../DashConnect/PlatformDashConnectDataSource.swift | 11 +++++++++-- .../DashConnect/Protocol/DashConnectRequests.swift | 3 +++ .../Models/DashConnect/Protocol/DashConnectUri.swift | 5 ++++- DashWalletTests/DashConnect/DashConnectUriTests.swift | 8 ++++++++ 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift index 5c680260df..7c86715ee4 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift @@ -48,6 +48,9 @@ extension AppConnect { let appUrl: String /// `hash160(appEphPub)` of the request. let requestHash: Data + /// SHA-256 of the whole request (`AppConnectUri.digest`). Absent in a + /// row written before it was kept. + var requestDigest: Data? = nil let connectionId: Data? /// The keys the update adds, auth and encryption. let keys: [IntendedKey] diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 67b691a3ed..2d3a34f795 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -946,7 +946,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if let earlier = stores.intents.load().first(where: { $0.appId == plan.appId && $0.requestHash == plan.appEphemeralPubKeyHash }) { - guard earlier.identityId == context.identityId, earlier.closedAt == nil else { + // The same key in a request that differs in anything else is + // another request: the one answered is not it. + guard earlier.identityId == context.identityId, earlier.closedAt == nil, + earlier.requestDigest == uri.digest else { + if earlier.requestDigest != uri.digest { + Self.logger.error("🔗 DASHCONNECT :: another request reuses an answered request's key; refused") + } throw Self.spentRequest(after: nil) } if earlier.responseDocumentId == nil { @@ -967,9 +973,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let request = uri.request let signer = KeychainSigner(modelContainer: context.modelContainer) let (snapshot, currentPublicKeys) = try await identitySnapshot(context: context) - let intent = try await newAppConnectIntent( + var intent = try await newAppConnectIntent( request: request, plan: plan, consent: consent, snapshot: snapshot, currentPublicKeys: currentPublicKeys, context: context) + intent.requestDigest = uri.digest updateIntents(in: stores) { $0.append(intent) } guard stores.intents.load().contains(where: { $0.id == intent.id }) else { throw DashConnectPlatformError.grantNotRecorded diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift index 71f62bad84..8b8b9083d1 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift @@ -25,6 +25,9 @@ struct AppConnectUri: Equatable { /// The `cb` return URL: absolute `https`, no credentials. Checked for /// form only; whether its host belongs to the app is not decided here. let callback: URL? + /// SHA-256 of the request's bytes: two requests are the same request + /// only when every field is. + var digest = Data() } struct DashStRequest: Equatable { diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift index 9b3d191412..8246222184 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift @@ -1,3 +1,4 @@ +import CryptoKit import Foundation enum DashConnectUriError: LocalizedError, Equatable { @@ -409,7 +410,9 @@ enum DashConnectUri { } let callback = try parameters["cb"].map(parseCallback) - return AppConnectUri(request: try AppConnectRequest.decode(body), network: network, callback: callback) + return AppConnectUri( + request: try AppConnectRequest.decode(body), network: network, callback: callback, + digest: Data(SHA256.hash(data: body))) } /// `+` is a space and each well-formed `%XX` a byte; a `%` that is not diff --git a/DashWalletTests/DashConnect/DashConnectUriTests.swift b/DashWalletTests/DashConnect/DashConnectUriTests.swift index 4399997a16..555959e015 100644 --- a/DashWalletTests/DashConnect/DashConnectUriTests.swift +++ b/DashWalletTests/DashConnect/DashConnectUriTests.swift @@ -1,3 +1,4 @@ +import CryptoKit import XCTest @testable import dashpay @@ -335,6 +336,13 @@ final class DashConnectUriTests: XCTestCase { "https://yap.pr/connect?r=d77dc0da9df83a47755a15c42c5d9db9d7a7fd62") } + func testARequestsDigestCoversItsWholeBody() throws { + let request = try DashConnectUri.parseAppConnectRequest(AppConnectVector.requestUri) + XCTAssertEqual(request.digest, Data(SHA256.hash(data: AppConnectVector.requestBytes))) + XCTAssertEqual(try DashConnectUri.parseAppConnectRequest(AppConnectVector.requestUri).digest, request.digest) + XCTAssertNotEqual(try DashConnectUri.parseAppConnectRequest(AppConnectVector.renewUri).digest, request.digest) + } + func testParsesThePublishedRenewRequest() throws { let parsed = try DashConnectUri.parseAppConnectRequest(AppConnectVector.renewUri) From 917a4a04129aedd6098090d72abf1fcb523d6c26 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 3 Nov 2026 22:14:51 +0200 Subject: [PATCH 084/108] fix(dashconnect): refuse every repeat approval of a request A request is answered at most once, so a request this wallet already took, on any identity, is shown as spent on the sheet, before any PIN, and is refused if approved anyway. The shortcut that reported an answered request as approved again goes, and with it the request digest it needed. Before a response is published the wallet waits for a read that shows the whole update, the earlier keys it turns off included. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectProjection.swift | 3 - .../PlatformDashConnectDataSource.swift | 104 ++++++++---------- .../Protocol/DashConnectRequests.swift | 3 - .../DashConnect/Protocol/DashConnectUri.swift | 5 +- .../DashConnect/DashConnectUriTests.swift | 8 -- 5 files changed, 48 insertions(+), 75 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift index 7c86715ee4..5c680260df 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift @@ -48,9 +48,6 @@ extension AppConnect { let appUrl: String /// `hash160(appEphPub)` of the request. let requestHash: Data - /// SHA-256 of the whole request (`AppConnectUri.digest`). Absent in a - /// row written before it was kept. - var requestDigest: Data? = nil let connectionId: Data? /// The keys the update adds, auth and encryption. let keys: [IntendedKey] diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 2d3a34f795..5b3e3bc57a 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -560,6 +560,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if let appConnect = loginRequest.appConnect, let protocolVersion { (login, unresolvedLoginReason) = await appConnectLogin( appConnect, protocolVersion: protocolVersion, context: context) + // A request this wallet already took is spent (it is answered + // at most once): the sheet says so before any PIN is asked. + if let plan = login.grantPlan, context.stores.intents.load().contains(where: { + $0.appId == plan.appId && $0.requestHash == plan.appEphemeralPubKeyHash + }) { + login = .refused(Self.spentRequest(after: nil)) + } } return ConnectionRequest( @@ -939,44 +946,22 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { "This sign-in request has expired. Ask the app for a new one.", comment: "DashConnect App Connect v2")) } - // A request is answered at most once, by any identity of the wallet. - // One this identity answered already is done; any other is spent: a - // sealed response is never published by a later attempt, as what it - // was sealed for may no longer hold. The app asks again. - if let earlier = stores.intents.load().first(where: { + // A request is answered at most once, by any identity of the wallet: + // approving it again is refused, whether the first attempt answered + // it or stopped. A sealed response is never published by a later + // attempt, as what it was sealed for may no longer hold. The app asks + // again. + guard !stores.intents.load().contains(where: { $0.appId == plan.appId && $0.requestHash == plan.appEphemeralPubKeyHash - }) { - // The same key in a request that differs in anything else is - // another request: the one answered is not it. - guard earlier.identityId == context.identityId, earlier.closedAt == nil, - earlier.requestDigest == uri.digest else { - if earlier.requestDigest != uri.digest { - Self.logger.error("🔗 DASHCONNECT :: another request reuses an answered request's key; refused") - } - throw Self.spentRequest(after: nil) - } - if earlier.responseDocumentId == nil { - // A publish can land without confirming. A lookup that fails - // says nothing, and the approval can be tried again. - guard let published = try await Self.findAppConnectResponse( - ownerIdentityId: context.identityId, appEphemeralPubKeyHash: earlier.requestHash, - responseContractId: responseContractId, sdk: context.sdk) else { - throw Self.spentRequest(after: nil) - } - recordResponse(published.documentId, of: earlier.id, in: stores) - if let read = try? await identitySnapshot(context: context).snapshot { - await refreshRows(from: read, context: context) - } - } - return Self.connection(consent: consent, at: now()) + }) else { + throw Self.spentRequest(after: nil) } let request = uri.request let signer = KeychainSigner(modelContainer: context.modelContainer) let (snapshot, currentPublicKeys) = try await identitySnapshot(context: context) - var intent = try await newAppConnectIntent( + let intent = try await newAppConnectIntent( request: request, plan: plan, consent: consent, snapshot: snapshot, currentPublicKeys: currentPublicKeys, context: context) - intent.requestDigest = uri.digest updateIntents(in: stores) { $0.append(intent) } guard stores.intents.load().contains(where: { $0.id == intent.id }) else { throw DashConnectPlatformError.grantNotRecorded @@ -1053,23 +1038,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // may be behind); when none does, nothing is published. A read that // already showed the update is the one checked: what it saw stands, // as a later read may be behind and show less. - var shown = landed - var readFailure: Error? - for attempt in 0 ... 2 where shown == nil { - if attempt > 0 { await Self.pauseForLaggingNode(attempt) } - do { - let read = try await identitySnapshot(context: context).snapshot - readFailure = nil - if AppConnect.hasLanded(intent, in: read) { shown = read } - } catch { - Self.logger.error("🔗 DASHCONNECT :: identity not read before publishing — \(error.localizedDescription, privacy: .public)") - readFailure = error - } - } - guard let current = shown else { - if let readFailure { throw readFailure } - Self.logger.error("🔗 DASHCONNECT :: no read shows the identity update before publishing") - throw DashConnectPlatformError.identityReadBehind + let current: AppConnect.IdentitySnapshot + if let landed { + current = landed + } else { + current = try await readShowingUpdate(of: intent, context: context) } guard AppConnect.landedKeysWithinPlan(intent, plan, in: current), AppConnect.authKeysUsable(intent, in: current) else { @@ -1116,6 +1089,29 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { for (id, documentId) in found { recordResponse(documentId, of: id, in: context.stores) } } + /// A read of the identity that shows `intent`'s update (`hasLanded`). A + /// node may be behind: reads a few seconds apart are tried, and when none + /// shows it `identityReadBehind`, or the read's failure, is thrown. + private func readShowingUpdate( + of intent: AppConnect.ConnectionIntent, context: Context + ) async throws -> AppConnect.IdentitySnapshot { + var readFailure: Error? + for attempt in 0 ... 2 { + if attempt > 0 { await Self.pauseForLaggingNode(attempt) } + do { + let read = try await identitySnapshot(context: context).snapshot + readFailure = nil + if AppConnect.hasLanded(intent, in: read) { return read } + } catch { + Self.logger.error("🔗 DASHCONNECT :: identity not read while looking for the update — \(error.localizedDescription, privacy: .public)") + readFailure = error + } + } + if let readFailure { throw readFailure } + Self.logger.error("🔗 DASHCONNECT :: no read shows the identity update") + throw DashConnectPlatformError.identityReadBehind + } + /// The error of a request that cannot be approved again: what stopped /// it, when that says something the user can act on, and that the app has /// to ask anew. A refusal with the `failed` status, so the sheet offers no @@ -1547,15 +1543,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } catch { // The update may have landed without confirming. Its keys // decide; nothing else does. - for attempt in 0 ..< 3 { - if attempt > 0 { try? await Task.sleep(nanoseconds: 3_000_000_000) } - guard let read = try? await identitySnapshot(context: context).snapshot else { continue } - if AppConnect.hasLanded(intent, in: read) { - Self.logger.info("🔗 DASHCONNECT :: the identity update landed without confirming") - return read - } - } - throw error + guard let read = try? await readShowingUpdate(of: intent, context: context) else { throw error } + Self.logger.info("🔗 DASHCONNECT :: the identity update landed without confirming") + return read } Self.logger.info("🔗 DASHCONNECT :: identity updated") return nil diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift index 8b8b9083d1..71f62bad84 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectRequests.swift @@ -25,9 +25,6 @@ struct AppConnectUri: Equatable { /// The `cb` return URL: absolute `https`, no credentials. Checked for /// form only; whether its host belongs to the app is not decided here. let callback: URL? - /// SHA-256 of the request's bytes: two requests are the same request - /// only when every field is. - var digest = Data() } struct DashStRequest: Equatable { diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift index 8246222184..9b3d191412 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift @@ -1,4 +1,3 @@ -import CryptoKit import Foundation enum DashConnectUriError: LocalizedError, Equatable { @@ -410,9 +409,7 @@ enum DashConnectUri { } let callback = try parameters["cb"].map(parseCallback) - return AppConnectUri( - request: try AppConnectRequest.decode(body), network: network, callback: callback, - digest: Data(SHA256.hash(data: body))) + return AppConnectUri(request: try AppConnectRequest.decode(body), network: network, callback: callback) } /// `+` is a space and each well-formed `%XX` a byte; a `%` that is not diff --git a/DashWalletTests/DashConnect/DashConnectUriTests.swift b/DashWalletTests/DashConnect/DashConnectUriTests.swift index 555959e015..4399997a16 100644 --- a/DashWalletTests/DashConnect/DashConnectUriTests.swift +++ b/DashWalletTests/DashConnect/DashConnectUriTests.swift @@ -1,4 +1,3 @@ -import CryptoKit import XCTest @testable import dashpay @@ -336,13 +335,6 @@ final class DashConnectUriTests: XCTestCase { "https://yap.pr/connect?r=d77dc0da9df83a47755a15c42c5d9db9d7a7fd62") } - func testARequestsDigestCoversItsWholeBody() throws { - let request = try DashConnectUri.parseAppConnectRequest(AppConnectVector.requestUri) - XCTAssertEqual(request.digest, Data(SHA256.hash(data: AppConnectVector.requestBytes))) - XCTAssertEqual(try DashConnectUri.parseAppConnectRequest(AppConnectVector.requestUri).digest, request.digest) - XCTAssertNotEqual(try DashConnectUri.parseAppConnectRequest(AppConnectVector.renewUri).digest, request.digest) - } - func testParsesThePublishedRenewRequest() throws { let parsed = try DashConnectUri.parseAppConnectRequest(AppConnectVector.renewUri) From d8ba46033538094a0636dc78b751878d61240aee Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 6 Nov 2026 15:57:34 +0200 Subject: [PATCH 085/108] fix(dashpay): derive an App Connect encryption key at DIP-13 rotation 0 develop's platform pin (1721ca7a8b, with platform#5649) adds the rotation level to application encryption keys and requires it. A v2 login derives the first pair; later rotations and the keys from before the level are #1258's. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/PlatformDashConnectDataSource.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 6bdb290f3f..997d2931ca 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1423,6 +1423,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { identityId: context.identityId, leaf: grant.binding.contractId, purpose: grant.connectPurpose, + // DIP-13's first pair; later rotations and the pairs from + // before the rotation level come with #1258. + rotation: 0, network: context.network ) return (key.publicKeyData, key.privateKeyData) From de4b1257b6fa485b2c736337a4ff2a4abd7d43e4 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 6 Nov 2026 15:57:34 +0200 Subject: [PATCH 086/108] fix(dashpay): refuse an App Connect request v2 for mainnet in the parser The DIP defines `dash-key:` v2 for testnet and devnets only. The parser now refuses `n=m` itself, so the refusal does not rest on DashConnect being off on mainnet. Raised in review of #1204. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/Protocol/DashConnectUri.swift | 5 +++++ DashWalletTests/DashConnect/DashConnectUriTests.swift | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift index 00264dc4d4..c9751b3ead 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift @@ -241,6 +241,11 @@ enum DashConnectUri { guard let network = parameters["n"].flatMap(DashConnectNetwork.init(rawValue:)) else { throw AppConnectRequestError.invalid("unknown network") } + // The DIP defines this request for testnet and devnets only. Refused + // here, so it does not rest on DashConnect being off on mainnet. + guard network != .mainnet else { + throw AppConnectRequestError.invalid("request v2 is not defined for mainnet") + } // Before the decode, as for the other two formats: its cost is // quadratic in the encoded length. guard body.utf8.count <= maxEncodedLength(forPayloadBytes: maxAppConnectPayloadLength) else { diff --git a/DashWalletTests/DashConnect/DashConnectUriTests.swift b/DashWalletTests/DashConnect/DashConnectUriTests.swift index 54fa951fe1..a793c908d8 100644 --- a/DashWalletTests/DashConnect/DashConnectUriTests.swift +++ b/DashWalletTests/DashConnect/DashConnectUriTests.swift @@ -347,6 +347,15 @@ final class DashConnectUriTests: XCTestCase { XCTAssertEqual(parsed.request.encryptionBindings, []) } + func testRefusesAMainnetAppConnectUri() throws { + let mainnetUri = AppConnectVector.renewUri.replacingOccurrences(of: "?n=t&", with: "?n=m&") + XCTAssertNotEqual(mainnetUri, AppConnectVector.renewUri) + + XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest(mainnetUri)) { error in + XCTAssertEqual(error as? AppConnectRequestError, .invalid("request v2 is not defined for mainnet")) + } + } + func testAVersion1UriIsUnsupportedByTheAppConnectParserAndViceVersa() throws { XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest(try validKeyUri())) { error in XCTAssertEqual(error as? AppConnectRequestError, .unsupported("URI version 1")) From 5b3505f765214f68dc356a9bef609e07d9739a8d Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 6 Nov 2026 15:58:30 +0200 Subject: [PATCH 087/108] docs: record ADR-0009 for answering App Connect request v2 The decision this PR makes: a v2 request is answered with keys the wallet derives, under limits the wallet enforces, in one identity update the wallet signs. ADR-0009 (Proposed) with its index row, and the app-connect feature summary extended with request v2. Co-Authored-By: Claude Opus 5.5 --- ...wallet-derived-keys-under-wallet-limits.md | 63 +++++++++++++++++++ docs/adr/README.md | 1 + docs/features/app-connect/README.md | 19 ++++-- 3 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 docs/adr/0009-answer-app-connect-request-v2-with-wallet-derived-keys-under-wallet-limits.md diff --git a/docs/adr/0009-answer-app-connect-request-v2-with-wallet-derived-keys-under-wallet-limits.md b/docs/adr/0009-answer-app-connect-request-v2-with-wallet-derived-keys-under-wallet-limits.md new file mode 100644 index 0000000000..e7efc798af --- /dev/null +++ b/docs/adr/0009-answer-app-connect-request-v2-with-wallet-derived-keys-under-wallet-limits.md @@ -0,0 +1,63 @@ +# 0009 — Answer App Connect request v2 with wallet-derived keys under wallet limits + +- **Status:** Proposed +- **Date:** 2026-11-06 +- **Deciders:** romchornyi (ADR author), PastaPastaPasta (author of the change) + +## Context + +[ADR-0006](0006-choose-the-app-connect-login-by-the-protocol-version-read-at-runtime.md) gives a protocol-14 network the one-QR login of App Connect request v1: one session key, bound to one contract, with a budget and an expiry the wallet chooses. That is enough for an app that only writes its own documents. An app such as Yappr also needs a key for a group of its contracts (token claims need a CRITICAL group key), a key for a document type on another contract (the DashPay `profile`), and an encryption key for its messages. A v1 request cannot ask for any of these. + +App Connect request v2 (`dash-key:` with `v=2`, decoded since #1204) lets the app name up to four auth bindings and two encryption bindings, each with the limits it proposes, plus a connection id and an identity hint. Its wallet rules are written in Yappr's `docs/APP_CONNECT_PROFILE.md` and are being folded into the App Connect DIP (dashpay/dips#181, open). The DIP defines v2 for testnet and devnets only. + +The question is how far the wallet trusts the request: which keys it registers, with which limits, and who builds the identity update. + +## Decision drivers + +- The app never gets a key it could use beyond what the user approved on one sheet, and never an identity key or the recovery phrase. +- The wallet, not the app, derives every key and builds and signs the identity update. +- A request the wallet cannot check against Platform (owners, the identity hint) is refused, not guessed (repository guardrail 3). +- One approval is one identity update, and a repeat of the same request registers nothing new. +- The rules follow the profile so that the same request gets the same answer from every wallet. + +## Considered options + +1. **Answer v2 with keys the wallet derives, under limits the wallet enforces.** The wallet checks the request against the profile's rules, clamps what the app proposes to its own caps, derives one key per binding, and registers them in one update it signs itself. +2. **Answer only v1 and leave group, foreign-type and encryption keys out.** Simple and already shipped, but an app that needs a token claim, a profile write or messages cannot sign in at all. +3. **Let the app send the identity update for the wallet to sign (the two-scan `dash-st:` shape).** The app could ask for anything; the wallet would have to read back and judge an update it did not build, for every key shape the app can name. + +## Decision outcome + +**Chosen:** option 1, because it gives the app the keys it names while the wallet alone decides their shape and their limits. + +- **Freshness.** A request more than 10 minutes old, or dated in the future, is refused. +- **Owners.** Every binding must be on a contract (or contract group) owned by the owner of the app's contract; the one exception is the DashPay `profile` document type. A Platform system contract is never the app nor a binding target. An encryption binding must name the app's contract, and that contract must accept bounded keys of the purpose. The owners and the identity hint are read from Platform with proofs before the sheet is shown. +- **Levels and limits.** CRITICAL only on a group key, HIGH on every other auth key, MEDIUM on encryption keys. A proposed budget is capped at 5 DASH and a lifetime at 365 days; a binding without an expiry gets 90 days. No limit the app asked for is dropped, and none it did not ask for is added. +- **Keys.** Each auth key is derived from the app's ephemeral key and the binding's index, so keys are distinct per binding and stable across retries of one request. The encryption key is the DIP-13 application encryption key for the app's contract, at rotation 0; it is sent again while it is the identity's current key for the app, and never rotated by this change. +- **One update.** The new keys are added, and the keys of this wallet's earlier grant with the same connection id are disabled, in one identity update the wallet signs. +- **The answer.** The keys are sealed to the app's ephemeral key and published on the App Connect contract; the callback named in the request opens only after the user has answered the sheet. +- **Networks.** A v2 request for mainnet is refused by the parser. + +## Consequences + +**Positive** +- Apps that need a group key, a profile key or an encryption key sign in with one scan, on the same sheet and the same contract as v1. +- The wallet never signs an update it did not build, and every auth key has an expiry. +- A repeat of a request, or a renewal on the same connection, does not pile up live keys. + +**Negative** +- The rules come from a profile whose DIP is still open (dashpay/dips#181). When it settles, the parts it changes (requests the DIP allows but this wallet does not grant, the binding counts) change with it. +- A binding that proposes no budget gets a key with no budget, and the sheet says so. +- The wallet keeps no map of which hosts belong to which app; the sheet shows the callback's host and the user judges it. +- Two devices signing in to the same app within seconds can delete each other's response before the app reads it, because each publish deletes the identity's earlier responses for the app. +- A renewal is a new login on the same connection id; raising the limits of an existing key is not done. + +**Neutral** +- The caps (5 DASH, 365 days, 90 days) are the profile's and can be lowered by a later decision without changing the shape of this one. +- Encryption-key rotation, and keys from before the DIP-13 rotation level, are handled in a later change (#1258). + +## Links + +- Feature summary: [docs/features/app-connect/README.md](../features/app-connect/README.md) +- Related ADR: [0006 — Choose the App Connect login by the protocol version read at runtime](0006-choose-the-app-connect-login-by-the-protocol-version-read-at-runtime.md) +- Request v2 decoder: #1204. Profile: Yappr `docs/APP_CONNECT_PROFILE.md`. DIP: dashpay/dips#181. diff --git a/docs/adr/README.md b/docs/adr/README.md index 565b0c8938..f7d28ca187 100644 --- a/docs/adr/README.md +++ b/docs/adr/README.md @@ -10,6 +10,7 @@ where they disagree, ADR-0001 wins. | [0001](0001-record-architecture-decisions-as-adrs.md) | Record architecture decisions as ADRs | process | Accepted | | | [0002](0002-keep-the-decision-log-in-docs-adr.md) | Keep the decision log in docs/adr | process | Accepted | | | [0006](0006-choose-the-app-connect-login-by-the-protocol-version-read-at-runtime.md) | Choose the App Connect login by the protocol version read at runtime | platform | Proposed | | +| [0009](0009-answer-app-connect-request-v2-with-wallet-derived-keys-under-wallet-limits.md) | Answer App Connect request v2 with wallet-derived keys under wallet limits | platform | Proposed | | Areas: `spv`, `platform`, `keys`, `storage`, `coinjoin`, `ui`, `build`, `process`. Each ADR takes one; a new Area is added to this list in the PR that first needs it. diff --git a/docs/features/app-connect/README.md b/docs/features/app-connect/README.md index aa3be09c2d..6498dbadaa 100644 --- a/docs/features/app-connect/README.md +++ b/docs/features/app-connect/README.md @@ -1,6 +1,6 @@ # DashConnect: sign in to an app with one QR -**Owner:** romchornyi · Introduced in [#1202](https://github.com/dashpay/dashwallet-ios/pull/1202) +**Owner:** romchornyi · Introduced in [#1202](https://github.com/dashpay/dashwallet-ios/pull/1202); request v2 decoded in [#1204](https://github.com/dashpay/dashwallet-ios/pull/1204) and answered in [#1210](https://github.com/dashpay/dashwallet-ios/pull/1210) ## Why @@ -22,11 +22,20 @@ one-scan login possible, and with it DashConnect on mainnet once mainnet runs pr - **Disconnect is real**: it turns off the app's session keys on the identity and deletes its responses, then removes the row. A failure keeps the row and says so. - **Mainnet stays off** in this change: the Connections page uses its mock data source there. +- **App Connect request v2** ([#1210](https://github.com/dashpay/dashwallet-ios/pull/1210)). A `v=2` + code can name up to four auth bindings (a contract, a contract group or one document type) and + two encryption bindings, each with the limits the app proposes. The wallet checks the request + against Platform (who owns each contract, the identity hint), clamps the limits, derives one key + per binding, and registers them in one identity update that also turns off the keys of its + earlier grant on the same connection. The keys are published sealed on the App Connect contract, + and the app's callback opens after the user answers. A v2 code for mainnet is refused. + [ADR-0009](../../adr/0009-answer-app-connect-request-v2-with-wallet-derived-keys-under-wallet-limits.md). ## What it guarantees -- The app gets a new key that only it holds, bound to its own contract, with a budget and an - expiry. It never gets the identity's existing keys or the recovery phrase. +- The app gets new keys that only it holds, each bound to the contract, group or document type the + user approved, with an expiry and the budget the sheet showed. It never gets the identity's + existing keys or the recovery phrase. - Approving the same QR again registers no second key. - The wallet records a key before it submits the key's registration, so a key that lands without a confirmation is still found and can be turned off. @@ -35,7 +44,9 @@ one-scan login possible, and with it DashConnect on mainnet once mainnet runs pr The later DashConnect PRs build on this one. Each of them adds its own ADRs to the log: -- App Connect request v2 and its response ([#1204](https://github.com/dashpay/dashwallet-ios/pull/1204)). +- Encryption key rotation and the `dashpay://connect` carrier + ([#1257](https://github.com/dashpay/dashwallet-ios/pull/1257), + [#1258](https://github.com/dashpay/dashwallet-ios/pull/1258)). - Connections derived from the identity and the recorded requests, and the removal of the two-scan login ([#1301](https://github.com/dashpay/dashwallet-ios/pull/1301)). - The redesigned Connections page, approve sheet, expiry and disconnected apps From d6289ee0916fb3a671bbdb67e65a796a9d1302e9 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 6 Nov 2026 16:04:36 +0200 Subject: [PATCH 088/108] fix(dashconnect): key the sheet's permission rows by position Two rows can read the same (two encryption keys for one app), and `ForEach(id: \.self)` needs unique ids. Also drops the stale claim that nothing in the login flow reads `AppConnectRequest`. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/Protocol/AppConnectRequest.swift | 4 ++-- .../Sources/UI/DashConnect/ApproveConnectionSheet.swift | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/AppConnectRequest.swift b/DashWallet/Sources/Models/DashConnect/Protocol/AppConnectRequest.swift index 68e6071b92..26156ca767 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/AppConnectRequest.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/AppConnectRequest.swift @@ -18,8 +18,8 @@ enum AppConnectRequestError: Error, Equatable { /// unknown odd types are skipped. TLVs come in ascending type order, and of /// the known types only the two bindings repeat. Integers are big-endian. /// -/// This type only decodes and checks the format. Nothing in the login flow -/// reads it yet. +/// This type only decodes and checks the format. The rules a wallet applies +/// before it grants what a request asks for are `AppConnect.grantPlan(for:now:)`. struct AppConnectRequest: Equatable { /// Wire tags, equal to Platform's `ContractBounds` bincode tags. enum BindingKind: UInt8 { diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index 7854e82021..57e32a9f3b 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -445,7 +445,8 @@ struct ApproveConnectionSheet: View { .font(.subhead) .foregroundColor(.primaryText) - ForEach(granted, id: \.self) { text in + // By position: two rows can read the same (two encryption keys). + ForEach(Array(granted.enumerated()), id: \.offset) { _, text in PermissionRow(icon: .custom("dashconnect.check.circle", maxHeight: 18), text: text) } } @@ -455,7 +456,8 @@ struct ApproveConnectionSheet: View { .font(.subhead) .foregroundColor(.primaryText) - ForEach(withheld, id: \.self) { text in + // By position: two rows can read the same (two encryption keys). + ForEach(Array(withheld.enumerated()), id: \.offset) { _, text in PermissionRow(icon: .custom("dashconnect.xmark.circle", maxHeight: 18), text: text) } } From 62dc24a3d1d5c6be7a436b203806016316dea90c Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 6 Nov 2026 16:42:24 +0200 Subject: [PATCH 089/108] fix(dashconnect): bound the dash-key query before it is split or decoded The v2 router, the v2 parser and the v1/st envelope now refuse a query longer than 4 KiB before splitting it into parameters or form-decoding them. The body and callback ceilings applied only after that work, and a link routed to v1 was not bounded at all. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/Protocol/DashConnectUri.swift | 16 ++++++++++++++ .../DashConnect/DashConnectUriTests.swift | 22 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift index c9751b3ead..fa7e083eb9 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift @@ -19,6 +19,7 @@ enum DashConnectUriError: LocalizedError, Equatable { case emptyTransitionPayload case invalidKeyLabelEncoding case bodyTooLong + case queryTooLong var errorDescription: String? { switch self { @@ -58,6 +59,8 @@ enum DashConnectUriError: LocalizedError, Equatable { return "The dash-st payload must be non-empty." case .bodyTooLong: return "The URI body is longer than the DashConnect payload format allows." + case .queryTooLong: + return "The URI query is longer than DashConnect allows." } } } @@ -98,6 +101,11 @@ enum DashConnectUri { private static let maxAppConnectPayloadLength = 1024 private static let appConnectVersion = "2" private static let maxCallbackLength = 512 + /// The query is measured in Unicode scalars before it is split or form-decoded, so the + /// parameter count and every decoded value are bounded with it. 4 KiB + /// holds the longest callback form-encoded (each character as `%XX`) + /// twice over, with room for parameters a newer app may add. + private static let maxQueryLength = 4 * 1024 /// Encoded-length ceilings, enforced BEFORE decoding. /// @@ -197,6 +205,8 @@ enum DashConnectUri { static func isAppConnectUri(_ uri: String) -> Bool { guard isKeyUri(uri), let queryIndex = uri.unicodeScalars.firstIndex(of: "?") else { return false } var query = uri.unicodeScalars[uri.unicodeScalars.index(after: queryIndex)...] + // Too long for either version: the version 1 parser refuses it. + guard query.count <= maxQueryLength else { return false } if query.first == "?" { query = query.dropFirst() } return query.split(separator: "&").contains { item in let parts = item.split(separator: "=", maxSplits: 1, omittingEmptySubsequences: false) @@ -221,6 +231,9 @@ enum DashConnectUri { // Names and values are form-decoded before they are compared, as the // app's `URLSearchParams` does. var query = remainder[remainder.index(after: queryIndex)...] + guard query.count <= maxQueryLength else { + throw AppConnectRequestError.invalid("query is too long") + } if query.first == "?" { query = query.dropFirst() } var parameters: [String: String] = [:] for item in query.split(separator: "&") { @@ -365,6 +378,9 @@ enum DashConnectUri { } let query = String(remainder[remainder.index(after: queryIndex)...]) + guard query.unicodeScalars.count <= maxQueryLength else { + throw DashConnectUriError.queryTooLong + } let parameters = parseQueryItems(query) guard let version = parameters["v"] else { diff --git a/DashWalletTests/DashConnect/DashConnectUriTests.swift b/DashWalletTests/DashConnect/DashConnectUriTests.swift index a793c908d8..c1d1c7126a 100644 --- a/DashWalletTests/DashConnect/DashConnectUriTests.swift +++ b/DashWalletTests/DashConnect/DashConnectUriTests.swift @@ -407,6 +407,28 @@ final class DashConnectUriTests: XCTestCase { } } + /// The query is measured before it is split or decoded, by the router and + /// by both parsers; a URI that routes to version 1 is no exception. + func testAnOversizedQueryIsRefusedBeforeItIsRead() throws { + let padding = "&" + String(repeating: "x", count: 4096) + let v2 = AppConnectVector.renewUri + padding + let v1 = try validKeyUri() + padding + + XCTAssertFalse(DashConnectUri.isAppConnectUri(v2)) + XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest(v2)) { error in + XCTAssertEqual(error as? AppConnectRequestError, .invalid("query is too long")) + } + XCTAssertThrowsError(try DashConnectUri.parseKeyRequest(v1)) { error in + XCTAssertEqual(error as? DashConnectUriError, .queryTooLong) + } + assertStError(validStUri() + padding, .queryTooLong) + + // A query at the ceiling is read. + let atCeiling = AppConnectVector.renewUri + "&" + String(repeating: "x", count: 4096 - "n=t&v=2&".count) + XCTAssertTrue(DashConnectUri.isAppConnectUri(atCeiling)) + XCTAssertNoThrow(try DashConnectUri.parseAppConnectRequest(atCeiling)) + } + func testAnAppConnectPayloadAtTheCeilingIsReadAndOneOverIsNot() { // Padded with optional TLVs this decoder skips. let minimal = Self.appConnectHeader + Self.groupBinding + Self.createdAtTlv From 3ca6b58d8e322ea39949e3c2c04126470ead963a Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 6 Nov 2026 16:42:25 +0200 Subject: [PATCH 090/108] fix(dashconnect): tell the app when its request is refused at Approve A refusal at Approve marks the login refused, and closing the sheet then skipped the callback the sheet had already shown, leaving a link-delivered app waiting. The callback now opens with the stored status (stale, invalid, unsupported, failed) as well. Co-Authored-By: Claude Opus 5.5 --- .../UI/DashConnect/ConnectionsViewModel.swift | 7 +++--- .../PlatformDashConnectDataSourceTests.swift | 22 +++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 4c902b1e8f..409161f38e 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -294,9 +294,10 @@ final class ConnectionsViewModel: ObservableObject { func denyPendingRequest() { guard !isApproving else { return } - // A refused request never showed where it would return, so its - // callback is not opened. - if let pendingLoginRequest, pendingRequest?.login.isApprovable == true { + // A request refused before the sheet never showed where it would + // return, so its callback is not opened. One refused or failed at + // Approve did, and the app hears how it ended. + if let pendingLoginRequest, pendingRequest?.login.isApprovable == true || pendingFailureStatus != nil { openCallback(of: pendingLoginRequest, status: pendingFailureStatus ?? .declined) } pendingRequest = nil diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 20b264d930..5fe25782c3 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1467,6 +1467,28 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertEqual(opened.urls.first?.absoluteString.contains("ac=declined"), true) } + /// The request was refused when the user tapped Approve, after the sheet + /// had shown where it returns: closing the sheet tells the app why. + func testClosingTheSheetAfterARefusalAtApprovalReportsTheRefusal() async throws { + var request = MockDashConnectDataSource.sampleLoginRequest + request.appConnect = try DashConnectUri.parseAppConnectRequest( + "dash-key:2fAANHHASdojyjV9Sqa2wf2nwZE8kLLqmeHpZWa8sBfaGsddVqyMG2ZVte7xJkTKsXvmFYbXzXbNnMo7bJQBxNcf79N8YWi7pLKyb39Rqv6b1KUmxw9UeJGYz2CV9hFGNUQtcyMYVq2Fg6vAxtxpYays61H8gLMcWqaG8TfgGA3H7setGAYiBsM5YmdZgeuCdGAHSwfNfav5cfFjXNDkPWv37UNSgFxj6o58jfXc3kCLKqLJtc5ZPjm1thEGYxK8HVYBi8fRQeEVy76n27DXGrVTyHz94CfJRuMnH76xGYbMgeuvurxjJMLrQgWUu53cjocYyzzNWdJrgs2D5?n=d&v=2&cb=https%3A%2F%2Fyap.pr%2Fconnect%3Fr%3Dd77dc0da9df83a47755a15c42c5d9db9d7a7fd62") + let spy = LoginApprovalSpy(shown: [Self.consent(identityId: "identity-a", terms: .current)], loginRequest: request) + spy.approveFailures = [AppConnect.Refusal(.stale, "The request is too old.")] + let opened = OpenedURLs() + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false, openURL: { opened.urls.append($0) }) + + viewModel.onURIReceived("login") + await waitUntil { viewModel.pendingRequest != nil } + viewModel.approvePendingRequest() + await waitUntil { spy.approvedConsents.count == 1 && !viewModel.isApproving } + XCTAssertEqual(viewModel.pendingRequest?.login.isApprovable, false) + viewModel.denyPendingRequest() + + XCTAssertEqual(opened.urls.count, 1) + XCTAssertEqual(opened.urls.first?.absoluteString.contains("ac=stale"), true) + } + /// Another identity became active, or the network answers with the other /// login, while the sheet was up: nothing is approved on the old sheet, /// and the user decides again on what is true now. From 05c99911428685b2c228d9a0b36c38c59776025e Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 6 Nov 2026 17:11:33 +0200 Subject: [PATCH 091/108] fix(dashconnect): leave the encryption slot out behind a disabled current key Under the `latest` rule, a disabled current key of another wallet's made the slot count as empty, so a login registered a new encryption key and replaced the contract's current key. That is a rotation, which is the user's explicit action and never part of a login: the slot is now left out, waiting on a later read when a live key may be newer. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 21 +++++++++--------- .../DashConnect/AppConnectV2LoginTests.swift | 22 ++++++++++--------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 6a7186871d..5131d9feb2 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -365,8 +365,8 @@ extension AppConnect { case current(keyId: UInt32) /// It has none: register the one this wallet derives. case absent - /// Its current key is another wallet's, or the one this wallet - /// derives was disabled: leave the slot out. Replacing it would be a + /// Its current key is another wallet's, or was disabled: leave the + /// slot out. Replacing it would be a /// rotation, which orphans what peers encrypted to it; that is an /// explicit user action, never part of a login. case notThisWallets @@ -594,9 +594,8 @@ extension AppConnect { /// bound elsewhere once a later read agrees. Beside a current key, a /// live key the app may hold was registered before it, or after it with /// Platform's read behind, so the answer waits on a later read. Behind - /// a disabled current key that a later read confirms, a key registered - /// before it is no longer current, and a new one shadows nothing; under - /// `unique`, nothing can be added behind a disabled current key at all. + /// a disabled current key the slot is left out: a new key would be a + /// rotation, and under `unique` Platform refuses one at all. static func encryptionKeyState( derivedPublicKey: Data, purpose: KeyPurpose, @@ -645,12 +644,14 @@ extension AppConnect { } return mayBeBehind ? .currentIfSettled(keyId: currentKey.keyId) : .current(keyId: currentKey.keyId) } + // The identity has a key for the contract and purpose, and none is + // current. Under `unique` Platform refuses any other; under `latest` + // a new key would be a rotation, which is the user's explicit action + // and never part of a login. A later live key with Platform's read + // behind is the one exception, so under `latest` the answer waits on + // a later read. if rule == .unique { return .notThisWallets } - // Behind a disabled current key, a key of the app's registered - // before it is no longer current either, so a new key shadows - // nothing; this wallet's own key cannot be added a second time. - if holdsTheDerivedKey { return mayBeBehind ? .notThisWalletsIfSettled : .notThisWallets } - return mayBeBehind ? .absentIfSettled : .absent + return mayBeBehind ? .notThisWalletsIfSettled : .notThisWallets } /// Wallet rule 8: the live auth keys of this wallet's earlier grants to diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 6e100be33d..2fdaa8d038 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -569,12 +569,12 @@ final class AppConnectV2LoginTests: XCTestCase { [elsewhere], current: nil, bindings: [.init(keyId: 5, data: elsewhere.data, singleContractId: other)]), .absent) - // Nor is a disabled current key of another wallet's in the way, when - // the latest key registered is current. + // A disabled current key of another wallet's is a key for the app + // with none live: nothing is registered beside it. let disabledTheirs = Self.encryptionKey(9, data: Data(repeating: 0x77, count: 33), disabled: true) XCTAssertEqual( encryptionState([disabledTheirs], current: Self.current(9, data: disabledTheirs.data, disabled: true), bindings: []), - .absent) + .notThisWallets) } func testAnotherWalletsKeyIsNeitherSentNorReplaced() { @@ -586,15 +586,15 @@ final class AppConnectV2LoginTests: XCTestCase { .notThisWallets) // One the fetched keys do not show yet stops the login. XCTAssertEqual(encryptionState([], current: Self.current(5, data: theirs.data), bindings: []), .outOfDate) - // One whose bound the store cannot place, behind a disabled current - // key, is no longer current either: a new key shadows nothing, once - // a later read confirms the disabled key is current. + // Behind a disabled current key nothing is registered; a live key + // the store cannot place may be a later one with Platform's read + // behind, so a later read confirms it. let disabledCurrent = Self.encryptionKey(9, data: Data(repeating: 0x77, count: 33), disabled: true) XCTAssertEqual( encryptionState( [theirs, disabledCurrent], current: Self.current(9, data: disabledCurrent.data, disabled: true), bindings: []), - .absentIfSettled) + .notThisWalletsIfSettled) // With no current key at all, a key bound to the app would be it: a // key the store cannot place is bound elsewhere, once a later read // agrees. @@ -781,14 +781,16 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertLessThanOrEqual(pauses, 3) return result } + // Behind a disabled current key the slot is left out, once a later + // read agrees that no newer key is current. let agreed = try await settle([[.encryption: current]]) - XCTAssertEqual(agreed, [.absent]) + XCTAssertEqual(agreed, [.notThisWallets]) // A lagging node that has lost the disabled key does not settle the // answer. let lagging = try await settle([[:], [:], [:]]) XCTAssertEqual(lagging, [.outOfDate]) let caughtUp = try await settle([[:], [.encryption: current]]) - XCTAssertEqual(caughtUp, [.absent]) + XCTAssertEqual(caughtUp, [.notThisWallets]) // A read that conflicts makes the answer out of date, even if a // later one agrees with the first. let unknown = Self.current(11, data: Data(repeating: 0x88, count: 33)) @@ -803,7 +805,7 @@ final class AppConnectV2LoginTests: XCTestCase { return read }, pause: { _ in }) - XCTAssertEqual(afterAFailedRead, [.absent]) + XCTAssertEqual(afterAFailedRead, [.notThisWallets]) // When no read answers, the failure is thrown. do { _ = try await AppConnect.settle( From d83020671e069c2a4bd683f2da67855ea0fc18c0 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 6 Nov 2026 17:34:07 +0200 Subject: [PATCH 092/108] fix(dashconnect): warn, not refuse, when a known app's request returns elsewhere The wallet's brand map refused a request for a known app whose callback was not on the app's website. The map only names an app and must not change which requests are accepted (dips#181, App Identity): such a request is now accepted, and the sheet warns that it would return to a host that is not the app's website, as it already warns for an unknown app or a known app's request without a callback. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 35 ++++++++++--------- .../PlatformDashConnectDataSource.swift | 3 -- .../DashConnect/ApproveConnectionSheet.swift | 26 +++++++++----- .../UI/DashConnect/ConnectionsViewModel.swift | 9 +++-- .../DashConnect/AppConnectV2LoginTests.swift | 23 ++++++------ 5 files changed, 53 insertions(+), 43 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 5131d9feb2..3952037431 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -222,23 +222,26 @@ extension AppConnect { ) } - /// The profile's callback rule for an app in the wallet's brand map: a - /// request whose `cb` is on a host that is not the app's is refused. - /// The sheet would be branded as the app and return somewhere else, and - /// the host is the user's main phishing signal. A request without `cb` - /// is not refused, the sheet warns instead - /// (`ApproveConnectionSheet.originWarning`). - /// + /// What the sheet warns about where a request came from. + enum OriginWarning: Equatable { + /// The app is not in the wallet's brand map: its name comes from the + /// request alone. + case unknownApp + /// A known app's request carries no callback. + case noCallback(website: String) + /// A known app's request returns to a host that is not its website. + case returnsElsewhere(callbackHost: String) + } + /// The request itself proves nothing about where it came from: anyone - /// can put the app's id and the app's host in a QR code. What the wallet - /// can check is that what it shows agrees with itself. - static func callbackRefusal(callbackHost: String?, brandHost: String?) -> Refusal? { - guard let brandHost, let callbackHost, !isHost(callbackHost, of: brandHost) else { return nil } - return Refusal(.invalid, String( - format: NSLocalizedString( - "This request would return to %@, which is not the app's website.", - comment: "DashConnect App Connect v2: the placeholder is a website, e.g. yap.pr"), - callbackHost)) + /// can put the app's id and the app's host in a QR code. The brand map + /// only names an app and never changes which requests are accepted + /// (dips#181, App Identity), so what does not agree with it is a + /// warning on the sheet, never a refusal. + static func originWarning(callbackHost: String?, brandHost: String?) -> OriginWarning? { + guard let brandHost else { return .unknownApp } + guard let callbackHost else { return .noCallback(website: brandHost) } + return isHost(callbackHost, of: brandHost) ? nil : .returnsElsewhere(callbackHost: callbackHost) } /// Whether `host` is `brandHost` or one of its subdomains. Both are diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 997d2931ca..3ad82a9b1d 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -684,9 +684,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { do { var plan = try AppConnect.grantPlan(for: uri, now: now()) plan.brandHost = DashConnectFallbackAppMetadata.brandHost(contractId: plan.appId.toBase58String()) - if let refusal = AppConnect.callbackRefusal(callbackHost: plan.callbackHost, brandHost: plan.brandHost) { - return (.refused(refusal), nil) - } if let hint = plan.identityHint, hint != context.identityId { return (.refused(AppConnect.Refusal(.invalid, NSLocalizedString( "This sign-in is for another identity. Switch to it in this wallet and ask the app again.", diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index 57e32a9f3b..1535ea29f1 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -392,20 +392,28 @@ struct ApproveConnectionSheet: View { /// The profile's warnings. Nothing in a request proves where it came /// from: an app the wallet does not know is named by the request alone, /// and a known app's request that does not return to its website may - /// come from a page that is not the app's. A known app's request that - /// returns elsewhere is refused before it gets here. + /// come from a page that is not the app's. private func originWarning(_ plan: AppConnect.GrantPlan) -> String? { - guard let brandHost = plan.brandHost else { + switch AppConnect.originWarning(callbackHost: plan.callbackHost, brandHost: plan.brandHost) { + case nil: + return nil + case .unknownApp: return NSLocalizedString( "This wallet does not know this app, so it cannot confirm the name shown or where the request came from.", comment: "DashConnect App Connect v2") + case .noCallback(let website): + return String( + format: NSLocalizedString( + "This request does not return to %@. It may not come from the app's website.", + comment: "DashConnect App Connect v2: the placeholder is the app's website, e.g. yap.pr"), + website) + case .returnsElsewhere(let callbackHost): + return String( + format: NSLocalizedString( + "This request would return to %@, which is not the app's website.", + comment: "DashConnect App Connect v2: the placeholder is a website, e.g. yap.pr"), + callbackHost) } - guard plan.callbackHost == nil else { return nil } - return String( - format: NSLocalizedString( - "This request does not return to %@. It may not come from the app's website.", - comment: "DashConnect App Connect v2: the placeholder is the app's website, e.g. yap.pr"), - brandHost) } private func requestOrigin(_ plan: AppConnect.GrantPlan) -> String { diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 409161f38e..32fd8613e7 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -308,11 +308,10 @@ final class ConnectionsViewModel: ObservableObject { /// Returns to the app that sent an App Connect request, with how it /// ended (`ac=`). Only the callback the sheet showed ("returns - /// to ") is opened, and only once the user has answered it. A - /// known app's request that returns elsewhere is refused before the - /// sheet (`AppConnect.callbackRefusal`); for an app the wallet does not - /// know, the user's answer to a sheet naming the host, with its - /// warning, stands in for the profile's "ask". + /// to ") is opened, and only once the user has answered it: the + /// user's answer to a sheet naming the host, with a warning when the app + /// is unknown or the host is not its website + /// (`AppConnect.originWarning`), stands in for the profile's "ask". /// The app treats it as a nudge to look for the response, never as /// proof of anything. private func openCallback(of request: DashKeyRequest, status: AppConnect.CallbackStatus) { diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 2fdaa8d038..fb8fb2a679 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -1024,17 +1024,20 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertFalse(DashConnectUri.isAppConnectUri("dash-key:abc?n=d&v")) } - /// A request for an app in the brand map that returns to a host the - /// app does not have is refused; one without a callback, or for an app - /// the wallet does not know, is left to the sheet's warning. - func testAKnownAppsRequestThatReturnsElsewhereIsRefused() { + /// The brand map only names an app: a known app's request that returns + /// to a host the app does not have is accepted with a warning, like one + /// without a callback or one for an app the wallet does not know. + func testAKnownAppsRequestThatReturnsElsewhereIsWarnedAbout() { XCTAssertEqual( - AppConnect.callbackRefusal(callbackHost: "yap.pr.example.com", brandHost: "yap.pr")?.status, .invalid) - XCTAssertEqual(AppConnect.callbackRefusal(callbackHost: "notyap.pr", brandHost: "yap.pr")?.status, .invalid) - XCTAssertNil(AppConnect.callbackRefusal(callbackHost: "yap.pr", brandHost: "yap.pr")) - XCTAssertNil(AppConnect.callbackRefusal(callbackHost: "www.yap.pr", brandHost: "yap.pr")) - XCTAssertNil(AppConnect.callbackRefusal(callbackHost: nil, brandHost: "yap.pr")) - XCTAssertNil(AppConnect.callbackRefusal(callbackHost: "example.com", brandHost: nil)) + AppConnect.originWarning(callbackHost: "yap.pr.example.com", brandHost: "yap.pr"), + .returnsElsewhere(callbackHost: "yap.pr.example.com")) + XCTAssertEqual( + AppConnect.originWarning(callbackHost: "notyap.pr", brandHost: "yap.pr"), + .returnsElsewhere(callbackHost: "notyap.pr")) + XCTAssertNil(AppConnect.originWarning(callbackHost: "yap.pr", brandHost: "yap.pr")) + XCTAssertNil(AppConnect.originWarning(callbackHost: "www.yap.pr", brandHost: "yap.pr")) + XCTAssertEqual(AppConnect.originWarning(callbackHost: nil, brandHost: "yap.pr"), .noCallback(website: "yap.pr")) + XCTAssertEqual(AppConnect.originWarning(callbackHost: "example.com", brandHost: nil), .unknownApp) XCTAssertEqual( DashConnectFallbackAppMetadata.brandHost(contractId: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F"), "yap.pr") XCTAssertNil(DashConnectFallbackAppMetadata.brandHost(contractId: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec")) From 0d4648460173a0efc197b2a5f423a69a05f4c962 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 6 Nov 2026 18:06:09 +0200 Subject: [PATCH 093/108] fix(dashconnect): refuse, not retry, a request that names an absent contract A v2 request asking for a key on a contract the network proves absent let the not-found error escape the owner lookup, so the sheet offered "Try again" for a request that can never pass. The lookup now reads such a contract as having no owner, and the request gets the existing refusal for a contract the app does not own, as an absent contract group already did. Any other failure to read still leaves the request unresolved. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 17 +++++++++++++++- .../PlatformDashConnectDataSourceTests.swift | 20 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 3ad82a9b1d..ee88f3806e 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -704,6 +704,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } + /// The owner of the contract `read` returns. A contract the network + /// proves absent has none, so rule 3 refuses the request instead of the + /// sheet offering to try again; any other failure to read throws. + static func contractOwner(_ read: () async throws -> [String: Any]) async throws -> Data? { + let contract: [String: Any] + do { + contract = try await read() + } catch SDKError.notFound { + return nil + } + return (contract["ownerId"] as? String ?? contract["$ownerId"] as? String).flatMap(decodeIdentifier) + } + /// The ids among `contractIds` and `groupIds` of the contracts and the /// contract groups whose owner is the owner of `contractId`, which is /// itself among the contracts returned. One the network proves absent @@ -789,7 +802,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let name = grant.binding.documentTypeName ?? "" guard contractOwners[id] == nil, !AppConnect.allowedForeignDocumentTypes.contains("\(id.toBase58String())/\(name)") else { continue } - contractOwners[id] = ownerId(of: try await sdk.dataContractGetOffMain(id: id.toBase58String())) + contractOwners[id] = try await Self.contractOwner { + try await sdk.dataContractGetOffMain(id: id.toBase58String()) + } } } // A contract whose config this build cannot read says nothing of its diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 5fe25782c3..48be0101a5 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2073,6 +2073,26 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertFalse(AppConnect.holdsLiveSessionKey(appContractId: app, bindings: [authenticationKey()])) } + func testAContractTheNetworkProvesAbsentHasNoOwnerSoTheRequestIsRefused() async throws { + let owner = Data(repeating: 0xC3, count: 32) + let read = try await PlatformDashConnectDataSource.contractOwner { ["ownerId": owner.toBase58String()] } + XCTAssertEqual(read, owner) + + do { + let absent = try await PlatformDashConnectDataSource.contractOwner { + throw SDKError.notFound("no contract") + } + XCTAssertNil(absent) + } catch { + XCTFail("An absent contract must read as no owner, not throw: \(error)") + } + + do { + _ = try await PlatformDashConnectDataSource.contractOwner { throw SDKError.timeout("slow") } + XCTFail("A failed read is not an absent contract") + } catch SDKError.timeout {} + } + func testOnlyAWholeSingleContractBoundNamesTheApp() { let app = Data(repeating: 0xA1, count: 32) XCTAssertEqual(AppConnect.singleContractId(boundsKind: 1, boundIds: [app]), app) From 5620cbcf447b963aae950457bb685d55ec78dd7d Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 6 Nov 2026 19:34:17 +0200 Subject: [PATCH 094/108] fix(dashconnect): refuse a v2 request for an absent app contract or document type A v2 request whose app contract the network proves absent let the not-found error escape preflight, so the sheet offered "Try again" for a request that can never pass; it is now refused. A document-type binding was checked only for the contract's owner, so a type the contract does not define reached an approvable sheet and failed only when Platform rejected the identity update; preflight now keeps the contracts it read, the app's own included, and refuses a type the contract does not define. A contract whose document types this build cannot read asks for an update instead. Other read failures still leave the request unresolved. The preflight now takes its contract and group reads as closures, so the tests drive the whole path. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 23 +++++ .../PlatformDashConnectDataSource.swift | 57 +++++++------ DashWallet/ar.lproj/Localizable.strings | 3 + DashWallet/bg.lproj/Localizable.strings | 3 + DashWallet/ca.lproj/Localizable.strings | 3 + DashWallet/cs.lproj/Localizable.strings | 3 + DashWallet/da.lproj/Localizable.strings | 3 + DashWallet/de.lproj/Localizable.strings | 3 + DashWallet/el.lproj/Localizable.strings | 3 + DashWallet/en.lproj/Localizable.strings | 3 + DashWallet/eo.lproj/Localizable.strings | 3 + DashWallet/es.lproj/Localizable.strings | 3 + DashWallet/et.lproj/Localizable.strings | 3 + DashWallet/fa.lproj/Localizable.strings | 3 + DashWallet/fi.lproj/Localizable.strings | 3 + DashWallet/fil.lproj/Localizable.strings | 3 + DashWallet/fr.lproj/Localizable.strings | 3 + DashWallet/hr.lproj/Localizable.strings | 3 + DashWallet/hu.lproj/Localizable.strings | 3 + DashWallet/id.lproj/Localizable.strings | 3 + DashWallet/it.lproj/Localizable.strings | 3 + DashWallet/ja.lproj/Localizable.strings | 3 + DashWallet/ko.lproj/Localizable.strings | 3 + DashWallet/mk.lproj/Localizable.strings | 3 + DashWallet/ms.lproj/Localizable.strings | 3 + DashWallet/nb.lproj/Localizable.strings | 3 + DashWallet/nl.lproj/Localizable.strings | 3 + DashWallet/pl.lproj/Localizable.strings | 3 + DashWallet/pt.lproj/Localizable.strings | 3 + DashWallet/ro.lproj/Localizable.strings | 3 + DashWallet/ru.lproj/Localizable.strings | 3 + DashWallet/sk.lproj/Localizable.strings | 3 + DashWallet/sl.lproj/Localizable.strings | 3 + DashWallet/sl_SI.lproj/Localizable.strings | 3 + DashWallet/sq.lproj/Localizable.strings | 3 + DashWallet/sr.lproj/Localizable.strings | 3 + DashWallet/sv.lproj/Localizable.strings | 3 + DashWallet/th.lproj/Localizable.strings | 3 + DashWallet/tr.lproj/Localizable.strings | 3 + DashWallet/uk.lproj/Localizable.strings | 3 + DashWallet/vi.lproj/Localizable.strings | 3 + DashWallet/zh-Hans.lproj/Localizable.strings | 3 + .../zh-Hant-TW.lproj/Localizable.strings | 3 + DashWallet/zh.lproj/Localizable.strings | 3 + DashWallet/zh_TW.lproj/Localizable.strings | 3 + .../DashConnect/AppConnectV2LoginTests.swift | 85 +++++++++++++++++++ .../PlatformDashConnectDataSourceTests.swift | 20 ----- 47 files changed, 270 insertions(+), 44 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 3952037431..3dfac5b6ac 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -307,6 +307,29 @@ extension AppConnect { return nil } + /// Wallet rule 3 for a document-type binding: the type has to be one its + /// contract defines, which Platform checks again when the key is added. + /// `contracts` holds the contracts preflight read; a binding whose + /// contract is not among them (the allowlisted DashPay `profile`) is not + /// checked here. A contract whose document types this build cannot read + /// asks for an update rather than proving the type missing. + static func documentTypeRefusal(for plan: GrantPlan, contracts: [Data: [String: Any]]) -> Refusal? { + for grant in plan.auth where grant.binding.kind == .documentType { + guard let contract = contracts[grant.binding.id] else { continue } + guard let schemas = contract["documentSchemas"] as? [String: Any] else { + return Refusal(.unsupported, NSLocalizedString( + "This version of the wallet cannot read the document types of the app's contract. Update the wallet.", + comment: "DashConnect App Connect v2")) + } + guard schemas[grant.binding.documentTypeName ?? ""] != nil else { + return Refusal(.invalid, NSLocalizedString( + "The app asks for a key on a document type its contract does not define.", + comment: "DashConnect App Connect v2")) + } + } + return nil + } + // MARK: Keys /// The DIP-13 leaf of binding `bindingIndex`'s auth key: diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index ee88f3806e..27b41ddba7 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -689,7 +689,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { "This sign-in is for another identity. Switch to it in this wallet and ask the app again.", comment: "DashConnect App Connect v2"))), nil) } - let ownership = try await appConnectOwnership(plan, sdk: context.sdk) + let sdk = context.sdk + let ownership = try await Self.appConnectOwnership( + plan, + readContract: { try await sdk.dataContractGetOffMain(id: $0.toBase58String()) }, + readGroup: { try await sdk.getContractGroupInfo(contractGroupId: $0.toBase58String()) }) if let refusal = ownership.refusal { return (.refused(refusal), nil) } @@ -704,19 +708,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - /// The owner of the contract `read` returns. A contract the network - /// proves absent has none, so rule 3 refuses the request instead of the - /// sheet offering to try again; any other failure to read throws. - static func contractOwner(_ read: () async throws -> [String: Any]) async throws -> Data? { - let contract: [String: Any] - do { - contract = try await read() - } catch SDKError.notFound { - return nil - } - return (contract["ownerId"] as? String ?? contract["$ownerId"] as? String).flatMap(decodeIdentifier) - } - /// The ids among `contractIds` and `groupIds` of the contracts and the /// contract groups whose owner is the owner of `contractId`, which is /// itself among the contracts returned. One the network proves absent @@ -760,15 +751,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return (contracts, groups) } - /// Reads the owners wallet rule 3 compares from Platform. A group the + /// Reads the owners and document types wallet rule 3 compares from + /// Platform through `readContract` and `readGroup`. An app contract the + /// network proves absent refuses the request; a contract or group the /// network proves absent counts as not the app's; any other failure to - /// read throws, so the sheet offers to try again. The reads run off the - /// main actor (`dataContractGetOffMain`; `getContractGroupInfo` is - /// nonisolated), so the sheet stays responsive while they wait. Also + /// read throws, so the sheet offers to try again. The caller's reads run + /// off the main actor (`dataContractGetOffMain`; `getContractGroupInfo` + /// is nonisolated), so the sheet stays responsive while they wait. Also /// returns the groups that have administrators, for the sheet. - private func appConnectOwnership( + static func appConnectOwnership( _ plan: AppConnect.GrantPlan, - sdk: SDK + readContract: (Data) async throws -> [String: Any], + readGroup: (Data) async throws -> [String: Any] ) async throws -> ( refusal: AppConnect.Refusal?, administeredGroupIds: Set, @@ -777,7 +771,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func ownerId(of contract: [String: Any]) -> Data? { (contract["ownerId"] as? String ?? contract["$ownerId"] as? String).flatMap(Self.decodeIdentifier) } - let app = try await sdk.dataContractGetOffMain(id: plan.appId.toBase58String()) + let app: [String: Any] + do { + app = try await readContract(plan.appId) + } catch SDKError.notFound { + return (AppConnect.Refusal(.invalid, NSLocalizedString( + "The app's contract does not exist on this network.", comment: "DashConnect App Connect v2")), [], [:]) + } guard let appOwnerId = ownerId(of: app) else { return (AppConnect.Refusal(.invalid, NSLocalizedString( "The app's contract has no readable owner.", comment: "DashConnect App Connect v2")), [], [:]) @@ -785,13 +785,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { var groupOwners: [Data: Data] = [:] var administeredGroupIds: Set = [] var contractOwners: [Data: Data] = [plan.appId: appOwnerId] + var contracts: [Data: [String: Any]] = [plan.appId: app] for grant in plan.auth { let id = grant.binding.id switch grant.binding.kind { case .contractGroup: guard groupOwners[id] == nil else { continue } do { - let info = try await sdk.getContractGroupInfo(contractGroupId: id.toBase58String()) + let info = try await readGroup(id) groupOwners[id] = (info["ownerId"] as? String).flatMap(Self.decodeIdentifier) // Read as administered unless the proof shows none. if (info["adminIds"] as? [Any])?.isEmpty != true { administeredGroupIds.insert(id) } @@ -802,9 +803,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let name = grant.binding.documentTypeName ?? "" guard contractOwners[id] == nil, !AppConnect.allowedForeignDocumentTypes.contains("\(id.toBase58String())/\(name)") else { continue } - contractOwners[id] = try await Self.contractOwner { - try await sdk.dataContractGetOffMain(id: id.toBase58String()) + // A contract the network proves absent has no owner, so + // rule 3 refuses the request; any other failure throws. + let contract: [String: Any] + do { + contract = try await readContract(id) + } catch SDKError.notFound { + continue } + contracts[id] = contract + contractOwners[id] = ownerId(of: contract) } } // A contract whose config this build cannot read says nothing of its @@ -833,6 +841,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { contractOwners: contractOwners, appBoundedKeyPurposes: Set(currentKeyRules.keys), appUnreadableKeyPurposes: unreadableKeyPurposes) + ?? AppConnect.documentTypeRefusal(for: plan, contracts: contracts) return (refusal, administeredGroupIds, currentKeyRules) } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 954997f9b1..2f43c87dde 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 66f28dfa4e..382a7e6f81 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 74ab114a4f..097cdd5a1f 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 9968ed3cb5..33e9703105 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index f267067f89..6606e77f6c 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 9b8f15fd95..10767ee8ce 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index cc86832baf..05bf9f9472 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 3ff9769cb5..83ccf6a6ad 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6653,6 +6653,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index c366e836ee..1149e83054 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 0700e4fb97..9e72dd22d1 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 106c47686a..1f59577d24 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index ce14728994..1285c5248e 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 8a004d1e99..4fca6f4d51 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 9085647ae3..2cf1fa9024 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index e7c42dfb89..3108c05d8e 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 596f4d0ea2..711cad3133 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 14a9393f3d..d4bfa124e0 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index ec63c8c154..136a52159b 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index fe130020d7..0effe0cfe7 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 33e71a12ff..cff08493a5 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 2bb1316e4b..461e9e7702 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 1dd11eea9d..88e4247b98 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 128c0e37af..eefc080cc9 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index c226f2dc85..ccdc53b790 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index dc5c959da2..64bfe88f95 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index ecbf3f2be9..6445ed2a04 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 75e86d34ec..e62d155202 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 2545040dbd..820f898c54 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 9beb88006b..051581f40a 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index defde3bf3a..05ad9800e0 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 5ef142abe3..ff910b007b 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 3cfe45a9bd..d0d8e5fa12 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index bc8c2d1c23..a3e67a962f 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 2d07799ee4..526483b073 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index c1d373f0db..70338db10e 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 0acecf3d26..f2755cbf46 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index a9a4259b76..161809d604 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 8b6259f86b..16d7adaa27 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index db7a6e346d..74ea6a97b6 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 61193fffa6..535916ea05 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 620abd43c7..344ab1b8d8 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6858,6 +6858,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index a1e48c8707..2753fe90c9 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 315ecf2b6b..6e5ddf8104 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6856,6 +6856,9 @@ "Requested %@" = "Requested %@"; "The app asks for a key on a contract group it does not own." = "The app asks for a key on a contract group it does not own."; "The app asks for a key on a contract it does not own." = "The app asks for a key on a contract it does not own."; +"The app asks for a key on a document type its contract does not define." = "The app asks for a key on a document type its contract does not define."; +"The app's contract does not exist on this network." = "The app's contract does not exist on this network."; +"This version of the wallet cannot read the document types of the app's contract. Update the wallet." = "This version of the wallet cannot read the document types of the app's contract. Update the wallet."; "The app asks for a key that has already expired." = "The app asks for a key that has already expired."; "The app asks for an encryption key on a contract other than its own." = "The app asks for an encryption key on a contract other than its own."; "The app's contract keeps no current key bound to it for the encryption it asks for." = "The app's contract keeps no current key bound to it for the encryption it asks for."; diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index fb8fb2a679..61e157d1df 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -293,6 +293,91 @@ final class AppConnectV2LoginTests: XCTestCase { XCTAssertEqual(refusal(owner: Data(repeating: 0x0B, count: 32))?.status, .invalid) } + func testAnAppContractTheNetworkProvesAbsentIsRefused() async throws { + let plan = try Self.vectorPlan() + let absent = try await PlatformDashConnectDataSource.appConnectOwnership( + plan, + readContract: { _ in throw SDKError.notFound("no contract") }, + readGroup: { _ in throw SDKError.notFound("no group") }) + XCTAssertEqual(absent.refusal?.status, .invalid) + + do { + _ = try await PlatformDashConnectDataSource.appConnectOwnership( + plan, + readContract: { _ in throw SDKError.timeout("slow") }, + readGroup: { _ in throw SDKError.timeout("slow") }) + XCTFail("A failed read is not an absent contract") + } catch SDKError.timeout {} + } + + func testABindingContractTheNetworkProvesAbsentHasNoOwnerSoTheRequestIsRefused() async throws { + let other = Data(repeating: 0x0C, count: 32) + let plan = try AppConnect.grantPlan(for: Self.uri(authBindings: [ + .init(kind: .singleContract, securityLevel: .high, id: other, + totalBudget: nil, expiresAt: nil, documentTypeName: nil), + ]), now: Self.now) + func ownership(_ otherRead: @escaping () throws -> [String: Any]) async throws -> AppConnect.Refusal? { + try await PlatformDashConnectDataSource.appConnectOwnership( + plan, + readContract: { id in + id == Self.appId + ? ["ownerId": Self.appOwner.toBase58String(), "config": [:] as [String: Any]] + : try otherRead() + }, + readGroup: { _ in throw SDKError.notFound("no group") }).refusal + } + let absent = try await ownership { throw SDKError.notFound("no contract") } + XCTAssertEqual(absent?.status, .invalid) + + do { + _ = try await ownership { throw SDKError.timeout("slow") } + XCTFail("A failed read is not an absent contract") + } catch SDKError.timeout {} + } + + func testADocumentTypeTheContractDoesNotDefineIsRefused() async throws { + let other = Data(repeating: 0x0C, count: 32) + func binding(_ id: Data, _ name: String) -> AppConnectRequest.AuthBinding { + .init(kind: .documentType, securityLevel: .high, id: id, + totalBudget: nil, expiresAt: nil, documentTypeName: name) + } + func contract(_ schemas: [String: Any]?) -> [String: Any] { + var contract: [String: Any] = ["ownerId": Self.appOwner.toBase58String(), "config": [:] as [String: Any]] + contract["documentSchemas"] = schemas + return contract + } + func refusal( + _ bindings: [AppConnectRequest.AuthBinding], + other otherSchemas: [String: Any]? = ["note": [:] as [String: Any]] + ) async throws -> AppConnect.Refusal? { + let plan = try AppConnect.grantPlan(for: Self.uri(authBindings: bindings), now: Self.now) + return try await PlatformDashConnectDataSource.appConnectOwnership( + plan, + readContract: { id in + contract(id == Self.appId ? ["post": [:] as [String: Any]] : otherSchemas) + }, + readGroup: { _ in throw SDKError.notFound("no group") }).refusal + } + + // On the app's own contract, which is never read twice. + let onApp = try await refusal([binding(Self.appId, "post")]) + XCTAssertNil(onApp) + let undefinedOnApp = try await refusal([binding(Self.appId, "comment")]) + XCTAssertEqual(undefinedOnApp?.status, .invalid) + // On another contract of the app's owner. + let onOther = try await refusal([binding(other, "note")]) + XCTAssertNil(onOther) + let undefinedOnOther = try await refusal([binding(other, "post")]) + XCTAssertEqual(undefinedOnOther?.status, .invalid) + // A contract whose document types this build cannot read is not + // proof the type is missing. + let unreadable = try await refusal([binding(other, "note")], other: nil) + XCTAssertEqual(unreadable?.status, .unsupported) + // DashPay `profile` is allowlisted and never looked up. + let profile = try await refusal([binding(Self.dashpayContractId, "profile")]) + XCTAssertNil(profile) + } + func testASystemContractIsNeverTheAppNorABindingTarget() throws { let dpns = try XCTUnwrap(Data.identifier(fromBase58: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec")) // A request naming DPNS as its app, where DPNS's owner would pass as diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 48be0101a5..5fe25782c3 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2073,26 +2073,6 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertFalse(AppConnect.holdsLiveSessionKey(appContractId: app, bindings: [authenticationKey()])) } - func testAContractTheNetworkProvesAbsentHasNoOwnerSoTheRequestIsRefused() async throws { - let owner = Data(repeating: 0xC3, count: 32) - let read = try await PlatformDashConnectDataSource.contractOwner { ["ownerId": owner.toBase58String()] } - XCTAssertEqual(read, owner) - - do { - let absent = try await PlatformDashConnectDataSource.contractOwner { - throw SDKError.notFound("no contract") - } - XCTAssertNil(absent) - } catch { - XCTFail("An absent contract must read as no owner, not throw: \(error)") - } - - do { - _ = try await PlatformDashConnectDataSource.contractOwner { throw SDKError.timeout("slow") } - XCTFail("A failed read is not an absent contract") - } catch SDKError.timeout {} - } - func testOnlyAWholeSingleContractBoundNamesTheApp() { let app = Data(repeating: 0xA1, count: 32) XCTAssertEqual(AppConnect.singleContractId(boundsKind: 1, boundIds: [app]), app) From ae778184066e173bc9574a769f9c1a6bd7341863 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Mon, 9 Nov 2026 12:26:06 +0200 Subject: [PATCH 095/108] fix(dashconnect): refuse a v2 app owned like a system contract The system contract list missed DecisionProposals and TokenMarket, both registered from protocol 15 at the platform pin. A request naming one as its app, with a binding on it, passed the owner checks the way the DPNS test describes. Both ids are listed now, and an app whose contract has the all-zero owner every system contract has is refused as well, so a system contract added later is caught without updating the list. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 9 ++++++-- .../DashConnect/AppConnectV2LoginTests.swift | 21 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 3dfac5b6ac..4c62745f4b 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -29,7 +29,8 @@ extension AppConnect { /// Platform's system contracts (dashpay/platform `data-contracts`), the /// same ids on every network. None of them is an app: a request naming /// one as its app, or binding a key to one, is refused, except for the - /// document types allowlisted above. + /// document types allowlisted above. A contract added later is still + /// caught as the app by its owner (`systemContractOwnerId`). static let systemContractIds: Set = [ "4fJLR2GYTPFdomuTVvNy3VRrvWgvkKPzqehEBpNf2nk6", // withdrawals "rUnsWrFu3PKyRMGk2mxmZVBPbQuZx2qtHeFjURoQevX", // masternode reward shares @@ -41,7 +42,11 @@ extension AppConnect { "6voHRaoiPcfmMhbqCA9dixH98xcgPQ9UEcuaXjpVu3LD", // document history contractId, // App Connect "EG7RGfV8fDTayC2FyVr8HwdpJh3fXDbVztcfE94UmN88", // moderation charters + "3iNyoNwjCTkb7XS3RHyWUtLx7pgC6AFAEQNNDHzxqngF", // decision proposals (protocol 15) + "AE6yYq65VdfGCg2MSyV9vV7cWGiFWjbwBuy7THesDh4e", // token market (protocol 15) ] + /// The owner of every system contract. No identity has this id. + static let systemContractOwnerId = Data(count: 32) // MARK: What an approval grants @@ -267,7 +272,7 @@ extension AppConnect { appBoundedKeyPurposes: Set, appUnreadableKeyPurposes: Set = [] ) -> Refusal? { - if systemContractIds.contains(plan.appId.toBase58String()) { + if systemContractIds.contains(plan.appId.toBase58String()) || appOwnerId == systemContractOwnerId { return Refusal(.invalid, NSLocalizedString( "The request names a Dash Platform system contract as the app.", comment: "DashConnect App Connect v2")) diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index 61e157d1df..8fc1955048 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -407,6 +407,27 @@ final class AppConnectV2LoginTests: XCTestCase { .invalid) } + func testAnAppOwnedLikeASystemContractIsRefusedEvenWhenUnlisted() throws { + // An app whose contract has the all-zero owner of every system + // contract, as a protocol-15 contract missing from the list would. + let zeroOwner = AppConnect.systemContractOwnerId + let plan = try AppConnect.grantPlan(for: Self.uri(authBindings: [ + .init(kind: .documentType, securityLevel: .high, id: Self.appId, + totalBudget: nil, expiresAt: nil, documentTypeName: "post"), + ]), now: Self.now) + XCTAssertFalse(AppConnect.systemContractIds.contains(Self.appId.toBase58String())) + XCTAssertEqual( + AppConnect.ownershipRefusal( + for: plan, appOwnerId: zeroOwner, groupOwners: [:], + contractOwners: [Self.appId: zeroOwner], appBoundedKeyPurposes: [])?.status, + .invalid) + // The two protocol-15 system contracts are listed. + XCTAssertTrue(AppConnect.systemContractIds.isSuperset(of: [ + "3iNyoNwjCTkb7XS3RHyWUtLx7pgC6AFAEQNNDHzxqngF", // decision proposals + "AE6yYq65VdfGCg2MSyV9vV7cWGiFWjbwBuy7THesDh4e", // token market + ])) + } + // MARK: - Re-sending an auth key func testAKeyOnTheIdentityIsSentAgainOnlyWithinThePlansTerms() throws { From 654b76ba8dccd961f5a25c04547bdcba2e7dc8c8 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Mon, 9 Nov 2026 14:21:11 +0200 Subject: [PATCH 096/108] test(dashconnect): drop the session-key terms from the refusal-at-Approve test The test came with #1210's merge; this branch removed the terms argument of the consent helper along with the session-key terms. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/PlatformDashConnectDataSourceTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 64094a2a91..eda0f94e53 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -662,7 +662,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { var request = MockDashConnectDataSource.sampleLoginRequest request.appConnect = try DashConnectUri.parseAppConnectRequest( "dash-key:2fAANHHASdojyjV9Sqa2wf2nwZE8kLLqmeHpZWa8sBfaGsddVqyMG2ZVte7xJkTKsXvmFYbXzXbNnMo7bJQBxNcf79N8YWi7pLKyb39Rqv6b1KUmxw9UeJGYz2CV9hFGNUQtcyMYVq2Fg6vAxtxpYays61H8gLMcWqaG8TfgGA3H7setGAYiBsM5YmdZgeuCdGAHSwfNfav5cfFjXNDkPWv37UNSgFxj6o58jfXc3kCLKqLJtc5ZPjm1thEGYxK8HVYBi8fRQeEVy76n27DXGrVTyHz94CfJRuMnH76xGYbMgeuvurxjJMLrQgWUu53cjocYyzzNWdJrgs2D5?n=d&v=2&cb=https%3A%2F%2Fyap.pr%2Fconnect%3Fr%3Dd77dc0da9df83a47755a15c42c5d9db9d7a7fd62") - let spy = LoginApprovalSpy(shown: [Self.consent(identityId: "identity-a", terms: .current)], loginRequest: request) + let spy = LoginApprovalSpy(shown: [Self.consent(identityId: "identity-a")], loginRequest: request) spy.approveFailures = [AppConnect.Refusal(.stale, "The request is too old.")] let opened = OpenedURLs() let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false, openURL: { opened.urls.append($0) }) From 19e57aa8ccdaed5230291c713ed765f65922f950 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Mon, 9 Nov 2026 19:35:44 +0200 Subject: [PATCH 097/108] docs(dashconnect): give the wallet's own gate as the reason a mainnet v2 request is refused The parser refuses request v2 for mainnet on both carriers, as ADR-0009 records. The comment, the error text and a test comment gave the DIP as the reason, but the DIP allows dashpay://connect on mainnet and forbids only dash-key: there. They now say it is not enabled on mainnet yet (ADR-0009). The doc comment of MainTabbarController.openDashConnect also names the dashpay://connect link it handles. Behaviour is unchanged. Follow-up to review on #1257. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/Protocol/DashConnectUri.swift | 7 ++++--- DashWallet/Sources/UI/Main/MainTabbarController.swift | 3 ++- DashWalletTests/DashConnect/DashConnectUriTests.swift | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift index 5d633da31c..6416941bdf 100644 --- a/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift +++ b/DashWallet/Sources/Models/DashConnect/Protocol/DashConnectUri.swift @@ -418,10 +418,11 @@ enum DashConnectUri { guard let network = parameters["n"].flatMap(DashConnectNetwork.init(rawValue:)) else { throw AppConnectRequestError.invalid("unknown network") } - // The DIP defines this request for testnet and devnets only. Refused - // here, so it does not rest on DashConnect being off on mainnet. + // Not enabled on mainnet yet (ADR-0009), on either carrier; the DIP + // allows `dashpay://connect` there. Refused here, so it does not rest + // on DashConnect being off on mainnet. guard network != .mainnet else { - throw AppConnectRequestError.invalid("request v2 is not defined for mainnet") + throw AppConnectRequestError.invalid("request v2 is not enabled on mainnet") } let body = try payload() guard body.count <= maxAppConnectPayloadLength else { diff --git a/DashWallet/Sources/UI/Main/MainTabbarController.swift b/DashWallet/Sources/UI/Main/MainTabbarController.swift index c078452d6a..7ea39b88d5 100644 --- a/DashWallet/Sources/UI/Main/MainTabbarController.swift +++ b/DashWallet/Sources/UI/Main/MainTabbarController.swift @@ -544,7 +544,8 @@ extension MainTabbarController { homeController?.performPay(to: url) } - /// Opens the Connections screen for a `dash-key:` / `dash-st:` link. + /// Opens the Connections screen for a `dash-key:`, `dash-st:` or + /// `dashpay://connect` link. /// /// The More tab's index moves with the DashPay layout, so it comes from /// `moreTabIndex` rather than from the tab enum. diff --git a/DashWalletTests/DashConnect/DashConnectUriTests.swift b/DashWalletTests/DashConnect/DashConnectUriTests.swift index d76bdd6666..cb7e84eb4b 100644 --- a/DashWalletTests/DashConnect/DashConnectUriTests.swift +++ b/DashWalletTests/DashConnect/DashConnectUriTests.swift @@ -352,7 +352,7 @@ final class DashConnectUriTests: XCTestCase { XCTAssertNotEqual(mainnetUri, AppConnectVector.renewUri) XCTAssertThrowsError(try DashConnectUri.parseAppConnectRequest(mainnetUri)) { error in - XCTAssertEqual(error as? AppConnectRequestError, .invalid("request v2 is not defined for mainnet")) + XCTAssertEqual(error as? AppConnectRequestError, .invalid("request v2 is not enabled on mainnet")) } } @@ -873,9 +873,9 @@ extension DashConnectUriTests { for (code, network) in networks { XCTAssertEqual(try DashConnectUri.parseConnectRequest(Self.connectUri(r: r, query: "v=2&n=\(code)")).network, network) } - // As on `dash-key:`: the request is not defined for mainnet. + // As on `dash-key:`: request v2 is not enabled on mainnet yet (ADR-0009). XCTAssertThrowsError(try DashConnectUri.parseConnectRequest(Self.connectUri(r: r, query: "v=2&n=m"))) { error in - XCTAssertEqual(error as? AppConnectRequestError, .invalid("request v2 is not defined for mainnet")) + XCTAssertEqual(error as? AppConnectRequestError, .invalid("request v2 is not enabled on mainnet")) } } From 2fca237a30c342f4acb7495483b002deaf72f7ba Mon Sep 17 00:00:00 2001 From: romchornyi Date: Mon, 9 Nov 2026 20:59:29 +0200 Subject: [PATCH 098/108] =?UTF-8?q?docs(adr):=20record=20#1301's=20App=20C?= =?UTF-8?q?onnect=20decisions=20(0027=E2=80=930030)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The intent projection, v2 only, a new approval while another is confirming, and the Not delivered row, as Proposed ADRs. Co-Authored-By: Claude Opus 5.5 --- ...-from-the-identity-and-recorded-intents.md | 56 +++++++++++++++++++ ...t-v2-only-and-remove-the-two-scan-login.md | 49 ++++++++++++++++ ...ct-approval-while-another-is-confirming.md | 45 +++++++++++++++ ...onse-was-not-published-as-not-delivered.md | 48 ++++++++++++++++ docs/adr/README.md | 4 ++ 5 files changed, 202 insertions(+) create mode 100644 docs/adr/0027-derive-app-connect-connections-from-the-identity-and-recorded-intents.md create mode 100644 docs/adr/0028-answer-app-connect-v2-only-and-remove-the-two-scan-login.md create mode 100644 docs/adr/0029-allow-a-new-app-connect-approval-while-another-is-confirming.md create mode 100644 docs/adr/0030-show-an-app-connect-connection-whose-response-was-not-published-as-not-delivered.md diff --git a/docs/adr/0027-derive-app-connect-connections-from-the-identity-and-recorded-intents.md b/docs/adr/0027-derive-app-connect-connections-from-the-identity-and-recorded-intents.md new file mode 100644 index 0000000000..567385ca82 --- /dev/null +++ b/docs/adr/0027-derive-app-connect-connections-from-the-identity-and-recorded-intents.md @@ -0,0 +1,56 @@ +# 0027 — Derive App Connect connections from the identity and recorded intents + +- **Status:** Proposed +- **Date:** 2026-11-09 +- **Deciders:** romchornyi (ADR author) + +## Context + +The earlier App Connect code (#1272) stored its own conclusions about Platform: grant records, +settlement states and predicted identity revisions, reconciled afterwards. Most review findings +on it came from that reconciliation: the unknown outcome of an identity update, which app a key +belongs to, and time. Platform cannot tell the wallet which app a key belongs to, so something has +to be stored, but only that. + +## Decision drivers + +- Every finding class traced back to a stored conclusion drifting from Platform. +- The user can always keep working and retry, with clear signals. +- Keys carry no app id, and an app key cannot be derived again from what is stored. + +## Considered options + +1. **Projection over intents.** Before each identity update the wallet writes a + `ConnectionIntent`: the app, the keys it submits and the response it will publish. Every row, + status and unrecorded key is computed from one read of the identity plus the intents + (`AppConnect.project`). +2. **A stored current state per connection**, moved by transitions, as #1272 did. +3. **Keep #1272** and fix its findings one by one. + +## Decision outcome + +**Chosen:** option 1. It removes the cause, stored conclusions, instead of the findings, and the +projection is pure, so table tests cover it. + +## Consequences + +**Positive** +- Rows cannot drift from Platform: a read rebuilds them. +- Retry, disconnect and a newer approval all read the same projection. + +**Negative** +- An intent lost to a reinstall, another device or a restore cannot be rebuilt: its keys show as + unrecorded and need their own handling on disconnect. +- A read projects only the active identity; access seen on another identity is kept in the row + cache (`seenOn`) and can be stale until that identity is read again. + +**Neutral** +- The stored rows stay, as a display cache rebuilt on every read. +- The intent is a stored schema: fields added later must decode as empty from older intents. +- The projection is pure and could move to a shared implementation for both wallets later. + +## Links + +- Feature summary: [docs/features/app-connect/README.md](../features/app-connect/README.md) +- Related ADR: [0009](0009-answer-app-connect-request-v2-with-wallet-derived-keys-under-wallet-limits.md) +- PR: #1301 diff --git a/docs/adr/0028-answer-app-connect-v2-only-and-remove-the-two-scan-login.md b/docs/adr/0028-answer-app-connect-v2-only-and-remove-the-two-scan-login.md new file mode 100644 index 0000000000..93bd597bae --- /dev/null +++ b/docs/adr/0028-answer-app-connect-v2-only-and-remove-the-two-scan-login.md @@ -0,0 +1,49 @@ +# 0028 — Answer App Connect v2 only and remove the two-scan login + +- **Status:** Proposed +- **Date:** 2026-11-09 +- **Deciders:** romchornyi (ADR author) + +## Context + +The two-scan `dash-key` login (App Connect v1) and its `dash-st` key registration were in the +code but never reached a store release, only internal TestFlight builds. Keeping them meant +protecting their keys from every App Connect cleanup, which produced its own class of review +findings: how the two-scan keys are derived, lockout, and coexistence with v2. The Android wallet +answers v2 only. + +## Decision drivers + +- New connections are v2 only, as on Android. +- Nothing to migrate: no store user has a two-scan connection. + +## Considered options + +1. **Remove v1.** A v1 QR is refused when scanned, `dash-st` is taken only as a token purchase, + and the protection of two-scan keys, the approved status and the scan-to-complete banner go. +2. **Refuse v1 from protocol 14 only**, keep the v1 flow below it and protect its keys from + cleanup. + +## Decision outcome + +**Chosen:** option 1. It never shipped, and keeping it cost more than any user it served. + +## Consequences + +**Positive** +- The two-scan protection is gone, and a disconnect no longer derives two-scan keys. + +**Negative** +- Keys from old two-scan logins on testnet show as unrecorded app keys and are turned off with + the app's disconnect. +- The Debug mock scan still feeds a v1 QR, which is refused. + +**Neutral** +- The login choice by protocol version (ADR-0006) still decides whether App Connect is offered. + +## Links + +- Feature summary: [docs/features/app-connect/README.md](../features/app-connect/README.md) +- Related ADRs: [0006](0006-choose-the-app-connect-login-by-the-protocol-version-read-at-runtime.md), + [0009](0009-answer-app-connect-request-v2-with-wallet-derived-keys-under-wallet-limits.md) +- PR: #1301 diff --git a/docs/adr/0029-allow-a-new-app-connect-approval-while-another-is-confirming.md b/docs/adr/0029-allow-a-new-app-connect-approval-while-another-is-confirming.md new file mode 100644 index 0000000000..37eb07f056 --- /dev/null +++ b/docs/adr/0029-allow-a-new-app-connect-approval-while-another-is-confirming.md @@ -0,0 +1,45 @@ +# 0029 — Allow a new App Connect approval while another one is still confirming + +- **Status:** Proposed +- **Date:** 2026-11-09 +- **Deciders:** romchornyi (ADR author) + +## Context + +An approval whose identity update may still land shows as Confirming. The Android wallet refuses +a new approval of the same app until it settles. A stuck update can stay Confirming for a long +time. + +## Decision drivers + +- The user can always keep working. +- Two updates must never race for one key id. + +## Considered options + +1. **Allow, with key ids reserved.** The key ids an open intent may still land on are reserved + for it, so a new approval takes other ids. The new approval supersedes the pending one, which + is closed once it can never land. +2. **Block, as Android does,** until the pending update lands or is disconnected. + +## Decision outcome + +**Chosen:** option 1. + +## Consequences + +**Positive** +- A stuck Confirming row never blocks the user from signing in again. + +**Negative** +- It differs from Android on purpose. +- Making sure a superseded update can never land later may cost one more identity update. + +**Neutral** +- The pending intent stays recorded until it is closed. + +## Links + +- Feature summary: [docs/features/app-connect/README.md](../features/app-connect/README.md) +- Related ADR: [0027](0027-derive-app-connect-connections-from-the-identity-and-recorded-intents.md) +- PR: #1301 diff --git a/docs/adr/0030-show-an-app-connect-connection-whose-response-was-not-published-as-not-delivered.md b/docs/adr/0030-show-an-app-connect-connection-whose-response-was-not-published-as-not-delivered.md new file mode 100644 index 0000000000..0134ef3e9c --- /dev/null +++ b/docs/adr/0030-show-an-app-connect-connection-whose-response-was-not-published-as-not-delivered.md @@ -0,0 +1,48 @@ +# 0030 — Show an App Connect connection whose response was not published as Not delivered + +- **Status:** Proposed +- **Date:** 2026-11-09 +- **Deciders:** romchornyi (ADR author) + +## Context + +An approval registers the app's keys first and publishes the response that hands them to the app +second. When the publish fails, the keys are live on the identity but the app never got them. +Showing that as Active claims a working connection. An approval makes one attempt and does not +retry the publish; the app needs a new code. + +## Decision drivers + +- A row says what Platform and the intents show, not what the wallet hopes. +- The only useful actions are Disconnect and a new code. + +## Considered options + +1. **A Not delivered row.** An app whose live access comes only from intents with no recorded + response shows "Not delivered", with Disconnect. A response that landed without its + acknowledgement is looked up on Platform when Connections refreshes, within a day of the + request. +2. **Active**, as an ordinary connection. +3. **A three-state delivery** (delivered, not delivered, unknown) on every intent. + +## Decision outcome + +**Chosen:** option 1. + +## Consequences + +**Positive** +- The row tells the user the app holds keys it cannot use, and offers to turn them off. + +**Negative** +- A response that was published but neither acknowledged nor found by the lookup within a day + stays shown as Not delivered. + +**Neutral** +- Disconnect turns the keys off whichever way the delivery went. + +## Links + +- Feature summary: [docs/features/app-connect/README.md](../features/app-connect/README.md) +- Related ADR: [0027](0027-derive-app-connect-connections-from-the-identity-and-recorded-intents.md) +- PR: #1301 diff --git a/docs/adr/README.md b/docs/adr/README.md index f7d28ca187..144af90198 100644 --- a/docs/adr/README.md +++ b/docs/adr/README.md @@ -11,6 +11,10 @@ where they disagree, ADR-0001 wins. | [0002](0002-keep-the-decision-log-in-docs-adr.md) | Keep the decision log in docs/adr | process | Accepted | | | [0006](0006-choose-the-app-connect-login-by-the-protocol-version-read-at-runtime.md) | Choose the App Connect login by the protocol version read at runtime | platform | Proposed | | | [0009](0009-answer-app-connect-request-v2-with-wallet-derived-keys-under-wallet-limits.md) | Answer App Connect request v2 with wallet-derived keys under wallet limits | platform | Proposed | | +| [0027](0027-derive-app-connect-connections-from-the-identity-and-recorded-intents.md) | Derive App Connect connections from the identity and recorded intents | platform | Proposed | | +| [0028](0028-answer-app-connect-v2-only-and-remove-the-two-scan-login.md) | Answer App Connect v2 only and remove the two-scan login | platform | Proposed | | +| [0029](0029-allow-a-new-app-connect-approval-while-another-is-confirming.md) | Allow a new App Connect approval while another one is still confirming | platform | Proposed | | +| [0030](0030-show-an-app-connect-connection-whose-response-was-not-published-as-not-delivered.md) | Show an App Connect connection whose response was not published as Not delivered | platform | Proposed | | Areas: `spv`, `platform`, `keys`, `storage`, `coinjoin`, `ui`, `build`, `process`. Each ADR takes one; a new Area is added to this list in the PR that first needs it. From 41ee4784c6cc13a00809fb7530fd9c387b642b67 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Mon, 9 Nov 2026 22:18:04 +0200 Subject: [PATCH 099/108] fix(dashconnect): disable the app's keys after the profile keys, and record the policy as ADR-0031 - A disconnect disables the unattributed DashPay profile keys before the app's own keys (`AppConnect.disableOrder`). A failure part way through the batches now leaves an app key live while a profile key is, so the retry of a disconnect with no grant record still reaches the profile keys left instead of removing the row with one still on. - The disconnect's comment no longer claims that a live key with an unreadable bound leaves the profile keys unchecked: that key stops the whole disconnect earlier (`sessionKeyIdsWithUnknownBinding`). - ADR-0031 (Proposed) records the policy of turning off unattributed profile keys with any disconnect, and the removal of Keep. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectV2Login.swift | 12 +++ .../PlatformDashConnectDataSource.swift | 15 ++-- .../DashConnect/AppConnectV2LoginTests.swift | 28 +++++++ ...ashpay-profile-keys-with-any-disconnect.md | 78 +++++++++++++++++++ docs/adr/README.md | 1 + 5 files changed, 129 insertions(+), 5 deletions(-) create mode 100644 docs/adr/0031-turn-off-unattributed-dashpay-profile-keys-with-any-disconnect.md diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift index 25dda9902a..cdf722c3bd 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectV2Login.swift @@ -951,6 +951,18 @@ extension AppConnect { .filter(unexpired.contains) } + /// The order a disconnect disables keys in: the unattributed profile + /// keys first, then the app's own keys. Platform takes + /// `maxKeysDisabledPerUpdate` keys per update, and an update that fails + /// leaves the later ones live. With the app's keys last, a failure part + /// way never leaves all of them off while a profile key is still live, + /// so the retry still counts as the app's disconnect and reaches the + /// profile keys left. + static func disableOrder(appKeyIds: [UInt32], profileKeyIds: [UInt32]) -> [UInt32] { + let app = Set(appKeyIds) + return Set(profileKeyIds).subtracting(app).sorted() + app.sorted() + } + /// The live v2-shaped keys on the identity that no grant record of it /// names, as a reinstall or a lost record leaves them: HASH160 /// authentication keys at HIGH or CRITICAL with an expiry (every v2 diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index d2781712c4..da43343054 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -2779,10 +2779,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // ends here: one with nothing of the app's here, or that ends with // the app held on another identity (or not checked there), leaves // them. A grant whose keys went in an earlier try that then failed - // still counts, so a retry reaches them. When the set cannot be told - // (a live key no record names whose bound the store cannot read, a - // stored one the view lacks, a record the store cannot read), none - // of them is touched, and the app's own keys still go. + // still counts, so a retry reaches them; so does an app key that + // stays live because the app's keys are disabled after the profile + // keys (`AppConnect.disableOrder`). When the set cannot be told from + // the store (a stored key no record names whose bound it cannot read + // and that the view lacks, a stored profile key the view lacks, a + // record it cannot read), none of them is touched, and the app's own + // keys still go. A live key in the view whose bound the store cannot + // read stops the whole disconnect earlier + // (`sessionKeyIdsWithUnknownBinding`): it may be the app's own. // TODO(app-connect-v2-pending-record): a v2 approval writes its record // only once its update is seen to land, so the profile key of one whose // outcome was unknown when it failed has no record and is turned off @@ -2801,7 +2806,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { nowMilliseconds: Int64(AppConnect.milliseconds(now()))) if let profileKeyIds { profileKeysOff = profileKeyIds.filter { !keyIds.contains($0) } - keyIds = Array(Set(keyIds).union(profileKeysOff)).sorted() + keyIds = AppConnect.disableOrder(appKeyIds: keyIds, profileKeyIds: profileKeysOff) } else { Self.logger.error("🔗 DASHCONNECT :: DashPay profile keys no record names could not be told; none turned off") profileKeysUnchecked = true diff --git a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift index bb9f3f7488..215e6d22bc 100644 --- a/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift +++ b/DashWalletTests/DashConnect/AppConnectV2LoginTests.swift @@ -634,6 +634,34 @@ final class AppConnectV2LoginTests: XCTestCase { currentIdentityPublicKeys: [key(1, disabled: true)], nowMilliseconds: now), []) } + /// The app's keys are disabled after the profile keys, so an update that + /// fails part way leaves an app key live while a profile key is: the + /// retry still counts as the app's disconnect. + func testADisconnectDisablesTheAppsKeysAfterTheProfileKeys() { + // One app key below ten profile keys: in id order the first update + // would take the app key and nine profile keys. + let order = AppConnect.disableOrder(appKeyIds: [3], profileKeyIds: Array(4 ... 13)) + XCTAssertEqual(order, Array(4 ... 13) + [3]) + let batches = stride(from: 0, to: order.count, by: AppConnect.maxKeysDisabledPerUpdate).map { + Array(order[$0 ..< min($0 + AppConnect.maxKeysDisabledPerUpdate, order.count)]) + } + XCTAssertEqual(batches.first, Array(4 ... 13), "the first update takes only profile keys") + // Whichever update fails, while a profile key is still live so is an + // app key. + for failed in batches.indices { + let off = Set(batches[.. Date: Tue, 10 Nov 2026 10:58:55 +0200 Subject: [PATCH 100/108] docs(dashpay): describe the encryption key rules in ADR-0009 and the rule-2 test ADR-0009's Keys bullet now states the rotation search, the earlier path derived on testnet and devnet only, and DIP rules 1-3; the forward reference to this change is removed. The rule-2 test's doc comment says what it checks: the behaviour came in with #1210. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectEncryptionRotationTests.swift | 4 ++-- ...request-v2-with-wallet-derived-keys-under-wallet-limits.md | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/DashWalletTests/DashConnect/AppConnectEncryptionRotationTests.swift b/DashWalletTests/DashConnect/AppConnectEncryptionRotationTests.swift index cffac929f5..77c00524f3 100644 --- a/DashWalletTests/DashConnect/AppConnectEncryptionRotationTests.swift +++ b/DashWalletTests/DashConnect/AppConnectEncryptionRotationTests.swift @@ -215,8 +215,8 @@ final class AppConnectEncryptionRotationTests: XCTestCase { // MARK: - Rule 2: keys for the binding, none live - /// The bug this replaces: a disabled current key of another wallet's - /// read as absent under `latest`, and the login registered a new key. + /// DIP rule 2: a disabled current key of another wallet's leaves the + /// slot out and registers nothing, under both rules. func testOnlyADisabledForeignKeyLeavesTheSlotOutAndRegistersNothing() throws { let theirs = Self.encryptionKey(9, data: Data([0x02] + [UInt8](repeating: 0x77, count: 32)), disabled: true) for rule: AppConnect.CurrentKeyRule in [.latest, .unique] { diff --git a/docs/adr/0009-answer-app-connect-request-v2-with-wallet-derived-keys-under-wallet-limits.md b/docs/adr/0009-answer-app-connect-request-v2-with-wallet-derived-keys-under-wallet-limits.md index e7efc798af..1de1e24b3a 100644 --- a/docs/adr/0009-answer-app-connect-request-v2-with-wallet-derived-keys-under-wallet-limits.md +++ b/docs/adr/0009-answer-app-connect-request-v2-with-wallet-derived-keys-under-wallet-limits.md @@ -33,7 +33,7 @@ The question is how far the wallet trusts the request: which keys it registers, - **Freshness.** A request more than 10 minutes old, or dated in the future, is refused. - **Owners.** Every binding must be on a contract (or contract group) owned by the owner of the app's contract; the one exception is the DashPay `profile` document type. A Platform system contract is never the app nor a binding target. An encryption binding must name the app's contract, and that contract must accept bounded keys of the purpose. The owners and the identity hint are read from Platform with proofs before the sheet is shown. - **Levels and limits.** CRITICAL only on a group key, HIGH on every other auth key, MEDIUM on encryption keys. A proposed budget is capped at 5 DASH and a lifetime at 365 days; a binding without an expiry gets 90 days. No limit the app asked for is dropped, and none it did not ask for is added. -- **Keys.** Each auth key is derived from the app's ephemeral key and the binding's index, so keys are distinct per binding and stable across retries of one request. The encryption key is the DIP-13 application encryption key for the app's contract, at rotation 0; it is sent again while it is the identity's current key for the app, and never rotated by this change. +- **Keys.** Each auth key is derived from the app's ephemeral key and the binding's index, so keys are distinct per binding and stable across retries of one request. The encryption key is the DIP-13 application encryption key for the app's contract, chosen by the DIP "Encryption Keys" rules. The wallet derives rotation `0'` at the path with the `rotation'` level, then each next rotation while the previous one is on the identity, and stops at the first that is not; on testnet and devnet only, it also derives the key at the earlier path without that level. A live current key is sent when it is one of these keys and left out otherwise (rule 1); a disabled current key leaves the slot out and registers nothing (rule 2); with no key for the binding, rotation `0'` at the new path is registered (rule 3). A login never rotates a key. - **One update.** The new keys are added, and the keys of this wallet's earlier grant with the same connection id are disabled, in one identity update the wallet signs. - **The answer.** The keys are sealed to the app's ephemeral key and published on the App Connect contract; the callback named in the request opens only after the user has answered the sheet. - **Networks.** A v2 request for mainnet is refused by the parser. @@ -54,7 +54,6 @@ The question is how far the wallet trusts the request: which keys it registers, **Neutral** - The caps (5 DASH, 365 days, 90 days) are the profile's and can be lowered by a later decision without changing the shape of this one. -- Encryption-key rotation, and keys from before the DIP-13 rotation level, are handled in a later change (#1258). ## Links From 20076bccc671bb538930a4a8246f5468892d466b Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 10 Nov 2026 12:24:55 +0200 Subject: [PATCH 101/108] fix(dashconnect): disable the app's keys after the other keys on disconnect Carries #1263's ADR-0031 order into the projection's disconnect: the DashPay profile keys no intent names and any fence left on are disabled before the app's own keys (`AppConnect.disableOrder`). An update that fails part way then leaves an app key live while another key is, so the app's row stays and its retry reaches the keys left. The merge of #1263 dropped the base's version, which sorted the grant-record plan. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectProjection.swift | 12 ++++++++ .../PlatformDashConnectDataSource.swift | 6 ++-- .../AppConnectProjectionTests.swift | 28 +++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift index 5c680260df..674bdff39f 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift @@ -479,6 +479,18 @@ extension AppConnect { var isEmpty: Bool { disable.isEmpty && fence.isEmpty && deleteResponses.isEmpty } } + /// The order a disconnect disables keys in: the other keys first (the + /// DashPay profile keys no intent names, a fence left on), then the + /// app's own keys. Platform takes `maxKeysDisabledPerUpdate` keys per + /// update, and an update that fails leaves the later ones live. With the + /// app's keys last, a failure part way never leaves all of them off while + /// another key is still live, so the app's row stays and its retry + /// reaches the keys left (ADR-0031). + static func disableOrder(appKeyIds: [UInt32], otherKeyIds: [UInt32]) -> [UInt32] { + let app = Set(appKeyIds) + return Set(otherKeyIds).subtracting(app).sorted() + app.sorted() + } + /// `includeUnrecorded`: also turn off the app's live keys no intent /// names; the user confirms that separately. static func disconnectPlan( diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 9ec7525754..444463dd70 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -2046,11 +2046,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // disconnect turns off everything that may be the app's, so they // are offered with any app's, on the user's confirm. let profileKeys = projection.unrecordedProfileKeyIds[context.identityId] ?? [] - plan.disable = Array(Set(plan.disable).union(includingUnrecorded ? profileKeys : [])).sorted() - let appKeysOff = plan.disable.count + plan.fence.count + let profileKeysOff = includingUnrecorded ? profileKeys : [] + let appKeysOff = Set(plan.disable).union(profileKeysOff).count + plan.fence.count // A fence an earlier try added and could not turn off yet. let fences = try await liveFenceKeyIds(snapshot: snapshot, intents: all, context: context) - plan.disable = Array(Set(plan.disable).union(fences)).sorted() + plan.disable = AppConnect.disableOrder(appKeyIds: plan.disable, otherKeyIds: profileKeysOff + fences) return (plan, snapshot, appKeysOff, Set(unrecordedAppKeys).union(profileKeys).count, projection.unplacedKeyIds[context.identityId]?.count ?? 0) } diff --git a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift index ff4e862b6b..9ba8a9882b 100644 --- a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift +++ b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift @@ -665,4 +665,32 @@ final class AppConnectProjectionTests: XCTestCase { let projection = AppConnect.project([Self.snapshot([theirs])], intents: [mine]) XCTAssertEqual(projection.connections.first { $0.appId == Self.otherApp }?.unrecordedKeyIds, [Self.identity: [7]]) } + + /// The app's keys are disabled after the other keys, so an update that + /// fails part way leaves an app key live while another key is: the app's + /// row stays, and its retry reaches the keys left (ADR-0031). + func testADisconnectDisablesTheAppsKeysAfterTheOtherKeys() { + // One app key below ten profile keys: in id order the first update + // would take the app key and nine profile keys. + let order = AppConnect.disableOrder(appKeyIds: [3], otherKeyIds: Array(4 ... 13)) + XCTAssertEqual(order, Array(4 ... 13) + [3]) + let batches = stride(from: 0, to: order.count, by: AppConnect.maxKeysDisabledPerUpdate).map { + Array(order[$0 ..< min($0 + AppConnect.maxKeysDisabledPerUpdate, order.count)]) + } + XCTAssertEqual(batches.first, Array(4 ... 13), "the first update takes only the other keys") + // Whichever update fails, while another key is still live so is an + // app key. + for failed in batches.indices { + let off = Set(batches[.. Date: Tue, 10 Nov 2026 14:20:36 +0200 Subject: [PATCH 102/108] fix(dashconnect): retry a failed response delete on the next signed operation A disconnect whose response delete fails closes the intent with `responseRemoved` false, and its row goes, so no disconnect of the app reaches that response again. The next disconnect or approval on the identity, with the PIN given, now deletes the responses of every closed intent still marked (`AppConnect.responsesLeft`). Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/AppConnectProjection.swift | 8 ++++++++ .../PlatformDashConnectDataSource.swift | 18 ++++++++++++------ .../AppConnectProjectionTests.swift | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift index 674bdff39f..5c9eab027e 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift @@ -479,6 +479,14 @@ extension AppConnect { var isEmpty: Bool { disable.isEmpty && fence.isEmpty && deleteResponses.isEmpty } } + /// The intents on `identityId` that are closed but whose response may + /// still be on Platform: its delete failed, and with the row gone no + /// disconnect of the app reaches it again. The next signed operation on + /// the identity deletes it. + static func responsesLeft(identityId: Data, intents: [ConnectionIntent]) -> [UUID] { + intents.filter { $0.identityId == identityId && $0.closedAt != nil && !$0.responseRemoved }.map(\.id) + } + /// The order a disconnect disables keys in: the other keys first (the /// DashPay profile keys no intent names, a fence left on), then the /// app's own keys. Platform takes `maxKeysDisabledPerUpdate` keys per diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 444463dd70..eb0b9438ad 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1022,13 +1022,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { && $0.closedAt == nil && [.disconnected, .neverLanded].contains(AppConnect.status(of: $0, in: read)) } } ?? [] - if !superseded.isEmpty { + let ids = Set(superseded.map(\.id)) + if !ids.isEmpty { let closedAt = now() - let ids = Set(superseded.map(\.id)) updateIntents(in: stores) { intents in for index in intents.indices where ids.contains(intents[index].id) { intents[index].closedAt = closedAt } } - await deleteResponses(of: Array(ids), responseContractId: responseContractId, context: context, signer: signer) + } + let toDelete = ids.union(AppConnect.responsesLeft(identityId: context.identityId, intents: stores.intents.load())) + if !toDelete.isEmpty { + await deleteResponses(of: Array(toDelete), responseContractId: responseContractId, context: context, signer: signer) } await refreshRows(from: read, context: context) } @@ -1615,7 +1618,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// Deletes, by its original values, the response of each intent in `ids` /// that may be on Platform. Best effort: one that cannot be deleted now - /// stays marked and is tried again by the next disconnect of its app. + /// stays marked and is tried again by the next disconnect or approval on + /// the identity (`AppConnect.responsesLeft`). private func deleteResponses( of ids: [UUID], responseContractId: Data, @@ -1993,8 +1997,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } if !plan.deleteResponses.isEmpty, let responseContractId = Self.decodeIdentifier(AppConnect.contractId) { - await deleteResponses( - of: plan.deleteResponses, responseContractId: responseContractId, context: context, signer: signer) + // With the PIN given, the responses an earlier disconnect could + // not delete go too. + let ids = Set(plan.deleteResponses).union(AppConnect.responsesLeft(identityId: context.identityId, intents: stores.intents.load())) + await deleteResponses(of: Array(ids), responseContractId: responseContractId, context: context, signer: signer) } await refreshRows(from: after, context: context) diff --git a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift index 9ba8a9882b..d6dde22619 100644 --- a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift +++ b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift @@ -693,4 +693,23 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertEqual(AppConnect.disableOrder(appKeyIds: [4, 1], otherKeyIds: []), [1, 4]) XCTAssertEqual(AppConnect.disableOrder(appKeyIds: [], otherKeyIds: [6, 2]), [2, 6]) } + + /// A response whose delete failed stays on a closed intent: the next + /// signed operation on the identity picks it up, whichever app it is for. + func testAClosedIntentWhoseResponseWasNotDeletedIsLeftForTheNextSignedOperation() { + var left = Self.intent([Self.authKey(10)], published: true) + left.closedAt = Date(timeIntervalSince1970: 1) + var deleted = Self.intent([Self.authKey(11)], published: true) + deleted.closedAt = Date(timeIntervalSince1970: 1) + deleted.responseRemoved = true + let open = Self.intent([Self.authKey(12)], published: true) + var otherIdentity = Self.intent([Self.authKey(13)], identity: Self.otherIdentity, published: true) + otherIdentity.closedAt = Date(timeIntervalSince1970: 1) + var otherApp = Self.intent([Self.authKey(14, bound: .singleContract(Self.otherApp))], app: Self.otherApp, published: true) + otherApp.closedAt = Date(timeIntervalSince1970: 1) + + let ids = AppConnect.responsesLeft(identityId: Self.identity, intents: [left, deleted, open, otherIdentity, otherApp]) + + XCTAssertEqual(Set(ids), [left.id, otherApp.id], "closed and not removed, on this identity, of any app") + } } From 0bb201372863fbb048ba34bf070f3d6114a093ac Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 10 Nov 2026 17:21:29 +0200 Subject: [PATCH 103/108] fix(dashconnect): an update is not landed while a key's bound is unknown A key whose contract bound the store does not hold yet may be bound to another contract, so `hasLanded` no longer takes it as this update's and the response with its secret is not published until the bound is read. The row still counts the key as live. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectProjection.swift | 9 +++++++-- .../DashConnect/AppConnectProjectionTests.swift | 12 ++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift index 5c9eab027e..3969641f56 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectProjection.swift @@ -394,8 +394,13 @@ extension AppConnect { /// without turning the earlier ones off (the same request approved on /// another device), so the added keys alone do not tell. static func hasLanded(_ intent: ConnectionIntent, in snapshot: IdentitySnapshot) -> Bool { - intent.keys.allSatisfy { [.live, .expired, .disabled].contains(presence(of: $0, in: snapshot)) } - && outstandingDisables(of: intent, in: snapshot).isEmpty + intent.keys.allSatisfy { key in + [.live, .expired, .disabled].contains(presence(of: key, in: snapshot)) + // A key whose bound the store does not hold yet may be bound + // elsewhere: it is not taken as this update's, so its secret + // is not handed over. + && snapshot.keys.first { $0.id == key.id }?.boundKnown == true + } && outstandingDisables(of: intent, in: snapshot).isEmpty } /// Whether the encryption keys `intent`'s response carries can still be diff --git a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift index d6dde22619..89f13069a2 100644 --- a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift +++ b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift @@ -712,4 +712,16 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertEqual(Set(ids), [left.id, otherApp.id], "closed and not removed, on this identity, of any app") } + + /// A key on the identity whose bound the store does not hold may be + /// bound elsewhere: the update is not taken as landed until it does, so + /// the response is not published. The row still counts the key as live. + func testAKeyWithAnUnknownBoundIsNotTakenAsLanded() { + let key = Self.authKey(10) + let intent = Self.intent([key]) + let unknown = Self.snapshot([Self.onPlatform(key, boundKnown: false)]) + XCTAssertFalse(AppConnect.hasLanded(intent, in: unknown)) + XCTAssertEqual(AppConnect.status(of: intent, in: unknown), .active(expiresAt: key.expiresAt)) + XCTAssertTrue(AppConnect.hasLanded(intent, in: Self.snapshot([Self.onPlatform(key)]))) + } } From 0a29cf53c76d7ce642498dfd435d12010bcfe88d Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 10 Nov 2026 17:21:29 +0200 Subject: [PATCH 104/108] fix(dashconnect): retry left response deletes on every signed disconnect The retry of responses an earlier disconnect could not delete ran only when the app being disconnected had a response of its own. It now runs on any disconnect that signs something. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/PlatformDashConnectDataSource.swift | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index eb0b9438ad..5989833c5d 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1996,11 +1996,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } } - if !plan.deleteResponses.isEmpty, let responseContractId = Self.decodeIdentifier(AppConnect.contractId) { - // With the PIN given, the responses an earlier disconnect could - // not delete go too. + // With the PIN given, the responses an earlier disconnect could not + // delete go too, whether or not this app has one of its own. + if !plan.isEmpty, let responseContractId = Self.decodeIdentifier(AppConnect.contractId) { let ids = Set(plan.deleteResponses).union(AppConnect.responsesLeft(identityId: context.identityId, intents: stores.intents.load())) - await deleteResponses(of: Array(ids), responseContractId: responseContractId, context: context, signer: signer) + if !ids.isEmpty { + await deleteResponses(of: Array(ids), responseContractId: responseContractId, context: context, signer: signer) + } } await refreshRows(from: after, context: context) From e0023606d7e2e77fe083f41bc50c88731423c211 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Tue, 10 Nov 2026 20:40:54 +0200 Subject: [PATCH 105/108] fix(dashconnect): keep the row while a disconnect leaves keys of unknown bound A disconnect that finds keys whose bound the key store does not hold yet cannot tell whether they are the app's. The app's newest intent now stays open, so its row keeps Disconnect, until a read places every key; a refresh with none left closes it and the row goes. The message says the connection stays listed. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 44 ++++++++++++++++--- .../UI/DashConnect/ConnectionsViewModel.swift | 2 +- DashWallet/ar.lproj/Localizable.strings | 6 +-- DashWallet/bg.lproj/Localizable.strings | 6 +-- DashWallet/ca.lproj/Localizable.strings | 6 +-- DashWallet/cs.lproj/Localizable.strings | 6 +-- DashWallet/da.lproj/Localizable.strings | 6 +-- DashWallet/de.lproj/Localizable.strings | 6 +-- DashWallet/el.lproj/Localizable.strings | 6 +-- DashWallet/en.lproj/Localizable.strings | 6 +-- DashWallet/eo.lproj/Localizable.strings | 6 +-- DashWallet/es.lproj/Localizable.strings | 6 +-- DashWallet/et.lproj/Localizable.strings | 6 +-- DashWallet/fa.lproj/Localizable.strings | 6 +-- DashWallet/fi.lproj/Localizable.strings | 6 +-- DashWallet/fil.lproj/Localizable.strings | 6 +-- DashWallet/fr.lproj/Localizable.strings | 6 +-- DashWallet/hr.lproj/Localizable.strings | 6 +-- DashWallet/hu.lproj/Localizable.strings | 6 +-- DashWallet/id.lproj/Localizable.strings | 6 +-- DashWallet/it.lproj/Localizable.strings | 6 +-- DashWallet/ja.lproj/Localizable.strings | 6 +-- DashWallet/ko.lproj/Localizable.strings | 6 +-- DashWallet/mk.lproj/Localizable.strings | 6 +-- DashWallet/ms.lproj/Localizable.strings | 6 +-- DashWallet/nb.lproj/Localizable.strings | 6 +-- DashWallet/nl.lproj/Localizable.strings | 6 +-- DashWallet/pl.lproj/Localizable.strings | 6 +-- DashWallet/pt.lproj/Localizable.strings | 6 +-- DashWallet/ro.lproj/Localizable.strings | 6 +-- DashWallet/ru.lproj/Localizable.strings | 6 +-- DashWallet/sk.lproj/Localizable.strings | 6 +-- DashWallet/sl.lproj/Localizable.strings | 6 +-- DashWallet/sl_SI.lproj/Localizable.strings | 6 +-- DashWallet/sq.lproj/Localizable.strings | 6 +-- DashWallet/sr.lproj/Localizable.strings | 6 +-- DashWallet/sv.lproj/Localizable.strings | 6 +-- DashWallet/th.lproj/Localizable.strings | 6 +-- DashWallet/tr.lproj/Localizable.strings | 6 +-- DashWallet/uk.lproj/Localizable.strings | 6 +-- DashWallet/vi.lproj/Localizable.strings | 6 +-- DashWallet/zh-Hans.lproj/Localizable.strings | 6 +-- .../zh-Hant-TW.lproj/Localizable.strings | 6 +-- DashWallet/zh.lproj/Localizable.strings | 6 +-- DashWallet/zh_TW.lproj/Localizable.strings | 6 +-- .../AppConnectProjectionTests.swift | 20 +++++++++ 46 files changed, 188 insertions(+), 136 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 5989833c5d..f46371bd31 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -868,12 +868,32 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// and the intents show. private func refreshRows(from snapshot: AppConnect.IdentitySnapshot, context: Context) async { let stores = context.stores + let updatedAt = now() + // An open intent whose keys are all off, of an app that has a row, is + // one a disconnect left open: while the read has a key of unknown + // bound the row stays as it is, so it keeps Disconnect; with none + // left the intent is closed at `updatedAt` and the row goes. + let hasUnplacedKey = AppConnect.project([snapshot], intents: stores.intents.load()) + .unplacedKeyIds[snapshot.identityId]?.isEmpty == false + let shownApps = Set(rows(in: stores).map(\.id)) + var kept = Set() + updateIntents(in: stores) { intents in + for index in intents.indices + where intents[index].identityId == snapshot.identityId && intents[index].closedAt == nil + && shownApps.contains(intents[index].appId.toBase58String()) + && AppConnect.status(of: intents[index], in: snapshot) == .disconnected { + if hasUnplacedKey { + kept.insert(intents[index].appId.toBase58String()) + } else { + intents[index].closedAt = updatedAt + } + } + } let all = stores.intents.load() let projection = AppConnect.project([snapshot], intents: all) let elsewhere = all.filter { $0.identityId != snapshot.identityId && $0.closedAt == nil } - let updatedAt = now() await updateRows(in: stores) { rows in - Self.rows(rows, after: projection, of: snapshot.identityId, intents: elsewhere, at: updatedAt) + Self.rows(rows, after: projection, of: snapshot.identityId, intents: elsewhere, at: updatedAt, keeping: kept) } } @@ -881,13 +901,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// `identityId`: an app with live keys or an update that may still land /// has a row; one whose keys are all off, or whose update never landed, /// has none, unless another identity's intents hold it or its last read - /// saw keys there no approval names (`seenOn`). + /// saw keys there no approval names (`seenOn`). A row in `keeping` stays + /// as it is. static func rows( _ rows: [DAppConnection], after projection: AppConnect.Projection, of identityId: Data, intents elsewhere: [AppConnect.ConnectionIntent], - at updatedAt: Date + at updatedAt: Date, + keeping kept: Set = [] ) -> [DAppConnection] { let me = identityId.toBase58String() func shownStatus(_ status: AppConnect.IntentStatus) -> ConnectionStatus? { @@ -903,6 +925,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let heldElsewhere = Set(elsewhere.map { $0.appId.toBase58String() }) var result: [DAppConnection] = rows.compactMap { row in guard !shownIds.contains(row.id) else { return nil } + if kept.contains(row.id) { return row } var seenOn = row.seenOn seenOn.remove(me) if heldElsewhere.contains(row.id) { return DAppConnection(row, seenOn: seenOn) } @@ -1985,11 +2008,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { : try await identitySnapshot(context: context).snapshot // An intent is done once none of its keys can still be live or land. + // While a key's bound is unknown (`planned.unplaced`) it may be the + // app's: the app's newest intent stays open, so its row keeps + // Disconnect until a read places every key. let closedAt = now() + let newestOpen = planned.unplaced > 0 + ? stores.intents.load().filter { + $0.appId == appId && $0.identityId == context.identityId && $0.closedAt == nil + && AppConnect.status(of: $0, in: after) == .disconnected + }.max { $0.createdAt < $1.createdAt }?.id + : nil updateIntents(in: stores) { intents in for index in intents.indices where intents[index].appId == appId && intents[index].identityId == context.identityId - && intents[index].closedAt == nil { + && intents[index].closedAt == nil && intents[index].id != newestOpen { switch AppConnect.status(of: intents[index], in: after) { case .disconnected, .neverLanded: intents[index].closedAt = closedAt case .active, .confirming, .expired: break @@ -2010,7 +2042,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // still shows live means that read is behind, or a new key landed. let ownIntents = stores.intents.load().filter { $0.appId == appId && $0.identityId == context.identityId } let stillOn = plan.disable.contains { id in after.keys.contains { $0.id == id && $0.disabledAt == nil } } - guard ownIntents.allSatisfy({ $0.closedAt != nil }), !stillOn else { + guard ownIntents.allSatisfy({ $0.closedAt != nil || $0.id == newestOpen }), !stillOn else { throw DashConnectPlatformError.identityKeysOutOfDate } // The app's intents on another identity of this wallet can only be diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 98840600c9..7790868af6 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -428,7 +428,7 @@ final class ConnectionsViewModel: ObservableObject { if result.keysNotChecked > 0 { texts.append(String.localizedStringWithFormat( NSLocalizedString( - "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them.", + "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them.", comment: "DashConnect: after a disconnect that found keys whose app is not known yet"), result.keysNotChecked)) } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 029943a081..e28ec65ca5 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 8e1e07bade..944877ac88 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index a7ab381306..4dc7ef2b1d 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 0a857e9ca4..66405c005f 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 0fef8fe098..ddbbc26fc3 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index e10cafdb96..a9be94b889 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Rabatt"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 9a96ed47a4..9c3d1c4a86 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Έκπτωση"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 10ebb9c010..d7bb837f82 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -1756,9 +1756,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5864,6 +5861,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 12fc4606f9..f2ec7ae947 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index ebe44f4f49..3a7d02bf95 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Descuento"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 73773002a2..3df794a3fd 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index f08efb4b3e..6b6b859393 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "تخفیف"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index d07159bff2..7e89a2ecf8 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 17f8648376..4162b9de56 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Diskwento"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 1692cd2cee..30c16c49ae 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Réduction"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index a6846f7bf9..72d36a05da 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index f6a8301cfc..805d524aae 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index c904495fe2..565538d2e3 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Diskon"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 719b367911..371de28000 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Sconto"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index da22a8f41f..75f359a9d9 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "割引"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index d68f170be3..ffbd2d3d9e 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "할인"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 31ef05145e..1c31eaaee6 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 953f2074f1..d9e910dfd3 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index b2fdd8ea03..c6fbe4a6dd 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 6daf1b7c11..0842fd836f 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Korting"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 68a54e24d4..e8a2bbb42f 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Zniżka"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index aa14c6daa5..69c7241068 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Desconto"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 3bace2b76a..bb7e0ee039 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 164ca53124..ebb4cea712 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Скидка"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 939b78c0ef..17adce2bc6 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Zľava"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 2cef7ffcca..7c9020f745 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 0bf6513460..271390078c 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 92f6a2aa52..1f6e855766 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 7438695169..b3816f37e1 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 69e66011ff..e9604bf799 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 26c6b15932..919ce956d8 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 1194eb9d9d..1a543cb95b 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "İndirim"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index b5f17e8e62..4038c3456e 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Знижка"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index bbaf4ecb2d..f037fd2b7f 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index ec85e220ec..c089453ef0 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 6548978e26..2cd284b217 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "Discount"; @@ -5865,6 +5862,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index b850ddda97..2688ec9a1d 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "折扣"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 3fe38fc586..6fdfeea3a0 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -1757,9 +1757,6 @@ /* DashConnect: after a disconnect that left keys no approval of this wallet names */ "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?" = "Disconnected. Keys this wallet did not record giving are still on your identity (%d): keys of this app from another device or from before a restore, or DashPay profile keys no connection holds. Turn them off too?"; -/* DashConnect: after a disconnect that found keys whose app is not known yet */ -"Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them." = "Disconnected. This wallet could not tell yet which app holds some keys on your identity (%d). Open Connections again later to see them."; - /* DashSpend confirmation */ "Discount" = "折扣"; @@ -5863,6 +5860,9 @@ /* DashConnect */ "This wallet could not save the approval, so nothing was sent. Try again." = "This wallet could not save the approval, so nothing was sent. Try again."; +/* DashConnect: after a disconnect that found keys whose app is not known yet */ +"This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them." = "This wallet could not tell yet which app holds some keys on your identity (%d). The connection stays listed; open Connections again later to check them."; + /* DashConnect: a disconnect of an app whose keys no approval of this wallet names */ "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?" = "This wallet did not record giving the keys this app holds on your identity (%d): they come from another device, from before a restore, or are DashPay profile keys no connection holds. Turn them off?"; diff --git a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift index 89f13069a2..e967303b6b 100644 --- a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift +++ b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift @@ -376,6 +376,26 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertEqual(rows, [row]) } + /// A disconnect that left a key of unknown bound keeps the app's row as + /// it is, so Disconnect stays reachable; without it the row goes. + func testARowKeptForAKeyOfUnknownBoundStaysAsItIs() { + let key = Self.authKey(10) + let row = DAppConnection( + id: Self.app.toBase58String(), name: "App", url: "", status: .active, + updatedAt: Date(timeIntervalSince1970: 1)) + let off = Self.snapshot([Self.onPlatform(key, disabledAt: 1), Self.onPlatform(Self.authKey(20), boundKnown: false)]) + let projection = AppConnect.project([off], intents: [Self.intent([key])]) + XCTAssertEqual(projection.connections.first?.status, .disconnected) + XCTAssertEqual( + PlatformDashConnectDataSource.rows( + [row], after: projection, of: Self.identity, intents: [], at: Date(timeIntervalSince1970: 2), + keeping: [row.id]), + [row]) + XCTAssertEqual( + PlatformDashConnectDataSource.rows([row], after: projection, of: Self.identity, intents: [], at: Date(timeIntervalSince1970: 2)), + []) + } + // MARK: Retry private static func plan( From 4e8c23acb9ea06a5620d5bdc65b595c3c3379cc9 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Wed, 11 Nov 2026 11:30:20 +0200 Subject: [PATCH 106/108] fix(dashconnect): keep every row while a key's bound is unknown The previous fix kept a row only through the app's newest intent left open as Disconnected, which missed an intent that read Never landed after its fence and a row with no intent at all. Now the rows themselves carry it: while the read has a key whose bound the key store does not hold, no row goes, so each keeps its Disconnect until a read places every key. A disconnect closes its intents as before. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 50 +++++-------------- .../AppConnectProjectionTests.swift | 37 ++++++++------ 2 files changed, 35 insertions(+), 52 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index f46371bd31..d46305d64b 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -868,32 +868,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// and the intents show. private func refreshRows(from snapshot: AppConnect.IdentitySnapshot, context: Context) async { let stores = context.stores - let updatedAt = now() - // An open intent whose keys are all off, of an app that has a row, is - // one a disconnect left open: while the read has a key of unknown - // bound the row stays as it is, so it keeps Disconnect; with none - // left the intent is closed at `updatedAt` and the row goes. - let hasUnplacedKey = AppConnect.project([snapshot], intents: stores.intents.load()) - .unplacedKeyIds[snapshot.identityId]?.isEmpty == false - let shownApps = Set(rows(in: stores).map(\.id)) - var kept = Set() - updateIntents(in: stores) { intents in - for index in intents.indices - where intents[index].identityId == snapshot.identityId && intents[index].closedAt == nil - && shownApps.contains(intents[index].appId.toBase58String()) - && AppConnect.status(of: intents[index], in: snapshot) == .disconnected { - if hasUnplacedKey { - kept.insert(intents[index].appId.toBase58String()) - } else { - intents[index].closedAt = updatedAt - } - } - } let all = stores.intents.load() let projection = AppConnect.project([snapshot], intents: all) let elsewhere = all.filter { $0.identityId != snapshot.identityId && $0.closedAt == nil } + let updatedAt = now() await updateRows(in: stores) { rows in - Self.rows(rows, after: projection, of: snapshot.identityId, intents: elsewhere, at: updatedAt, keeping: kept) + Self.rows(rows, after: projection, of: snapshot.identityId, intents: elsewhere, at: updatedAt) } } @@ -901,15 +881,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// `identityId`: an app with live keys or an update that may still land /// has a row; one whose keys are all off, or whose update never landed, /// has none, unless another identity's intents hold it or its last read - /// saw keys there no approval names (`seenOn`). A row in `keeping` stays - /// as it is. + /// saw keys there no approval names (`seenOn`). While the read has a key + /// whose bound is unknown, that key may be any app's: no row goes, so + /// each keeps its Disconnect until a read places every key. static func rows( _ rows: [DAppConnection], after projection: AppConnect.Projection, of identityId: Data, intents elsewhere: [AppConnect.ConnectionIntent], - at updatedAt: Date, - keeping kept: Set = [] + at updatedAt: Date ) -> [DAppConnection] { let me = identityId.toBase58String() func shownStatus(_ status: AppConnect.IntentStatus) -> ConnectionStatus? { @@ -923,9 +903,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // An App Connect row stands for intents: it stays only while another // identity's intents hold it, since this read says nothing of them. let heldElsewhere = Set(elsewhere.map { $0.appId.toBase58String() }) + let hasUnplacedKey = projection.unplacedKeyIds[identityId]?.isEmpty == false var result: [DAppConnection] = rows.compactMap { row in guard !shownIds.contains(row.id) else { return nil } - if kept.contains(row.id) { return row } + if hasUnplacedKey { return row } var seenOn = row.seenOn seenOn.remove(me) if heldElsewhere.contains(row.id) { return DAppConnection(row, seenOn: seenOn) } @@ -2008,20 +1989,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { : try await identitySnapshot(context: context).snapshot // An intent is done once none of its keys can still be live or land. - // While a key's bound is unknown (`planned.unplaced`) it may be the - // app's: the app's newest intent stays open, so its row keeps - // Disconnect until a read places every key. + // A key whose bound is unknown (`planned.unplaced`) keeps the row, + // with its Disconnect, through `rows(_:after:of:intents:at:)`. let closedAt = now() - let newestOpen = planned.unplaced > 0 - ? stores.intents.load().filter { - $0.appId == appId && $0.identityId == context.identityId && $0.closedAt == nil - && AppConnect.status(of: $0, in: after) == .disconnected - }.max { $0.createdAt < $1.createdAt }?.id - : nil updateIntents(in: stores) { intents in for index in intents.indices where intents[index].appId == appId && intents[index].identityId == context.identityId - && intents[index].closedAt == nil && intents[index].id != newestOpen { + && intents[index].closedAt == nil { switch AppConnect.status(of: intents[index], in: after) { case .disconnected, .neverLanded: intents[index].closedAt = closedAt case .active, .confirming, .expired: break @@ -2042,7 +2016,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // still shows live means that read is behind, or a new key landed. let ownIntents = stores.intents.load().filter { $0.appId == appId && $0.identityId == context.identityId } let stillOn = plan.disable.contains { id in after.keys.contains { $0.id == id && $0.disabledAt == nil } } - guard ownIntents.allSatisfy({ $0.closedAt != nil || $0.id == newestOpen }), !stillOn else { + guard ownIntents.allSatisfy({ $0.closedAt != nil }), !stillOn else { throw DashConnectPlatformError.identityKeysOutOfDate } // The app's intents on another identity of this wallet can only be diff --git a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift index e967303b6b..5a8828aa3e 100644 --- a/DashWalletTests/DashConnect/AppConnectProjectionTests.swift +++ b/DashWalletTests/DashConnect/AppConnectProjectionTests.swift @@ -376,24 +376,33 @@ final class AppConnectProjectionTests: XCTestCase { XCTAssertEqual(rows, [row]) } - /// A disconnect that left a key of unknown bound keeps the app's row as - /// it is, so Disconnect stays reachable; without it the row goes. - func testARowKeptForAKeyOfUnknownBoundStaysAsItIs() { + /// While the read has a key of unknown bound, no row goes, whether its + /// intent was turned off, never landed or there is no intent at all; once + /// every key is placed, the row goes. + func testNoRowGoesWhileAKeyHasAnUnknownBound() { let key = Self.authKey(10) let row = DAppConnection( id: Self.app.toBase58String(), name: "App", url: "", status: .active, updatedAt: Date(timeIntervalSince1970: 1)) - let off = Self.snapshot([Self.onPlatform(key, disabledAt: 1), Self.onPlatform(Self.authKey(20), boundKnown: false)]) - let projection = AppConnect.project([off], intents: [Self.intent([key])]) - XCTAssertEqual(projection.connections.first?.status, .disconnected) - XCTAssertEqual( - PlatformDashConnectDataSource.rows( - [row], after: projection, of: Self.identity, intents: [], at: Date(timeIntervalSince1970: 2), - keeping: [row.id]), - [row]) - XCTAssertEqual( - PlatformDashConnectDataSource.rows([row], after: projection, of: Self.identity, intents: [], at: Date(timeIntervalSince1970: 2)), - []) + let unplaced = Self.onPlatform(Self.authKey(20, bound: .singleContract(Self.otherApp)), boundKnown: false) + let off = Self.onPlatform(key, disabledAt: 1) + let taken = Self.onPlatform(Self.authKey(10, data: 9, bound: .singleContract(Self.otherApp))) + let cases: [(String, [AppConnect.PlatformKey], [Intent], AppConnect.IntentStatus?)] = [ + ("turned off", [off], [Self.intent([key])], .disconnected), + ("never landed", [taken], [Self.intent([key])], .neverLanded), + ("no intent", [], [], nil), + ] + for (name, keys, intents, status) in cases { + let rows = { (keys: [AppConnect.PlatformKey]) in + let projection = AppConnect.project([Self.snapshot(keys)], intents: intents) + XCTAssertEqual(projection.connections.first { $0.appId == Self.app }?.status, status, name) + return PlatformDashConnectDataSource.rows( + [row], after: projection, of: Self.identity, intents: [], at: Date(timeIntervalSince1970: 2)) + .filter { $0.id == row.id } + } + XCTAssertEqual(rows(keys + [unplaced]), [row], name) + XCTAssertEqual(rows(keys), [], name) + } } // MARK: Retry From 41f7d5f4c742365dae3476b929ecee1464013593 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Wed, 11 Nov 2026 15:37:50 +0200 Subject: [PATCH 107/108] refactor(dashpay): use the read a new App Connect intent was made from When a new approval fences an earlier intent, newAppConnectIntent reads the identity again, but the caller kept the read from before the fence for the rows and for submitAndPublish. The function now returns that read with the intent, so what the update adds and turns off is decided from the same read as the intent's key ids. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index d46305d64b..5433ce6170 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -981,9 +981,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } let request = uri.request let signer = KeychainSigner(modelContainer: context.modelContainer) - let (snapshot, currentPublicKeys) = try await identitySnapshot(context: context) - let intent = try await newAppConnectIntent( - request: request, plan: plan, consent: consent, snapshot: snapshot, + let (read, currentPublicKeys) = try await identitySnapshot(context: context) + // From here on the read the intent was made from: a fence reads again. + let (intent, snapshot) = try await newAppConnectIntent( + request: request, plan: plan, consent: consent, snapshot: read, currentPublicKeys: currentPublicKeys, context: context) updateIntents(in: stores) { $0.append(intent) } guard stores.intents.load().contains(where: { $0.id == intent.id }) else { @@ -1174,7 +1175,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// The intent of a new approval: the keys it adds under ids no key or /// intent of the identity holds, the earlier keys of the same connection - /// it turns off, and the response, sealed now. + /// it turns off, and the response, sealed now. With it comes the read + /// the intent was made from: the read after a fence, when it fenced. private func newAppConnectIntent( request: AppConnectRequest, plan: AppConnect.GrantPlan, @@ -1182,7 +1184,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { snapshot: AppConnect.IdentitySnapshot, currentPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], context: Context - ) async throws -> AppConnect.ConnectionIntent { + ) async throws -> (intent: AppConnect.ConnectionIntent, snapshot: AppConnect.IdentitySnapshot) { let stores = context.stores var authKeys = try await deriveAuthKeys(request: request, plan: plan, context: context) defer { for index in authKeys.indices { Self.zero(&authKeys[index].privateKey) } } @@ -1271,7 +1273,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ).toHexString() ) let added = Set(keys.map(\.id)) - return AppConnect.ConnectionIntent( + let intent = AppConnect.ConnectionIntent( id: UUID(), identityId: context.identityId, appId: plan.appId, @@ -1287,6 +1289,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { responseRemoved: false, createdAt: now(), closedAt: nil) + return (intent, snapshot) } /// The auth keys of `plan`, derived from the request: the same keys on From 5734ef1b810314ae986302af9adc7eb1b0f5ac8f Mon Sep 17 00:00:00 2001 From: romchornyi Date: Wed, 11 Nov 2026 15:37:51 +0200 Subject: [PATCH 108/108] docs(dashpay): say what #1301 does in the App Connect summary and ADR-0028 ADR-0028 claimed keys of old two-scan logins show as unrecorded app keys; they have no expiry, so they stay on the identity and are not listed. The feature summary still described the two-scan login below protocol 14 and session keys; it now covers v1 refused, connections from the identity and the intents, Confirming and Not delivered, and the fenced disconnect. Co-Authored-By: Claude Opus 5.5 --- ...t-v2-only-and-remove-the-two-scan-login.md | 8 ++++-- docs/features/app-connect/README.md | 26 ++++++++++++++----- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/docs/adr/0028-answer-app-connect-v2-only-and-remove-the-two-scan-login.md b/docs/adr/0028-answer-app-connect-v2-only-and-remove-the-two-scan-login.md index 93bd597bae..1044e44f8e 100644 --- a/docs/adr/0028-answer-app-connect-v2-only-and-remove-the-two-scan-login.md +++ b/docs/adr/0028-answer-app-connect-v2-only-and-remove-the-two-scan-login.md @@ -34,8 +34,12 @@ answers v2 only. - The two-scan protection is gone, and a disconnect no longer derives two-scan keys. **Negative** -- Keys from old two-scan logins on testnet show as unrecorded app keys and are turned off with - the app's disconnect. +- Keys from old two-scan logins on testnet stay on the identity, and the wallet no longer lists + them. The two-scan login ran only below protocol 14, where a key cannot carry limits, so its + key has no expiry and is not an App Connect key (`AppConnect.isAppConnectAuthKey`). A stored + two-scan row goes on the first refresh, and Connections cannot turn its key off. This is no + worse than before, when a two-scan disconnect was local only, and it reaches only internal + testnet installs. - The Debug mock scan still feeds a v1 QR, which is refused. **Neutral** diff --git a/docs/features/app-connect/README.md b/docs/features/app-connect/README.md index 6498dbadaa..74c961ce9b 100644 --- a/docs/features/app-connect/README.md +++ b/docs/features/app-connect/README.md @@ -1,6 +1,6 @@ # DashConnect: sign in to an app with one QR -**Owner:** romchornyi · Introduced in [#1202](https://github.com/dashpay/dashwallet-ios/pull/1202); request v2 decoded in [#1204](https://github.com/dashpay/dashwallet-ios/pull/1204) and answered in [#1210](https://github.com/dashpay/dashwallet-ios/pull/1210) +**Owner:** romchornyi · Introduced in [#1202](https://github.com/dashpay/dashwallet-ios/pull/1202); request v2 decoded in [#1204](https://github.com/dashpay/dashwallet-ios/pull/1204) and answered in [#1210](https://github.com/dashpay/dashwallet-ios/pull/1210); connections derived from the identity in [#1301](https://github.com/dashpay/dashwallet-ios/pull/1301) ## Why @@ -15,12 +15,28 @@ one-scan login possible, and with it DashConnect on mainnet once mainnet runs pr - **One-QR login from protocol 14.** The wallet reads the network's protocol version before the approval sheet. From 14 it derives a session key for the request, registers it on the identity bound to the app's contract with a budget and an expiry, and publishes the encrypted key to the - App Connect system contract. Below 14 the two-scan login runs as before. + App Connect system contract. Below 14 App Connect is not offered. [ADR-0006](../../adr/0006-choose-the-app-connect-login-by-the-protocol-version-read-at-runtime.md). +- **App Connect v2 only** ([#1301](https://github.com/dashpay/dashwallet-ios/pull/1301)). The + two-scan (v1) login is removed: a v1 `dash-key` QR is refused with a message asking the app for + a new code. [ADR-0028](../../adr/0028-answer-app-connect-v2-only-and-remove-the-two-scan-login.md). +- **Connections come from the identity** ([#1301](https://github.com/dashpay/dashwallet-ios/pull/1301)). + Before each identity update the wallet records an intent: the keys it is about to add or turn + off, the app and the sealed response. The Connections rows are worked out from one read of the + identity and these intents, not stored on their own. A connection is Active, **Confirming** (its + update may still land) or **Not delivered** (its keys are live but its response was never + published). [ADR-0027](../../adr/0027-derive-app-connect-connections-from-the-identity-and-recorded-intents.md), + [ADR-0029](../../adr/0029-allow-a-new-app-connect-approval-while-another-is-confirming.md), + [ADR-0030](../../adr/0030-show-an-app-connect-connection-whose-response-was-not-published-as-not-delivered.md). - **The approval sheet shows what is approved**: what the session key can do, its budget and its lifetime. An unknown protocol version offers a retry, never an approval. -- **Disconnect is real**: it turns off the app's session keys on the identity and deletes its - responses, then removes the row. A failure keeps the row and says so. +- **Disconnect is real**: it turns off the app's keys on the identity and deletes its responses, + then removes the row. An update of the app that may still land is closed off first: the wallet + adds a key of its own at each id that update would take, then turns it off. Keys this wallet did + not record giving (another device, a restore, an orphaned DashPay profile key) are turned off + only after the user confirms. + [ADR-0031](../../adr/0031-turn-off-unattributed-dashpay-profile-keys-with-any-disconnect.md). + A failure keeps the row and says so. - **Mainnet stays off** in this change: the Connections page uses its mock data source there. - **App Connect request v2** ([#1210](https://github.com/dashpay/dashwallet-ios/pull/1210)). A `v=2` code can name up to four auth bindings (a contract, a contract group or one document type) and @@ -47,8 +63,6 @@ The later DashConnect PRs build on this one. Each of them adds its own ADRs to t - Encryption key rotation and the `dashpay://connect` carrier ([#1257](https://github.com/dashpay/dashwallet-ios/pull/1257), [#1258](https://github.com/dashpay/dashwallet-ios/pull/1258)). -- Connections derived from the identity and the recorded requests, and the removal of the two-scan - login ([#1301](https://github.com/dashpay/dashwallet-ios/pull/1301)). - The redesigned Connections page, approve sheet, expiry and disconnected apps ([#1277](https://github.com/dashpay/dashwallet-ios/pull/1277), [#1278](https://github.com/dashpay/dashwallet-ios/pull/1278),