feat(platform-wallet): support DashPay shielded tips with dedicated accounts

packages/dashpay-contract/schema/v2/dashpay.schema.json

@@ -74,6 +74,14 @@
         "maxItems": 21,
         "description": "Platform address in storage form (type byte 0x00 P2PKH / 0x01 P2SH followed by the 20-byte HASH160, i.e. RIPEMD160 of SHA256, of the public key or redeem script) for public payments. The type byte is consensus-enforced by a data trigger.",
         "position": 6
+      },
+      "shieldedAddress": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 43,
+        "maxItems": 43,
+        "description": "Raw Orchard receiving address: 11-byte diversifier followed by 32-byte diversified transmission key. Clients validate before payment; wallets should use a dedicated tip account.",
+        "position": 7
       }
     },
     "minProperties": 1,

packages/dashpay-contract/src/v2/mod.rs

@@ -3,7 +3,8 @@ use serde_json::Value;
 
 // Document-type name and property constants live in `crate::v1::document_types`;
 // v2 does not change any names v1 defined, it only adds the optional
-// `corePaymentAddress` / `platformPaymentAddress` properties to `profile`.
+// `corePaymentAddress`, `platformPaymentAddress`, and `shieldedAddress`
+// properties to `profile`.
 
 pub fn load_documents_schemas() -> Result<Value, Error> {
     serde_json::from_str(include_str!("../../schema/v2/dashpay.schema.json"))

packages/kotlin-sdk/KotlinExampleApp/app/src/main/java/org/dashfoundation/example/di/AppContainer.kt

@@ -33,6 +33,9 @@ class AppContainer(private val context: Context) {
 
     val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
 
+    val shieldedTipSubmissions =
+        org.dashfoundation.example.ui.dashpay.ShieldedTipSubmissions(applicationScope)
+
     val database: DashDatabase = DashDatabase.create(context)
 
     val dataStore = context.preferencesStore

packages/kotlin-sdk/KotlinExampleApp/app/src/main/java/org/dashfoundation/example/ui/dashpay/DashPayJson.kt

@@ -23,6 +23,9 @@ data class DashPayProfile(
     val displayName: String?,
     val publicMessage: String?,
     val avatarUrl: String?,
+    val corePaymentAddress: String? = null,
+    val platformPaymentAddress: String? = null,
+    val shieldedAddress: String? = null,
 )
 
 /** Parse a `getProfile` / `getContactProfile` JSON object, or null. */
@@ -32,6 +35,9 @@ fun parseDashPayProfile(json: String?): DashPayProfile? {
         displayName = obj.optStringOrNull("displayName"),
         publicMessage = obj.optStringOrNull("publicMessage"),
         avatarUrl = obj.optStringOrNull("avatarUrl"),
+        corePaymentAddress = obj.optStringOrNull("corePaymentAddress"),
+        platformPaymentAddress = obj.optStringOrNull("platformPaymentAddress"),
+        shieldedAddress = obj.optStringOrNull("shieldedAddress"),
     )
 }
 

packages/kotlin-sdk/KotlinExampleApp/app/src/main/java/org/dashfoundation/example/ui/dashpay/DashPayProfileScreen.kt

@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -39,14 +40,20 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
+import java.math.BigDecimal
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.dashfoundation.dashsdk.tokens.PaymentAddressUpdate
 import org.dashfoundation.example.di.LocalAppContainer
 import org.dashfoundation.example.ui.components.FormSection
 import org.dashfoundation.example.ui.components.LabeledContent
 import org.dashfoundation.example.ui.components.SubmitButton
 import org.dashfoundation.example.util.Base58
+import org.dashfoundation.example.util.DashAddress
+import org.dashfoundation.example.util.DashAddressType
 import org.dashfoundation.example.util.generateQrBitmap
 import org.dashfoundation.example.util.hexToBytes
 
@@ -72,7 +79,23 @@ fun DashPayProfileScreen(identityIdHex: String, navController: NavHostController
     val walletId = identity?.walletId
     val wallet = remember(manager, walletId) { walletId?.let { manager?.wallet(forWalletId = it) } }
 
+    // Derived from the live identity's index, not Room's placeholder 0 (see DashPayTabScreen).
+    val tipAccount by produceState<Int?>(initialValue = null, wallet, manager, identityIdHex) {
+        value = wallet?.let { w ->
+            runCatching { w.identityIndex(idBytes)?.let { index -> manager?.shieldedTipAccountIndex(index) } }
+                .getOrNull()
+        }
+    }
+    val tipBalance by remember(walletId, tipAccount) {
+        if (walletId == null || tipAccount == null) flowOf(0L)
+        else container.database.shieldedDao().observeNotesByWalletAccount(walletId, tipAccount)
+            .map { notes -> notes.filter { !it.isSpent }.sumOf { it.value } }
+    }.collectAsStateWithLifecycle(initialValue = 0L)
+
     var profile by remember { mutableStateOf<DashPayProfile?>(null) }
+    val publishedTipAddress = profile?.shieldedAddress?.let { raw ->
+        manager?.let { m -> runCatching { DashAddress.encodeOrchard(raw.hexToBytes(), m.network) }.getOrNull() }
+    }
     var profileExists by remember { mutableStateOf(false) }
     var qrUri by remember { mutableStateOf<String?>(null) }
     var qrError by remember { mutableStateOf<String?>(null) }
@@ -87,6 +110,7 @@ fun DashPayProfileScreen(identityIdHex: String, navController: NavHostController
     var displayNameField by remember { mutableStateOf("") }
     var publicMessageField by remember { mutableStateOf("") }
     var avatarUrlField by remember { mutableStateOf("") }
+    var shieldedAddressField by remember { mutableStateOf("") }
     var isSaving by remember { mutableStateOf(false) }
     var saveError by remember { mutableStateOf<String?>(null) }
 
@@ -132,6 +156,7 @@ fun DashPayProfileScreen(identityIdHex: String, navController: NavHostController
                                 displayNameField = profile?.displayName.orEmpty()
                                 publicMessageField = profile?.publicMessage.orEmpty()
                                 avatarUrlField = profile?.avatarUrl.orEmpty()
+                                shieldedAddressField = publishedTipAddress.orEmpty()
                                 saveError = null
                             }
                             isEditing = !isEditing
@@ -172,6 +197,31 @@ fun DashPayProfileScreen(identityIdHex: String, navController: NavHostController
                         label = { Text("Avatar URL") },
                         singleLine = true,
                     )
+                    TextButton(enabled = !isSaving && container.shieldedService.isAvailable, onClick = {
+                        val m = manager ?: return@TextButton
+                        val wid = walletId ?: return@TextButton
+                        isSaving = true
+                        saveError = null
+                        scope.launch {
+                            try {
+                                shieldedAddressField = requireNotNull(DashAddress.encodeOrchard(m.prepareShieldedTipAddress(wid, idBytes), m.network))
+                            } catch (e: Exception) {
+                                saveError = e.message ?: "Could not prepare tip account"
+                            } finally {
+                                isSaving = false
+                            }
+                        }
+                    }, modifier = Modifier.testTag("dashpay.profile.useTipAccount")) {
+                        Text("Use this wallet’s dedicated tip account")
+                    }
+                    Text("The address is published only when you save.", style = MaterialTheme.typography.bodySmall)
+                    OutlinedTextField(
+                        value = shieldedAddressField,
+                        onValueChange = { shieldedAddressField = it },
+                        modifier = Modifier.fillMaxWidth().testTag("dashpay.profile.shieldedAddress"),
+                        label = { Text("Shielded tip address") },
+                        supportingText = { Text("Paste an external receiving address, or leave blank to disable tips. External funds are managed by the receiving wallet.") },
+                    )
                     saveError?.let {
                         Text(it, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.error)
                     }
@@ -194,6 +244,15 @@ fun DashPayProfileScreen(identityIdHex: String, navController: NavHostController
                                     avatarUrl = avatarUrlField.trim().ifEmpty { null },
                                     doCreate = !profileExists,
                                     signerHandle = m.signerHandle,
+                                    shieldedAddress = when (val address = shieldedAddressField.trim()) {
+                                        publishedTipAddress.orEmpty() -> PaymentAddressUpdate.Keep
+                                        "" -> PaymentAddressUpdate.Remove
+                                        else -> {
+                                            val parsed = DashAddress.parse(address, m.network) as? DashAddressType.Orchard
+                                                ?: throw IllegalArgumentException("Enter a shielded address for this network")
+                                            PaymentAddressUpdate.Set(parsed.raw43)
+                                        }
+                                    },
                                 )
                                 loadProfile()
                                 isEditing = false
@@ -224,6 +283,19 @@ fun DashPayProfileScreen(identityIdHex: String, navController: NavHostController
                 }
             }
 
+            if (!isEditing) {
+                FormSection(title = "Shielded tips") {
+                    Text("This wallet’s tip balance: ${BigDecimal.valueOf(tipBalance, 11).stripTrailingZeros().toPlainString()} DASH")
+                    val address = publishedTipAddress
+                    if (address == null) {
+                        Text("Tips are not enabled.")
+                    } else {
+                        SelectionContainer { Text(address, style = MaterialTheme.typography.bodySmall) }
+                        Text("This receiving address is public and associated with your username. Removing it does not revoke previously shared copies.", style = MaterialTheme.typography.bodySmall)
+                    }
+                }
+            }
+
             FormSection(title = "Identity") {
                 Text(
                     Base58.encode(idBytes),

packages/kotlin-sdk/KotlinExampleApp/app/src/main/java/org/dashfoundation/example/ui/dashpay/DashPayTabScreen.kt

@@ -26,6 +26,8 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -38,6 +40,7 @@ import androidx.compose.runtime.key
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -159,6 +162,7 @@ fun DashPayTabScreen(navController: NavHostController) {
     val appUiState = container.appUiState
     var claimSheetUri by remember { mutableStateOf<String?>(null) }
     var showClaimSheet by remember { mutableStateOf(false) }
+    var showTipSheet by remember { mutableStateOf(false) }
     val pendingInvite by appUiState.pendingInviteUri.collectAsStateWithLifecycle()
     val claimInFlight by appUiState.invitationClaimInFlight.collectAsStateWithLifecycle()
     // The parked URI is NOT cleared at seeding: it stays in AppUiState (the
@@ -320,7 +324,54 @@ fun DashPayTabScreen(navController: NavHostController) {
                             onError = { unlockError = it },
                         )
 
+                        val tipManager = manager
+                        val tipWalletId = identity.walletId
+                        // The tip account follows the live identity's derivation index, not
+                        // Room's non-null `identityIndex`: its 0 is a placeholder for an identity
+                        // with no recoverable index and would alias identity 0's tip pool.
+                        val tipAccountResult by produceState<Result<Int>?>(
+                            initialValue = null, managed, tipManager, identityHex,
+                        ) {
+                            value = runCatching {
+                                val index = requireNotNull(managed) { "Wallet is not loaded" }
+                                    .identityIndex(identity.identityId)
+                                    ?: error("Tip account requires a recoverable identity index")
+                                requireNotNull(tipManager).shieldedTipAccountIndex(index)
+                            }
+                        }
+                        val tipAccount = tipAccountResult?.getOrNull()
+                        val tipSubmission = tipWalletId?.let {
+                            container.shieldedTipSubmissions.forWallet(network.ffiValue, it.toHex())
+                        }
+                        val tipSending by rememberUpdatedState(tipSubmission?.busy == true)
+                        val tipSheetState = rememberModalBottomSheetState(
+                            confirmValueChange = { value -> value != SheetValue.Hidden || !tipSending },
+                        )
+                        if (showTipSheet && managed != null && tipManager != null && tipWalletId != null && tipAccount != null && tipSubmission != null) {
+                            ModalBottomSheet(
+                                sheetState = tipSheetState,
+                                onDismissRequest = { if (!tipSubmission.busy) showTipSheet = false },
+                            ) {
+                                ShieldedTipSheet(tipManager, managed, tipWalletId, tipAccount, tipSubmission)
+                            }
+                        }
                         FormSection(title = "DashPay") {
+                            if (container.shieldedService.isAvailable) {
+                                EntityRow(
+                                    icon = Icons.AutoMirrored.Filled.Send,
+                                    title = "Send shielded tip",
+                                    onClick = {
+                                        when (val result = tipAccountResult) {
+                                            null -> unlockError = "The tip account is still loading"
+                                            else -> result.fold(
+                                                onSuccess = { showTipSheet = true },
+                                                onFailure = { unlockError = it.message ?: "Could not open shielded tips" },
+                                            )
+                                        }
+                                    },
+                                    modifier = Modifier.testTag("dashpay.sendShieldedTip"),
+                                )
+                            }
                             EntityRow(
                                 icon = Icons.Default.Group,
                                 title = "Contacts",

packages/kotlin-sdk/KotlinExampleApp/app/src/main/java/org/dashfoundation/example/ui/dashpay/ShieldedTipFailure.kt

@@ -0,0 +1,24 @@
+package org.dashfoundation.example.ui.dashpay
+
+import org.dashfoundation.dashsdk.errors.DashSdkError
+
+/**
+ * Permit a fresh user review only for failures known not to have executed a tip.
+ * On the tip path, Rust maps selection/build/recipient-check failures to
+ * WalletOperation. Broadcast ambiguity maps to ShieldedSpendUnconfirmed, and
+ * successful post-broadcast bookkeeping is best-effort (never WalletOperation).
+ * Unknown exceptions, including JNI failures and cancellation, remain locked.
+ */
+internal fun canReviewShieldedTipAfterFailure(error: Exception): Boolean = when (error) {
+    is IllegalArgumentException,
+    is DashSdkError.InvalidParameter,
+    is DashSdkError.PlatformWallet.InvalidHandle,
+    is DashSdkError.PlatformWallet.NotFound,
+    is DashSdkError.PlatformWallet.SigningKeyUnavailable,
+    is DashSdkError.PlatformWallet.WalletOperation,
+    is DashSdkError.PlatformWallet.ShieldedNoRecordedAnchor,
+    is DashSdkError.PlatformWallet.ShieldedBroadcastFailed -> true
+    // ErrorInvalidParameter is a preflight-only FFI failure on this call path.
+    is DashSdkError.PlatformWallet.Generic -> error.nativeCode == 2
+    else -> false
+}