Skip to content

Commit 7db14fa

Browse files
shumkovclaude
andcommitted
chore: update dashcore deps to f92f114b (PR #590 — restored key-wallet-manager)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent a0dddb0 commit 7db14fa

12 files changed

Lines changed: 315 additions & 801 deletions

File tree

Cargo.lock

Lines changed: 122 additions & 184 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ members = [
4747
]
4848

4949
[workspace.dependencies]
50-
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "8cbae416458565faac21d3452fbc6d80b324f6d3" }
51-
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "8cbae416458565faac21d3452fbc6d80b324f6d3" }
52-
dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "8cbae416458565faac21d3452fbc6d80b324f6d3" }
53-
key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "8cbae416458565faac21d3452fbc6d80b324f6d3" }
54-
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "8cbae416458565faac21d3452fbc6d80b324f6d3" }
55-
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "8cbae416458565faac21d3452fbc6d80b324f6d3" }
50+
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "f92f114b83f6e442af8290611a10f2246ee58d3a" }
51+
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "f92f114b83f6e442af8290611a10f2246ee58d3a" }
52+
dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "f92f114b83f6e442af8290611a10f2246ee58d3a" }
53+
key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "f92f114b83f6e442af8290611a10f2246ee58d3a" }
54+
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "f92f114b83f6e442af8290611a10f2246ee58d3a" }
55+
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "f92f114b83f6e442af8290611a10f2246ee58d3a" }
5656

5757
# Optimize heavy crypto crates even in dev/test builds so that
5858
# Halo 2 proof generation and verification run at near-release speed.

packages/rs-dpp/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ chrono = { version = "0.4.35", default-features = false, features = [
2525
chrono-tz = { version = "0.8", optional = true }
2626
ciborium = { version = "0.2.2", optional = true }
2727
dashcore = { workspace = true, features = [
28-
"std",
2928
"secp-recovery",
3029
"rand",
3130
"signer",

packages/rs-platform-wallet/examples/basic_usage.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn main() -> Result<(), PlatformWalletError> {
2525
// The platform wallet can be used with WalletManager (requires "manager" feature)
2626
#[cfg(feature = "manager")]
2727
{
28-
use key_wallet_manager::wallet_manager::WalletManager;
28+
use key_wallet_manager::WalletManager;
2929

3030
let _wallet_manager = WalletManager::<PlatformWalletInfo>::new(network);
3131
println!("Platform wallet successfully integrated with wallet managers!");

packages/rs-platform-wallet/src/platform_wallet_info/wallet_info_interface.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::platform_wallet_info::PlatformWalletInfo;
22
use crate::IdentityManager;
3-
use dashcore::{Address as DashAddress, Network, Transaction};
3+
use dashcore::{Address as DashAddress, Network, Transaction, Txid};
44
use dpp::prelude::CoreBlockHeight;
55
use key_wallet::account::{ManagedAccountCollection, TransactionRecord};
66
use key_wallet::wallet::managed_wallet_info::wallet_info_interface::WalletInfoInterface;
@@ -111,4 +111,12 @@ impl WalletInfoInterface for PlatformWalletInfo {
111111
fn update_synced_height(&mut self, current_height: u32) {
112112
self.wallet_info.update_synced_height(current_height)
113113
}
114+
115+
fn mark_instant_send_utxos(&mut self, txid: &Txid) -> bool {
116+
self.wallet_info.mark_instant_send_utxos(txid)
117+
}
118+
119+
fn monitor_revision(&self) -> u64 {
120+
self.wallet_info.monitor_revision()
121+
}
114122
}

packages/rs-platform-wallet/src/platform_wallet_info/wallet_transaction_checker.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ impl WalletTransactionChecker for PlatformWalletInfo {
1313
&mut self,
1414
tx: &Transaction,
1515
context: TransactionContext,
16-
wallet: &Wallet,
16+
wallet: &mut Wallet,
1717
update_state: bool,
18+
update_balance: bool,
1819
) -> TransactionCheckResult {
1920
// Check transaction with underlying wallet info
2021
let result = self
2122
.wallet_info
22-
.check_core_transaction(tx, context, wallet, update_state)
23+
.check_core_transaction(tx, context, wallet, update_state, update_balance)
2324
.await;
2425

2526
// If the transaction is relevant, and it's an asset lock, automatically fetch identities

packages/rs-sdk-ffi/build_ios.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ if [[ "$CLEAN_BUILD" -eq 1 ]]; then
9595
cargo clean --release --target aarch64-apple-ios-sim -p rs-sdk-ffi 2>/dev/null || true
9696
cargo clean --release --target x86_64-apple-ios -p rs-sdk-ffi 2>/dev/null || true
9797
# Also clean path-dependency crates that cargo may cache
98-
for pkg in dashcore key-wallet key-wallet-manager dash-spv dash-spv-ffi rs-platform-wallet rs-platform-wallet-ffi; do
98+
for pkg in dashcore key-wallet dash-spv dash-spv-ffi rs-platform-wallet rs-platform-wallet-ffi; do
9999
cargo clean --release --target aarch64-apple-ios -p "$pkg" 2>/dev/null || true
100100
cargo clean --release --target aarch64-apple-ios-sim -p "$pkg" 2>/dev/null || true
101101
cargo clean --release --target x86_64-apple-ios -p "$pkg" 2>/dev/null || true

packages/rs-sdk-ffi/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ mod signer_simple;
3232
mod system;
3333
mod token;
3434
mod types;
35-
mod unified;
3635
mod utils;
3736
mod voting;
3837

@@ -65,7 +64,6 @@ pub use signer_simple::*;
6564
pub use system::*;
6665
pub use token::*;
6766
pub use types::*;
68-
pub use unified::*;
6967
pub use utils::*;
7068
pub use voting::*;
7169

0 commit comments

Comments
 (0)