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
120 changes: 29 additions & 91 deletions Cargo.lock

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

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 = "0bc6592bd41037ffc532d813d4c0828bea7cf882" }
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "0bc6592bd41037ffc532d813d4c0828bea7cf882" }
dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "0bc6592bd41037ffc532d813d4c0828bea7cf882" }
key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "0bc6592bd41037ffc532d813d4c0828bea7cf882" }
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "0bc6592bd41037ffc532d813d4c0828bea7cf882" }
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "0bc6592bd41037ffc532d813d4c0828bea7cf882" }
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "9959201593826def0ad1f6db51b2ceb95b68a1ca" }
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "9959201593826def0ad1f6db51b2ceb95b68a1ca" }
dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "9959201593826def0ad1f6db51b2ceb95b68a1ca" }
key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "9959201593826def0ad1f6db51b2ceb95b68a1ca" }
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "9959201593826def0ad1f6db51b2ceb95b68a1ca" }
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "9959201593826def0ad1f6db51b2ceb95b68a1ca" }

# Optimize heavy crypto crates even in dev/test builds so that
# Halo 2 proof generation and verification run at near-release speed.
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-platform-encryption/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = "Cryptographic utilities for Dash Platform (DIP-15 DashPay encrypt

[dependencies]
# Cryptography
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "2bd764fdc071828939d9dc8dd872c39bae906b04" }
dashcore = { workspace = true }
aes = "0.8"
cbc = "0.1"
sha2 = "0.10"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
use crate::platform_wallet_info::PlatformWalletInfo;
use crate::IdentityManager;
use dashcore::{Address as DashAddress, Address, Network, Transaction};
use dashcore::{Address as DashAddress, Network, Transaction};
use dpp::prelude::CoreBlockHeight;
use key_wallet::account::{ManagedAccountCollection, TransactionRecord};
use key_wallet::wallet::managed_wallet_info::fee::FeeLevel;
use key_wallet::wallet::managed_wallet_info::transaction_building::{
AccountTypePreference, TransactionError,
};
use key_wallet::wallet::managed_wallet_info::wallet_info_interface::WalletInfoInterface;
use key_wallet::wallet::ManagedWalletInfo;
use key_wallet::{Utxo, Wallet, WalletCoreBalance};
Expand Down Expand Up @@ -112,25 +108,6 @@ impl WalletInfoInterface for PlatformWalletInfo {
self.wallet_info.immature_transactions()
}

fn create_unsigned_payment_transaction(
&mut self,
wallet: &Wallet,
account_index: u32,
account_type_pref: Option<AccountTypePreference>,
recipients: Vec<(Address, u64)>,
fee_level: FeeLevel,
current_block_height: u32,
) -> Result<Transaction, TransactionError> {
self.wallet_info.create_unsigned_payment_transaction(
wallet,
account_index,
account_type_pref,
recipients,
fee_level,
current_block_height,
)
}

fn update_synced_height(&mut self, current_height: u32) {
self.wallet_info.update_synced_height(current_height)
}
Expand Down
Loading