Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 17 additions & 91 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ members = [
]

[workspace.dependencies]
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "fe2476611fcf72d6f36f1154a39a2f9af3b6a248" }
dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "fe2476611fcf72d6f36f1154a39a2f9af3b6a248" }
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "fe2476611fcf72d6f36f1154a39a2f9af3b6a248" }
dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "fe2476611fcf72d6f36f1154a39a2f9af3b6a248" }
key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "fe2476611fcf72d6f36f1154a39a2f9af3b6a248" }
key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "fe2476611fcf72d6f36f1154a39a2f9af3b6a248" }
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "fe2476611fcf72d6f36f1154a39a2f9af3b6a248" }
dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "fe2476611fcf72d6f36f1154a39a2f9af3b6a248" }
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "fe2476611fcf72d6f36f1154a39a2f9af3b6a248" }
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "d6dd5da14902dca4332036c5ef4db03734934eb3" }
dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "d6dd5da14902dca4332036c5ef4db03734934eb3" }
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "d6dd5da14902dca4332036c5ef4db03734934eb3" }
dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "d6dd5da14902dca4332036c5ef4db03734934eb3" }
key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "d6dd5da14902dca4332036c5ef4db03734934eb3" }
key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "d6dd5da14902dca4332036c5ef4db03734934eb3" }
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "d6dd5da14902dca4332036c5ef4db03734934eb3" }
dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "d6dd5da14902dca4332036c5ef4db03734934eb3" }
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "d6dd5da14902dca4332036c5ef4db03734934eb3" }

# Optimize heavy crypto crates even in dev/test builds so that
# Halo 2 proof generation and verification run at near-release speed.
Expand Down
12 changes: 12 additions & 0 deletions packages/rs-platform-wallet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,15 @@ default = ["bls", "eddsa"]
bls = ["key-wallet/bls", "key-wallet-manager/bls"]
eddsa = ["key-wallet/eddsa", "key-wallet-manager/eddsa"]
shielded = ["dep:grovedb-commitment-tree", "dep:zip32", "dash-sdk/shielded", "dpp/shielded-client"]
# Forward to the upstream `key-wallet` / `key-wallet-manager`
# `keep-finalized-transactions` feature. With it OFF (the default),
# chainlocked transactions are evicted from the in-memory
# `transactions` map and only their txids are kept (in
# `finalized_txids`) for dedup; tx history is delivered through the
# event channel. Turn ON to keep the full `TransactionRecord` for
# finalized transactions in memory for the wallet's lifetime — useful
# for debug surfaces that page through history.
keep-finalized-transactions = [
"key-wallet/keep-finalized-transactions",
"key-wallet-manager/keep-finalized-transactions",
]
10 changes: 5 additions & 5 deletions packages/rs-platform-wallet/src/changeset/core_bridge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,12 @@ async fn is_chain_locked(
};
// Walk every account; if any holds an in-memory record for this
// txid, the chain-lock determination falls out of its
// `TransactionContext`. With `keep_txs_in_memory` off (the default)
// `get_transaction` returns `None` regardless of state — chain-lock
// delivery is event-driven in that mode, and this helper just
// reports "no record locally" by returning false.
// `TransactionContext`. With `keep-finalized-transactions` off
// (the default) `transactions()` returns an empty map regardless
// of state — chain-lock delivery is event-driven in that mode, and
// this helper just reports "no record locally" by returning false.
for account in info.core_wallet.accounts.all_accounts() {
if let Some(record) = account.get_transaction(txid) {
if let Some(record) = account.transactions().get(txid) {
return matches!(record.context, TransactionContext::InChainLockedBlock(_));
}
}
Expand Down
Loading
Loading