fix(platform-wallet)!: replay recorded transaction history on load for every persister

Cargo.toml

@@ -70,14 +70,15 @@ grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "9b19035f5
 grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "9b19035f51905b156e8a628c10b71b85797ffa21" }
 grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "9b19035f51905b156e8a628c10b71b85797ffa21" }
 grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "9b19035f51905b156e8a628c10b71b85797ffa21" }
-dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
-dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
-dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
-key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
-key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
-dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
-dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
-dashcore-crypto = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
+# TODO(upstream-merge): move this wallet-restore authorization pin to merged rust-dashcore dev after PR #1336 lands.
+dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "6f206d482d38def57b866f9dae1a6e98f84d25a9" }
+dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "6f206d482d38def57b866f9dae1a6e98f84d25a9" }
+dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "6f206d482d38def57b866f9dae1a6e98f84d25a9" }
+key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "6f206d482d38def57b866f9dae1a6e98f84d25a9" }
+key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "6f206d482d38def57b866f9dae1a6e98f84d25a9" }
+dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "6f206d482d38def57b866f9dae1a6e98f84d25a9" }
+dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "6f206d482d38def57b866f9dae1a6e98f84d25a9" }
+dashcore-crypto = { git = "https://github.com/dashpay/rust-dashcore", rev = "6f206d482d38def57b866f9dae1a6e98f84d25a9" }
 tokio-metrics = "0.5"
 
 # Size-tuned profile for the iOS `rs-unified-sdk-ffi` staticlib, which

packages/rs-platform-wallet-ffi/Cargo.toml

@@ -47,6 +47,7 @@ hex = "0.4"
 # Persistence loader emits structured warnings for skipped /
 # corrupt rows so operators can detect snapshot drift without a
 # native debugger attached.
+thiserror = "=2.0.18"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
 
@@ -64,6 +65,8 @@ bs58 = "0.5"
 zeroize = { version = "1", features = ["derive"] }
 
 [dev-dependencies]
+dash-spv = { workspace = true, features = ["test-utils"] }
+key-wallet-manager = { workspace = true, features = ["test-utils"] }
 dpp = { path = "../rs-dpp", features = ["fixtures-and-mocks"] }
 platform-wallet = { path = "../rs-platform-wallet", features = ["test-utils"] }
 

packages/rs-platform-wallet-ffi/src/core_wallet_types.rs

@@ -1,5 +1,7 @@
 //! C-compatible types for core wallet changeset FFI.
 
+use key_wallet::managed_account::transaction_record::TransactionDirection;
+use platform_wallet::changeset::WalletAccounting;
 use platform_wallet::masternode::{provider_payload_fields, MasternodeRecord};
 use std::os::raw::c_char;
 
@@ -363,6 +365,38 @@ pub struct AccountChangeSetFFI {
     pub has_internal_highest_used: bool,
 }
 
+/// One transaction's Core accounting from ONE wallet's point of view, as
+/// `platform_wallet::changeset::WalletAccounting` computes it. The host
+/// persists it keyed by `(txid, wallet_id)` (the wallet is the callback's
+/// `wallet_id`) and displays it; it never derives or corrects it.
+///
+/// [`TransactionRecordFFI`]'s own `net_amount` / `direction` / `fee` stay
+/// for hosts that predate this row. A record with no accounting evidence
+/// yields NO row here, so the host keeps what it stored.
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct TransactionAccountingFFI {
+    pub txid: [u8; 32],
+    /// `Σ owned outputs − Σ owned inputs` in duffs (positive = received).
+    pub net_amount: i64,
+    /// 0=incoming, 1=outgoing, 2=internal, 3=coinJoin.
+    pub direction: u32,
+    /// Meaningful only when `has_fee`.
+    pub fee: u64,
+    pub has_fee: bool,
+}
+
+/// One stored Core transaction without this wallet's accounting row, handed
+/// back for the load-time backfill (see
+/// `on_load_core_history_for_accounting_fn`). Host-owned until the matching
+/// free callback.
+#[repr(C)]
+pub struct CoreHistoryTransactionFFI {
+    /// Consensus-encoded transaction body.
+    pub tx_bytes: *const u8,
+    pub tx_bytes_len: usize,
+}
+
 // ---------------------------------------------------------------------------
 // Top-level wallet changeset
 // ---------------------------------------------------------------------------
