Skip to content
Closed
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
306 changes: 122 additions & 184 deletions Cargo.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ members = [
]

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

# Optimize heavy crypto crates even in dev/test builds so that
# Halo 2 proof generation and verification run at near-release speed.
Expand Down
1 change: 0 additions & 1 deletion packages/rs-dpp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ chrono = { version = "0.4.35", default-features = false, features = [
chrono-tz = { version = "0.8", optional = true }
ciborium = { version = "0.2.2", optional = true }
dashcore = { workspace = true, features = [
"std",
"secp-recovery",
"rand",
"signer",
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-platform-wallet/examples/basic_usage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fn main() -> Result<(), PlatformWalletError> {
// The platform wallet can be used with WalletManager (requires "manager" feature)
#[cfg(feature = "manager")]
{
use key_wallet_manager::wallet_manager::WalletManager;
use key_wallet_manager::WalletManager;

let _wallet_manager = WalletManager::<PlatformWalletInfo>::new(network);
println!("Platform wallet successfully integrated with wallet managers!");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::platform_wallet_info::PlatformWalletInfo;
use crate::IdentityManager;
use dashcore::{Address as DashAddress, Network, Transaction};
use dashcore::{Address as DashAddress, Network, Transaction, Txid};
use dpp::prelude::CoreBlockHeight;
use key_wallet::account::{ManagedAccountCollection, TransactionRecord};
use key_wallet::wallet::managed_wallet_info::wallet_info_interface::WalletInfoInterface;
Expand Down Expand Up @@ -111,4 +111,12 @@ impl WalletInfoInterface for PlatformWalletInfo {
fn update_synced_height(&mut self, current_height: u32) {
self.wallet_info.update_synced_height(current_height)
}

fn mark_instant_send_utxos(&mut self, txid: &Txid) -> bool {
self.wallet_info.mark_instant_send_utxos(txid)
}

fn monitor_revision(&self) -> u64 {
self.wallet_info.monitor_revision()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ impl WalletTransactionChecker for PlatformWalletInfo {
&mut self,
tx: &Transaction,
context: TransactionContext,
wallet: &Wallet,
wallet: &mut Wallet,
update_state: bool,
update_balance: bool,
) -> TransactionCheckResult {
// Check transaction with underlying wallet info
let result = self
.wallet_info
.check_core_transaction(tx, context, wallet, update_state)
.check_core_transaction(tx, context, wallet, update_state, update_balance)
.await;

// If the transaction is relevant, and it's an asset lock, automatically fetch identities
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-sdk-ffi/build_ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ if [[ "$CLEAN_BUILD" -eq 1 ]]; then
cargo clean --release --target aarch64-apple-ios-sim -p rs-sdk-ffi 2>/dev/null || true
cargo clean --release --target x86_64-apple-ios -p rs-sdk-ffi 2>/dev/null || true
# Also clean path-dependency crates that cargo may cache
for pkg in dashcore key-wallet key-wallet-manager dash-spv dash-spv-ffi rs-platform-wallet rs-platform-wallet-ffi; do
for pkg in dashcore key-wallet dash-spv dash-spv-ffi rs-platform-wallet rs-platform-wallet-ffi; do
cargo clean --release --target aarch64-apple-ios -p "$pkg" 2>/dev/null || true
cargo clean --release --target aarch64-apple-ios-sim -p "$pkg" 2>/dev/null || true
cargo clean --release --target x86_64-apple-ios -p "$pkg" 2>/dev/null || true
Expand Down
2 changes: 0 additions & 2 deletions packages/rs-sdk-ffi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ mod signer_simple;
mod system;
mod token;
mod types;
mod unified;
mod utils;
mod voting;

Expand Down Expand Up @@ -65,7 +64,6 @@ pub use signer_simple::*;
pub use system::*;
pub use token::*;
pub use types::*;
pub use unified::*;
pub use utils::*;
pub use voting::*;

Expand Down
Loading
Loading