test(platform-wallet): e2e framework + full test suite — triage pins, Found-*/PA-* guards, fail-closed persist, Stage-2 merge

.github/workflows/tests-rs-workspace.yml

@@ -458,6 +458,7 @@ jobs:
             --package dash-async \
             --package platform-value \
             --package platform-encryption \
+            --package dash-platform-macros \
             --package rs-dapi \
             --package platform-wallet \
             --package platform-wallet-storage \

CHANGELOG.md

@@ -22,6 +22,14 @@
 
 ### Changed
 
+- **platform-wallet-storage (breaking, Rust API):** `WalletStorageError` is
+  `#[non_exhaustive]`, so a `match` on it outside the crate needs a wildcard
+  arm. New failure modes: `SpendAuthorization` (a stored pending spend needs
+  authorization rules the wallet cannot verify), `TransactionBodyConflict` (a
+  record reuses a stored txid with a different body), `UnknownWalletNetwork`
+  (an unknown `wallets.network` label) and `NetAmountOverflow` (a net amount
+  outside `i64`). See [#5150](https://github.com/dashpay/platform/pull/5150).
+
 - **Rust dependencies:** pin rust-dashcore to `dev` at `280b3f2c`, which includes
   [rust-dashcore#1175](https://github.com/dashpay/rust-dashcore/pull/1175):
   every transaction payload keeps its stored serde variant index, so wallet rows

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

@@ -71,6 +71,8 @@ val AssetLockEntity.statusLabel: String
         // Core finality proven, Platform-side consumption unknown.
         // Rendered as "Unknown(5)" before this branch existed.
         5 -> "RecoveredFromChain"
+        6 -> "DrainCompleted"
+        7 -> "Funding conflicted"
         else -> "Unknown($statusRaw)"
     }
 

packages/kotlin-sdk/KotlinExampleApp/app/src/test/java/org/dashfoundation/example/ui/funding/AssetLockDisplayTest.kt

@@ -80,7 +80,9 @@ class AssetLockDisplayTest {
         assertEquals("Consumed", lock(4).statusLabel)
         // Regression: rendered as "Unknown(5)" before the branch existed.
         assertEquals("RecoveredFromChain", lock(5).statusLabel)
-        assertEquals("Unknown(7)", lock(7).statusLabel)
+        assertEquals("Funding conflicted", lock(7).statusLabel)
+        assertFalse(lock(7).isVisibleAsResumable)
+        assertFalse(lock(7).canFundIdentity)
     }
 
     @Test

packages/kotlin-sdk/sdk/src/main/kotlin/org/dashfoundation/dashsdk/persistence/PlatformWalletPersistenceHandler.kt

@@ -2383,7 +2383,7 @@ class PlatformWalletPersistenceHandler(
             // InstantSendLocked (2) the network has locked the inputs, so
             // flip the linked TXOs here. Monotonic, and keyed strictly to
             // TXOs already linked to THIS lock's funding txid.
-            if (incomingStatus >= ASSET_LOCK_STATUS_INSTANT_SEND_LOCKED) {
+            if (incomingStatus in ASSET_LOCK_STATUS_INSTANT_SEND_LOCKED..6) {
                 val fundingTxid = outpointTxid(outPoint)
                 db.txoDao().markSpentBySpendingTxid(fundingTxid, now())
             }
@@ -3196,7 +3196,7 @@ class PlatformWalletPersistenceHandler(
     private suspend fun spendByFinalizedAssetLock(spendingTxid: ByteArray): Boolean {
         val status = database.assetLockDao()
             .maxStatusForTxid(spendingTxid.reversedArray().toHex())
-        return status != null && status >= ASSET_LOCK_STATUS_INSTANT_SEND_LOCKED
+        return status != null && status in ASSET_LOCK_STATUS_INSTANT_SEND_LOCKED..6
     }
 
     /**

packages/kotlin-sdk/sdk/src/main/kotlin/org/dashfoundation/dashsdk/persistence/dao/AssetLockDao.kt

@@ -111,7 +111,7 @@ interface AssetLockDao {
     suspend fun getByOutPointHex(outPointHex: String): AssetLockEntity?
 
     /**
-     * Strongest lifecycle status any asset lock funded by [txidHex] has
+     * Strongest finalized status any asset lock funded by [txidHex] has
      * reached, or null when the transaction funds no tracked lock.
      *
      * [txidHex] is the explorer DISPLAY txid hex (64 chars, wire order
@@ -131,8 +131,8 @@ interface AssetLockDao {
      * arbitrary rows.
      */
     @Query(
-        "SELECT MAX(statusRaw) FROM asset_locks " +
-            "WHERE length(:txidHex) = 64 " +
+        "SELECT MAX(statusRaw) FROM asset_locks WHERE statusRaw IN (2, 3, 4, 5, 6) " +
+            "AND length(:txidHex) = 64 " +
             "AND lower(:txidHex) NOT GLOB '*[^0-9a-f]*' " +
             "AND substr(outPointHex, 1, 65) = lower(:txidHex) || ':'"
     )

packages/kotlin-sdk/sdk/src/main/kotlin/org/dashfoundation/dashsdk/persistence/entities/AssetLockEntity.kt

@@ -41,7 +41,8 @@ data class AssetLockEntity(
     /**
      * `AssetLockStatus` discriminant: 0 Built, 1 Broadcast,
      * 2 InstantSendLocked, 3 ChainLocked, 4 Consumed,
-     * 5 RecoveredFromChain.
+     * 5 RecoveredFromChain, 6 DrainCompleted, 7 Conflicted.
+     * Conflicted is not finalized or resumable.
      *
      * `4` is terminal; `5` is NOT, its higher discriminant
      * notwithstanding. `5` means Core finality is proven while

packages/kotlin-sdk/sdk/src/test/kotlin/org/dashfoundation/dashsdk/persistence/AssetLockResumableDaoTest.kt

@@ -74,6 +74,16 @@ class AssetLockResumableDaoTest {
             .map { it.outPointHex }
             .sorted()
 
+    @Test
+    fun `conflicted output does not prove finality or hide another finalized output`() = runTest {
+        val txid = "ab".repeat(32)
+        insert("$txid:0", 7)
+        assertEquals(null, db.assetLockDao().maxStatusForTxid(txid))
+        assertEquals(emptyList<String>(), resumableAddressOutpoints())
+        insert("$txid:1", 2)
+        assertEquals(2, db.assetLockDao().maxStatusForTxid(txid))
+    }
+
     // ── observeResumableAddressTopUps ─────────────────────────────────
 
     /**

packages/rs-dash-platform-macros/Cargo.toml

@@ -12,3 +12,8 @@ proc-macro = true
 quote = "1.0.37"
 syn = { version = "2.0.75", features = ["full"] }
 heck = "0.5.0"
+
+[dev-dependencies]
+# Exercises the runtime the `stack_size` macro drives async bodies on; needs
+# `rt-multi-thread` so tests can call `block_in_place` (issue #3535 regression).
+tokio = { version = "1.40", features = ["rt", "rt-multi-thread"] }