@@ -487,15 +521,8 @@ impl WalletChangeSetFFI {
     /// snapshots delivered through the `BalanceUpdateHandler`, not as
     /// a delta on the persistence path.
     ///
-    /// TODO(events): wire `instant_locks_for_non_final_records` through
-    /// the FFI surface. Today the Swift side learns about IS-lock state
-    /// only when a re-emitted `TransactionRecord` flows through `records`
-    /// with `context = InstantSend(..)`. The standalone IS-lock map is
-    /// dropped here. Acceptable as long as the event adapter re-emits
-    /// affected records (it does for `TransactionDetected`,
-    /// `BlockProcessed` and `TransactionInstantLocked`).
-    /// When the standalone IS-lock event needs to flow to Swift, add
-    /// a `BTreeMap`-shaped FFI field here and populate it.
+    /// Raw InstantLocks ride the size-gated persistence extension callback;
+    /// they do not change this legacy struct's allocation or array stride.
     pub fn from_changeset(cs: &platform_wallet::changeset::CoreChangeSet) -> Self {
         use key_wallet::account::AccountType;
         use std::ffi::CString;
@@ -1523,6 +1550,37 @@ pub(crate) fn masternode_entry_v2_ffi(
     }
 }
 
+/// `direction` wire values of [`TransactionRecordFFI`] and
+/// [`TransactionAccountingFFI`], exported so hosts name them from the
+/// generated header instead of re-declaring them.
+pub const PLATFORM_WALLET_TRANSACTION_DIRECTION_INCOMING: u32 = 0;
+pub const PLATFORM_WALLET_TRANSACTION_DIRECTION_OUTGOING: u32 = 1;
+pub const PLATFORM_WALLET_TRANSACTION_DIRECTION_INTERNAL: u32 = 2;
+pub const PLATFORM_WALLET_TRANSACTION_DIRECTION_COIN_JOIN: u32 = 3;
+
+fn direction_to_u32(direction: TransactionDirection) -> u32 {
+    match direction {
+        TransactionDirection::Incoming => PLATFORM_WALLET_TRANSACTION_DIRECTION_INCOMING,
+        TransactionDirection::Outgoing => PLATFORM_WALLET_TRANSACTION_DIRECTION_OUTGOING,
+        TransactionDirection::Internal => PLATFORM_WALLET_TRANSACTION_DIRECTION_INTERNAL,
+        TransactionDirection::CoinJoin => PLATFORM_WALLET_TRANSACTION_DIRECTION_COIN_JOIN,
+    }
+}
+
+impl From<&WalletAccounting> for TransactionAccountingFFI {
+    fn from(row: &WalletAccounting) -> Self {
+        let mut txid = [0u8; 32];
+        txid.copy_from_slice(row.txid.as_ref());
+        Self {
+            txid,
+            net_amount: row.net_amount,
+            direction: direction_to_u32(row.direction),
+            fee: row.fee.unwrap_or(0),
+            has_fee: row.fee.is_some(),
+        }
+    }
+}
+
 fn tx_record_to_ffi(
     tr: &key_wallet::managed_account::transaction_record::TransactionRecord,
 ) -> TransactionRecordFFI {
@@ -1569,12 +1627,7 @@ fn tx_record_to_ffi(
         }
     };
 
-    let dir_val = match tr.direction {
-        key_wallet::managed_account::transaction_record::TransactionDirection::Incoming => 0u32,
-        key_wallet::managed_account::transaction_record::TransactionDirection::Outgoing => 1,
-        key_wallet::managed_account::transaction_record::TransactionDirection::Internal => 2,
-        key_wallet::managed_account::transaction_record::TransactionDirection::CoinJoin => 3,
-    };
+    let dir_val = direction_to_u32(tr.direction);
 
     let type_str = CString::new(format!("{:?}", tr.transaction_type))
         .unwrap_or_else(|_| CString::new("Unknown").unwrap());