diff --git a/Cargo.lock b/Cargo.lock index 7e3c00895d..98d435d7ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1206,7 +1206,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -1637,7 +1637,7 @@ dependencies = [ [[package]] name = "dash-network" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=1860089eddea27f66e5b3e637d18a73ae138478c#1860089eddea27f66e5b3e637d18a73ae138478c" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3#1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" dependencies = [ "bincode", "bincode_derive", @@ -1648,7 +1648,7 @@ dependencies = [ [[package]] name = "dash-network-seeds" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=1860089eddea27f66e5b3e637d18a73ae138478c#1860089eddea27f66e5b3e637d18a73ae138478c" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3#1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" dependencies = [ "dash-network", ] @@ -1725,7 +1725,7 @@ dependencies = [ [[package]] name = "dash-spv" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=1860089eddea27f66e5b3e637d18a73ae138478c#1860089eddea27f66e5b3e637d18a73ae138478c" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3#1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" dependencies = [ "async-trait", "chrono", @@ -1754,7 +1754,7 @@ dependencies = [ [[package]] name = "dashcore" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=1860089eddea27f66e5b3e637d18a73ae138478c#1860089eddea27f66e5b3e637d18a73ae138478c" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3#1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" dependencies = [ "anyhow", "base64-compat", @@ -1780,12 +1780,12 @@ dependencies = [ [[package]] name = "dashcore-private" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=1860089eddea27f66e5b3e637d18a73ae138478c#1860089eddea27f66e5b3e637d18a73ae138478c" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3#1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" [[package]] name = "dashcore-rpc" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=1860089eddea27f66e5b3e637d18a73ae138478c#1860089eddea27f66e5b3e637d18a73ae138478c" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3#1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" dependencies = [ "dashcore-rpc-json", "hex", @@ -1798,7 +1798,7 @@ dependencies = [ [[package]] name = "dashcore-rpc-json" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=1860089eddea27f66e5b3e637d18a73ae138478c#1860089eddea27f66e5b3e637d18a73ae138478c" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3#1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" dependencies = [ "bincode", "dashcore", @@ -1813,7 +1813,7 @@ dependencies = [ [[package]] name = "dashcore_hashes" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=1860089eddea27f66e5b3e637d18a73ae138478c#1860089eddea27f66e5b3e637d18a73ae138478c" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3#1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" dependencies = [ "bincode", "dashcore-private", @@ -2428,7 +2428,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2489,7 +2489,7 @@ checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78" dependencies = [ "cfg-if", "rustix 1.1.4", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2867,7 +2867,7 @@ dependencies = [ [[package]] name = "git-state" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=1860089eddea27f66e5b3e637d18a73ae138478c#1860089eddea27f66e5b3e637d18a73ae138478c" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3#1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" [[package]] name = "glob" @@ -3803,7 +3803,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -4034,7 +4034,7 @@ dependencies = [ [[package]] name = "key-wallet" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=1860089eddea27f66e5b3e637d18a73ae138478c#1860089eddea27f66e5b3e637d18a73ae138478c" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3#1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" dependencies = [ "aes", "async-trait", @@ -4063,7 +4063,7 @@ dependencies = [ [[package]] name = "key-wallet-ffi" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=1860089eddea27f66e5b3e637d18a73ae138478c#1860089eddea27f66e5b3e637d18a73ae138478c" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3#1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" dependencies = [ "cbindgen 0.29.4", "dash-network", @@ -4079,7 +4079,7 @@ dependencies = [ [[package]] name = "key-wallet-manager" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=1860089eddea27f66e5b3e637d18a73ae138478c#1860089eddea27f66e5b3e637d18a73ae138478c" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3#1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" dependencies = [ "async-trait", "bincode", @@ -4596,7 +4596,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5698,7 +5698,7 @@ dependencies = [ "once_cell", "socket2 0.5.10", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6489,7 +6489,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6502,7 +6502,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6561,7 +6561,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7421,7 +7421,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -8870,7 +8870,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 4f81cab57c..b7db6e4495 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,14 +50,14 @@ members = [ ] [workspace.dependencies] -dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "1860089eddea27f66e5b3e637d18a73ae138478c" } -dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "1860089eddea27f66e5b3e637d18a73ae138478c" } -dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "1860089eddea27f66e5b3e637d18a73ae138478c" } -key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "1860089eddea27f66e5b3e637d18a73ae138478c" } -key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "1860089eddea27f66e5b3e637d18a73ae138478c" } -key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "1860089eddea27f66e5b3e637d18a73ae138478c" } -dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "1860089eddea27f66e5b3e637d18a73ae138478c" } -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "1860089eddea27f66e5b3e637d18a73ae138478c" } +dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" } +dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" } +dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" } +key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" } +key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" } +key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" } +dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "1ee1c94840f14c63fa34e9d19f6eaaa1d29847c3" } tokio-metrics = "0.5" diff --git a/packages/rs-platform-wallet/src/wallet/platform_wallet_traits.rs b/packages/rs-platform-wallet/src/wallet/platform_wallet_traits.rs index 5676a3976d..9feb25bb04 100644 --- a/packages/rs-platform-wallet/src/wallet/platform_wallet_traits.rs +++ b/packages/rs-platform-wallet/src/wallet/platform_wallet_traits.rs @@ -101,6 +101,10 @@ impl WalletInfoInterface for PlatformWalletInfo { self.core_wallet.monitored_script_pubkeys() } + fn monitored_filter_elements(&self) -> Vec> { + self.core_wallet.monitored_filter_elements() + } + fn utxos(&self) -> BTreeSet<&Utxo> { self.core_wallet.utxos() }