diff --git a/Cargo.lock b/Cargo.lock index e44f0bbf374..3c59ed9fc84 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -486,7 +486,7 @@ name = "base58ck" version = "0.5.0" source = "git+https://github.com/rust-bitcoin/rust-bitcoin?rev=7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516#7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" dependencies = [ - "bitcoin-internals", + "bitcoin-internals 0.7.0", "bitcoin_hashes 1.2.0", ] @@ -509,16 +509,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] -name = "base64ct" -version = "1.8.3" +name = "base64" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" [[package]] -name = "bech32" -version = "0.9.1" +name = "base64ct" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" +checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" [[package]] name = "bech32" @@ -573,6 +573,18 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "bip324" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ed414c4fcc415f4899990cdc04d5fa6c7cd5673042c43bde1943250df8a59c7" +dependencies = [ + "bitcoin_hashes 0.16.0", + "chacha20-poly1305", + "secp256k1 0.29.1", + "tokio", +] + [[package]] name = "bip37-bloom-filter" version = "0.1.0" @@ -632,18 +644,7 @@ name = "bitcoin-consensus-encoding" version = "1.2.0" source = "git+https://github.com/rust-bitcoin/rust-bitcoin?rev=7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516#7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" dependencies = [ - "bitcoin-internals", - "hex-conservative 1.3.0", - "serde", -] - -[[package]] -name = "bitcoin-consensus-encoding" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9daa31138eb443d5751b207f3f64154e2bb09cd59960562ccc7a7112be38147f" -dependencies = [ - "bitcoin-internals", + "bitcoin-internals 0.7.0", "hex-conservative 1.3.0", "serde", ] @@ -654,15 +655,21 @@ version = "0.3.0" source = "git+https://github.com/rust-bitcoin/rust-bitcoin?rev=7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516#7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" dependencies = [ "base58ck", - "bitcoin-internals", + "bitcoin-internals 0.7.0", "bitcoin-network-kind", "bitcoin-primitives", "bitcoin_hashes 1.2.0", "hex-conservative 1.3.0", - "secp256k1", + "secp256k1 0.33.1", "serde", ] +[[package]] +name = "bitcoin-internals" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a90bbbfa552b49101a230fb2668f3f9ef968c81e6f83cf577e1d4b80f689e1aa" + [[package]] name = "bitcoin-internals" version = "0.7.0" @@ -673,11 +680,11 @@ dependencies = [ [[package]] name = "bitcoin-io" -version = "0.1.101" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb5de036369d1ac59d3c1819ebc4d850f89466f5401c571a285b6ed564a4cb78" +checksum = "26792cd2bf245069a1c5acb06aa7ad7abe1de69b507c90b490bca81e0665d0ee" dependencies = [ - "bitcoin-consensus-encoding 1.3.0", + "bitcoin-internals 0.4.2", ] [[package]] @@ -685,7 +692,7 @@ name = "bitcoin-network-kind" version = "1.0.0" source = "git+https://github.com/rust-bitcoin/rust-bitcoin?rev=7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516#7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" dependencies = [ - "bitcoin-internals", + "bitcoin-internals 0.7.0", "serde", ] @@ -694,8 +701,8 @@ name = "bitcoin-primitives" version = "0.103.1" source = "git+https://github.com/rust-bitcoin/rust-bitcoin?rev=7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516#7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" dependencies = [ - "bitcoin-consensus-encoding 1.2.0", - "bitcoin-internals", + "bitcoin-consensus-encoding", + "bitcoin-internals 0.7.0", "bitcoin-units", "bitcoin_hashes 1.2.0", "hex-conservative 1.3.0", @@ -706,8 +713,8 @@ name = "bitcoin-units" version = "0.5.0" source = "git+https://github.com/rust-bitcoin/rust-bitcoin?rev=7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516#7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" dependencies = [ - "bitcoin-consensus-encoding 1.2.0", - "bitcoin-internals", + "bitcoin-consensus-encoding", + "bitcoin-internals 0.7.0", "serde", ] @@ -717,9 +724,17 @@ version = "0.14.101" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bca4c7abb40c8817d77403c880988cfd484f23ab2365726afb2f798363e2c4a2" dependencies = [ - "bitcoin-io", "hex-conservative 0.2.2", - "serde", +] + +[[package]] +name = "bitcoin_hashes" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e5d09f16329cd545d7e6008b2c6b2af3a90bc678cf41ac3d2f6755943301b16" +dependencies = [ + "bitcoin-io", + "hex-conservative 0.3.2", ] [[package]] @@ -727,8 +742,8 @@ name = "bitcoin_hashes" version = "1.2.0" source = "git+https://github.com/rust-bitcoin/rust-bitcoin?rev=7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516#7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" dependencies = [ - "bitcoin-consensus-encoding 1.2.0", - "bitcoin-internals", + "bitcoin-consensus-encoding", + "bitcoin-internals 0.7.0", "hex-conservative 1.3.0", "serde", ] @@ -986,26 +1001,7 @@ dependencies = [ "serde_json", "syn 2.0.117", "tempfile", - "toml 0.8.23", -] - -[[package]] -name = "cbindgen" -version = "0.29.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ecb53484c9c167ba674026b656d8a27d7657a58e6066aa902bfb1a4aa00ae20" -dependencies = [ - "clap", - "heck 0.5.0", - "indexmap 2.14.0", - "log", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 2.0.117", - "tempfile", - "toml 0.9.12+spec-1.1.0", + "toml", ] [[package]] @@ -1069,6 +1065,12 @@ dependencies = [ "rand_core 0.10.1", ] +[[package]] +name = "chacha20-poly1305" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b4b0fc281743d80256607bd65e8beedc42cb0787ea119c85b81b4c0eab85e5f" + [[package]] name = "chacha20poly1305" version = "0.10.1" @@ -1086,7 +1088,7 @@ dependencies = [ name = "check-features" version = "5.0.3" dependencies = [ - "toml 0.8.23", + "toml", ] [[package]] @@ -1271,7 +1273,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1773,9 +1775,9 @@ dependencies = [ [[package]] name = "dash-network" version = "0.46.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=7329126edf27fb0356c444888ad1207bdfa2e39a#7329126edf27fb0356c444888ad1207bdfa2e39a" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4#c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" dependencies = [ - "cbindgen 0.29.4", + "dash-params", "grovedb-bincode", "grovedb-bincode-derive", "serde", @@ -1784,7 +1786,7 @@ dependencies = [ [[package]] name = "dash-network-seeds" version = "0.46.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=7329126edf27fb0356c444888ad1207bdfa2e39a#7329126edf27fb0356c444888ad1207bdfa2e39a" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4#c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" dependencies = [ "dash-network", ] @@ -1792,20 +1794,33 @@ dependencies = [ [[package]] name = "dash-num" version = "0.2.0-beta" -source = "git+https://github.com/dashpay/base-sdk?rev=addedfa16a56c77f435b41804cd2c0668b776e97#addedfa16a56c77f435b41804cd2c0668b776e97" +source = "git+https://github.com/dashpay/base-sdk?rev=89828032b6be3341cafda0ce433c010a23217b39#89828032b6be3341cafda0ce433c010a23217b39" dependencies = [ "ambassador", - "bitcoin-internals", + "bitcoin-consensus-encoding", + "bitcoin-internals 0.7.0", "dash-types", "delegate", "hex-conservative 1.3.0", "serde", ] +[[package]] +name = "dash-params" +version = "0.0.0" +source = "git+https://github.com/dashpay/base-sdk?rev=89828032b6be3341cafda0ce433c010a23217b39#89828032b6be3341cafda0ce433c010a23217b39" +dependencies = [ + "bitcoin-units", + "bitcoin_hashes 1.2.0", + "dash-num", + "dash-types", + "hex-conservative 1.3.0", +] + [[package]] name = "dash-pkc" version = "0.2.0-beta" -source = "git+https://github.com/dashpay/base-sdk?rev=addedfa16a56c77f435b41804cd2c0668b776e97#addedfa16a56c77f435b41804cd2c0668b776e97" +source = "git+https://github.com/dashpay/base-sdk?rev=89828032b6be3341cafda0ce433c010a23217b39#89828032b6be3341cafda0ce433c010a23217b39" dependencies = [ "aes 0.9.3", "base58ck", @@ -1819,7 +1834,7 @@ dependencies = [ "group 0.14.0", "hex-conservative 1.3.0", "rand_core 0.10.1", - "secp256k1", + "secp256k1 0.33.1", "serde", "sha2 0.11.0", "subtle", @@ -1871,7 +1886,7 @@ dependencies = [ [[package]] name = "dash-pow" version = "0.1.0-beta" -source = "git+https://github.com/dashpay/base-sdk?rev=addedfa16a56c77f435b41804cd2c0668b776e97#addedfa16a56c77f435b41804cd2c0668b776e97" +source = "git+https://github.com/dashpay/base-sdk?rev=89828032b6be3341cafda0ce433c010a23217b39#89828032b6be3341cafda0ce433c010a23217b39" dependencies = [ "digest 0.11.3", "wide", @@ -1942,11 +1957,11 @@ dependencies = [ [[package]] name = "dash-spv" version = "0.46.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=7329126edf27fb0356c444888ad1207bdfa2e39a#7329126edf27fb0356c444888ad1207bdfa2e39a" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4#c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" dependencies = [ "async-trait", + "bip324", "chrono", - "clap", "dash-network-seeds", "dashcore", "dashcore-rpc", @@ -1958,11 +1973,10 @@ dependencies = [ "key-wallet", "key-wallet-manager", "rand 0.9.4", - "rayon", "serde", "serde_json", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.18", "tokio", "tokio-stream", "tokio-util", @@ -1974,11 +1988,12 @@ dependencies = [ [[package]] name = "dash-types" version = "0.2.0-beta" -source = "git+https://github.com/dashpay/base-sdk?rev=addedfa16a56c77f435b41804cd2c0668b776e97#addedfa16a56c77f435b41804cd2c0668b776e97" +source = "git+https://github.com/dashpay/base-sdk?rev=89828032b6be3341cafda0ce433c010a23217b39#89828032b6be3341cafda0ce433c010a23217b39" dependencies = [ - "bitcoin-consensus-encoding 1.2.0", + "bitcoin-consensus-encoding", "bitcoin-primitives", "cfg-if", + "dash-types-marker", "hex-conservative 1.3.0", "serde", "subtle", @@ -1986,36 +2001,47 @@ dependencies = [ "zeroize", ] +[[package]] +name = "dash-types-marker" +version = "0.1.0-beta" +source = "git+https://github.com/dashpay/base-sdk?rev=89828032b6be3341cafda0ce433c010a23217b39#89828032b6be3341cafda0ce433c010a23217b39" +dependencies = [ + "quote", + "syn 2.0.117", + "xxhash-rust", +] + [[package]] name = "dashcore" version = "0.46.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=7329126edf27fb0356c444888ad1207bdfa2e39a#7329126edf27fb0356c444888ad1207bdfa2e39a" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4#c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" dependencies = [ "anyhow", - "base64 0.22.1", - "bech32 0.9.1", + "base64 0.23.1", + "bitcoin-units", "bitvec", "blake3", + "bytes", "dash-network", "dash-num", + "dash-params", "dash-types", "dashcore-crypto", "dashcore-private", "dashcore_hashes", "grovedb-bincode", - "grovedb-bincode-derive", "hex-conservative 1.3.0", "serde", "thiserror 2.0.18", + "tokio-util", "tracing", ] [[package]] name = "dashcore-crypto" version = "0.46.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=7329126edf27fb0356c444888ad1207bdfa2e39a#7329126edf27fb0356c444888ad1207bdfa2e39a" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4#c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" dependencies = [ - "base58ck", "bitcoin-crypto", "dash-network", "dash-pkc", @@ -2035,12 +2061,12 @@ dependencies = [ [[package]] name = "dashcore-private" version = "0.46.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=7329126edf27fb0356c444888ad1207bdfa2e39a#7329126edf27fb0356c444888ad1207bdfa2e39a" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4#c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" [[package]] name = "dashcore-rpc" version = "0.46.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=7329126edf27fb0356c444888ad1207bdfa2e39a#7329126edf27fb0356c444888ad1207bdfa2e39a" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4#c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" dependencies = [ "dashcore-rpc-json", "hex-conservative 1.3.0", @@ -2053,7 +2079,7 @@ dependencies = [ [[package]] name = "dashcore-rpc-json" version = "0.46.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=7329126edf27fb0356c444888ad1207bdfa2e39a#7329126edf27fb0356c444888ad1207bdfa2e39a" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4#c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" dependencies = [ "dashcore", "grovedb-bincode", @@ -2068,9 +2094,9 @@ dependencies = [ [[package]] name = "dashcore_hashes" version = "0.46.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=7329126edf27fb0356c444888ad1207bdfa2e39a#7329126edf27fb0356c444888ad1207bdfa2e39a" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4#c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" dependencies = [ - "bitcoin_hashes 0.14.101", + "bitcoin_hashes 1.2.0", "dash-pow", "grovedb-bincode", "hex-conservative 1.3.0", @@ -2344,7 +2370,7 @@ dependencies = [ "assert_matches", "async-trait", "base64 0.22.1", - "bech32 0.11.1", + "bech32", "blst", "bs58", "byteorder", @@ -2392,7 +2418,7 @@ dependencies = [ "regex", "rust_decimal", "rust_decimal_macros", - "secp256k1", + "secp256k1 0.33.1", "serde", "serde_json", "serde_repr", @@ -2730,7 +2756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2790,7 +2816,7 @@ checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78" dependencies = [ "cfg-if", "rustix 1.1.4", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3165,7 +3191,7 @@ dependencies = [ [[package]] name = "git-state" version = "0.46.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=7329126edf27fb0356c444888ad1207bdfa2e39a#7329126edf27fb0356c444888ad1207bdfa2e39a" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4#c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" [[package]] name = "glob" @@ -3671,6 +3697,15 @@ dependencies = [ "arrayvec", ] +[[package]] +name = "hex-conservative" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830e599c2904b08f0834ee6337d8fe8f0ed4a63b5d9e7a7f49c0ffa06d08d360" +dependencies = [ + "arrayvec", +] + [[package]] name = "hex-conservative" version = "1.3.0" @@ -4117,7 +4152,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4311,11 +4346,11 @@ dependencies = [ [[package]] name = "jsonrpc" -version = "0.18.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3662a38d341d77efecb73caf01420cfa5aa63c0253fd7bc05289ef9f6616e1bf" +checksum = "6802a88c69545937a980fcc973543364aa948d7a7c0f258eb8713a7781248f1c" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", "serde", "serde_json", ] @@ -4364,13 +4399,12 @@ dependencies = [ [[package]] name = "key-wallet" version = "0.46.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=7329126edf27fb0356c444888ad1207bdfa2e39a#7329126edf27fb0356c444888ad1207bdfa2e39a" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4#c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" dependencies = [ "async-trait", "bip39", "bitflags 2.13.0", "dashcore", - "dashcore-private", "dashcore_hashes", "getrandom 0.4.2", "grovedb-bincode", @@ -4386,13 +4420,12 @@ dependencies = [ [[package]] name = "key-wallet-manager" version = "0.46.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=7329126edf27fb0356c444888ad1207bdfa2e39a#7329126edf27fb0356c444888ad1207bdfa2e39a" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4#c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" dependencies = [ "async-trait", "dashcore", "hex-conservative 1.3.0", "key-wallet", - "rayon", "serde", "tokio", "tracing", @@ -4906,7 +4939,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5351,7 +5384,7 @@ dependencies = [ "aes 0.8.4", "cbc", "hmac", - "secp256k1", + "secp256k1 0.33.1", "sha2 0.10.9", "thiserror 1.0.69", ] @@ -5468,7 +5501,7 @@ dependencies = [ "anyhow", "async-trait", "bs58", - "cbindgen 0.27.0", + "cbindgen", "dash-sdk", "dashcore", "dpp", @@ -5969,7 +6002,7 @@ dependencies = [ "once_cell", "socket2 0.5.10", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6460,7 +6493,7 @@ dependencies = [ "ciborium", "clap", "dapi-grpc", - "dash-spv", + "dashcore", "dashcore-rpc", "dotenvy", "dpp", @@ -6572,7 +6605,7 @@ version = "5.0.3" dependencies = [ "async-trait", "bs58", - "cbindgen 0.27.0", + "cbindgen", "dash-async", "dash-network", "dash-sdk", @@ -6767,7 +6800,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6780,7 +6813,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6839,7 +6872,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6971,6 +7004,16 @@ version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" +[[package]] +name = "secp256k1" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" +dependencies = [ + "rand 0.8.6", + "secp256k1-sys 0.10.1", +] + [[package]] name = "secp256k1" version = "0.33.1" @@ -6978,10 +7021,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7f404a8dab7a7a5a631e741d8699aa9c8e1d689fc26ccf897c7187565490b69" dependencies = [ "rand 0.9.4", - "secp256k1-sys", + "secp256k1-sys 0.14.1", "serde", ] +[[package]] +name = "secp256k1-sys" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" +dependencies = [ + "cc", +] + [[package]] name = "secp256k1-sys" version = "0.14.1" @@ -7126,15 +7178,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_spanned" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26" -dependencies = [ - "serde_core", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -7660,7 +7703,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8042,26 +8085,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" dependencies = [ "serde", - "serde_spanned 0.6.9", + "serde_spanned", "toml_datetime 0.6.11", "toml_edit 0.22.27", ] -[[package]] -name = "toml" -version = "0.9.12+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" -dependencies = [ - "indexmap 2.14.0", - "serde_core", - "serde_spanned 1.1.1", - "toml_datetime 0.7.5+spec-1.1.0", - "toml_parser", - "toml_writer", - "winnow 0.7.15", -] - [[package]] name = "toml_datetime" version = "0.6.11" @@ -8071,15 +8099,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_datetime" -version = "0.7.5+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" -dependencies = [ - "serde_core", -] - [[package]] name = "toml_datetime" version = "1.1.1+spec-1.1.0" @@ -8108,7 +8127,7 @@ checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ "indexmap 2.14.0", "serde", - "serde_spanned 0.6.9", + "serde_spanned", "toml_datetime 0.6.11", "toml_write", "winnow 0.7.15", @@ -8141,12 +8160,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" -[[package]] -name = "toml_writer" -version = "1.1.1+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" - [[package]] name = "tonic" version = "0.12.3" @@ -9135,7 +9148,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -9728,7 +9741,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b64bf5186a8916f7a48f2a98ef599bf9c099e2458b36b819e393db1c0e768c4b" dependencies = [ - "bech32 0.11.1", + "bech32", "blake2b_simd", "memuse", "subtle", diff --git a/Cargo.toml b/Cargo.toml index 427bcd4bcd0..393766eb6a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,27 +70,16 @@ grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "9b19035f5 grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "9b19035f51905b156e8a628c10b71b85797ffa21" } grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "9b19035f51905b156e8a628c10b71b85797ffa21" } grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "9b19035f51905b156e8a628c10b71b85797ffa21" } -dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" } -dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" } -dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" } -key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" } -key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" } -dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" } -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" } -dashcore-crypto = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" } +dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } +dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } +dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } +key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } +key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } +dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } +dashcore-crypto = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } tokio-metrics = "0.5" -# rust-dashcore's bitcoin-crypto takes these crates from this rust-bitcoin rev, -# while other dependencies take the same versions from crates.io. Cargo cannot -# vendor one name and version from two sources, so use the git copies for both. -# Keep the rev equal to bitcoin-crypto's rev in rust-dashcore. A bump past -# dashpay/rust-dashcore#1224 needs only bitcoin-internals; see #5648. -[patch.crates-io] -base58ck = { git = "https://github.com/rust-bitcoin/rust-bitcoin", rev = "7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" } -bitcoin_hashes = { git = "https://github.com/rust-bitcoin/rust-bitcoin", rev = "7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" } -bitcoin-internals = { git = "https://github.com/rust-bitcoin/rust-bitcoin", rev = "7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" } -bitcoin-units = { git = "https://github.com/rust-bitcoin/rust-bitcoin", rev = "7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" } - # Size-tuned profile for the iOS `rs-unified-sdk-ffi` staticlib, which # otherwise ships huge. Inherits `release` and is ONLY used by the iOS # build (`build_ios.sh --profile release`) diff --git a/packages/rs-dapi/Cargo.toml b/packages/rs-dapi/Cargo.toml index f8bc5b75670..addb12ad7ff 100644 --- a/packages/rs-dapi/Cargo.toml +++ b/packages/rs-dapi/Cargo.toml @@ -88,7 +88,8 @@ once_cell = "1.19" # Dash Core RPC client dashcore-rpc = { workspace = true } -dash-spv = { workspace = true } +# The Docker image builds rs-dapi on its own, so X11 block hashes must be enabled here. +dashcore = { workspace = true, features = ["core-block-hash-use-x11"] } rs-dash-event-bus = { path = "../rs-dash-event-bus" } diff --git a/packages/rs-dapi/src/services/core_service.rs b/packages/rs-dapi/src/services/core_service.rs index bd47aff6fc0..236237a5268 100644 --- a/packages/rs-dapi/src/services/core_service.rs +++ b/packages/rs-dapi/src/services/core_service.rs @@ -16,7 +16,6 @@ use dapi_grpc::core::v0::{ use dapi_grpc::tonic::{Request, Response, Status}; use dashcore_rpc::dashcore::Transaction; use dashcore_rpc::dashcore::consensus::encode::deserialize as deserialize_tx; -use dashcore_rpc::dashcore::hashes::Hash; use dashcore_rpc::dashcore::policy::MAX_STANDARD_TX_WEIGHT; use std::any::type_name_of_val; use std::sync::Arc; diff --git a/packages/rs-dapi/src/services/streaming_service/block_header_stream.rs b/packages/rs-dapi/src/services/streaming_service/block_header_stream.rs index 266b5a2c146..d60f6f514e0 100644 --- a/packages/rs-dapi/src/services/streaming_service/block_header_stream.rs +++ b/packages/rs-dapi/src/services/streaming_service/block_header_stream.rs @@ -9,7 +9,6 @@ use dapi_grpc::tonic::{Request, Response, Status}; use dashcore_rpc::dashcore::consensus::encode::{ deserialize as deserialize_consensus, serialize as serialize_consensus, }; -use dashcore_rpc::dashcore::hashes::Hash; use tokio::sync::{Mutex as AsyncMutex, OwnedSemaphorePermit, mpsc, watch}; use tokio::task::JoinSet; use tokio::time::{Duration, sleep}; diff --git a/packages/rs-dapi/src/services/streaming_service/bloom.rs b/packages/rs-dapi/src/services/streaming_service/bloom.rs index 9db6d77f4bc..62fbadcd66e 100644 --- a/packages/rs-dapi/src/services/streaming_service/bloom.rs +++ b/packages/rs-dapi/src/services/streaming_service/bloom.rs @@ -22,7 +22,6 @@ fn script_matches(filter: &CoreBloomFilter, script: &ScriptBuf) -> bool { #[inline] fn txid_to_internal_bytes(txid: &Txid) -> Vec { - use dashcore_rpc::dashcore::hashes::Hash; txid.to_byte_array().to_vec() } @@ -112,7 +111,6 @@ pub(crate) fn bloom_flags_from_int>(flags: I) -> BloomFlags { mod tests { use super::*; use dashcore_rpc::dashcore::bloom::BloomFilter as CoreBloomFilter; - use dashcore_rpc::dashcore::hashes::Hash; use dashcore_rpc::dashcore::{OutPoint, PubkeyHash}; use std::str::FromStr; use std::sync::RwLock; @@ -423,7 +421,6 @@ mod tests { /// This is the correct, consistent path. #[test] fn test_client_filter_with_consensus_byte_order_matches_server_side() { - use dashcore_rpc::dashcore::hashes::Hash as _; use dashcore_rpc::dashcore::{ScriptBuf, TxOut}; // 1. A transaction that the server will see on the network. diff --git a/packages/rs-dapi/src/services/streaming_service/masternode_list_sync.rs b/packages/rs-dapi/src/services/streaming_service/masternode_list_sync.rs index b19efb57bad..351e4f9c905 100644 --- a/packages/rs-dapi/src/services/streaming_service/masternode_list_sync.rs +++ b/packages/rs-dapi/src/services/streaming_service/masternode_list_sync.rs @@ -2,7 +2,6 @@ use std::sync::Arc; use ciborium::ser::into_writer; use dashcore_rpc::dashcore::BlockHash; -use dashcore_rpc::dashcore::hashes::Hash as HashTrait; use tokio::sync::{Mutex, Notify, RwLock}; use tracing::{debug, trace}; diff --git a/packages/rs-dapi/src/services/streaming_service/mod.rs b/packages/rs-dapi/src/services/streaming_service/mod.rs index 7a9e4714503..3585a2f1a3d 100644 --- a/packages/rs-dapi/src/services/streaming_service/mod.rs +++ b/packages/rs-dapi/src/services/streaming_service/mod.rs @@ -13,7 +13,8 @@ use crate::DapiError; use crate::clients::{CoreClient, TenderdashClient}; use crate::config::Config; use crate::sync::Workers; -use dash_spv::Hash; +use dashcore::Block as CoreBlock; +use dashcore::consensus::encode::deserialize; use std::sync::Arc; use tokio::sync::broadcast::error::RecvError; use tokio::sync::{Semaphore, broadcast}; @@ -378,7 +379,6 @@ pub(crate) fn txid_hex_from_bytes(bytes: &[u8]) -> Option { pub(crate) fn txid_bytes_from_bytes(bytes: &[u8]) -> Option> { use dashcore_rpc::dashcore::Transaction as CoreTx; use dashcore_rpc::dashcore::consensus::encode::deserialize; - use dashcore_rpc::dashcore::hashes::Hash as DashHash; deserialize::(bytes) .ok() @@ -386,8 +386,6 @@ pub(crate) fn txid_bytes_from_bytes(bytes: &[u8]) -> Option> { } /// Decode block bytes and return the block hash in hex and as printable string. pub(crate) fn block_hash_from_block_bytes(bytes: &[u8]) -> Option<([u8; 32], String)> { - use dashcore_rpc::dashcore::Block as CoreBlock; - use dashcore_rpc::dashcore::consensus::encode::deserialize; deserialize::(bytes) .inspect_err( |error| tracing::debug!(%error, block=hex::encode(bytes), "cannot parse block data"), @@ -514,6 +512,7 @@ pub(crate) fn summarize_zmq_event(event: &ZmqEvent) -> String { #[cfg(test)] mod tests { use super::*; + use dashcore::hashes::hash_x11; #[test] fn core_block_hash_must_be_exact_width() { @@ -527,21 +526,18 @@ mod tests { } /// A block Core v24 mined (its coinbase is a version 4 CbTx) yields its - /// hash, so the live header stream delivers it. + /// X11 hash, so the live header stream delivers it. #[test] fn block_hash_from_block_bytes_reads_a_core_v24_block() { - use dashcore_rpc::dashcore::block::Header; - use dashcore_rpc::dashcore::consensus::encode::deserialize; - let bytes = hex::decode( include_str!("../../../tests/vectors/core_v24_devnet/block_15146.hex").trim(), ) .expect("vector is hex"); - let header: Header = deserialize(&bytes[..80]).expect("header"); + let x11 = hash_x11::Hash::hash(&bytes[..80]); let (hash, hash_string) = block_hash_from_block_bytes(&bytes).expect("a Core v24 block decodes"); - assert_eq!(hash, header.block_hash().to_byte_array()); - assert_eq!(hash_string, header.block_hash().to_string()); + assert_eq!(hash, x11.to_byte_array()); + assert_eq!(hash_string, x11.to_string()); } } diff --git a/packages/rs-dapi/src/services/streaming_service/subscriber_manager.rs b/packages/rs-dapi/src/services/streaming_service/subscriber_manager.rs index b06553aae7c..5b5813e8029 100644 --- a/packages/rs-dapi/src/services/streaming_service/subscriber_manager.rs +++ b/packages/rs-dapi/src/services/streaming_service/subscriber_manager.rs @@ -225,7 +225,6 @@ mod tests { use super::*; use dashcore_rpc::dashcore::bloom::BloomFlags; use dashcore_rpc::dashcore::consensus::encode::serialize; - use dashcore_rpc::dashcore::hashes::Hash; use dashcore_rpc::dashcore::{OutPoint, PubkeyHash, ScriptBuf, TxIn, TxOut}; use tokio::time::{Duration, timeout}; diff --git a/packages/rs-dapi/src/services/streaming_service/transaction_stream.rs b/packages/rs-dapi/src/services/streaming_service/transaction_stream.rs index e6e65ad5e52..0b05ab5dbf2 100644 --- a/packages/rs-dapi/src/services/streaming_service/transaction_stream.rs +++ b/packages/rs-dapi/src/services/streaming_service/transaction_stream.rs @@ -11,7 +11,7 @@ use dapi_grpc::core::v0::{ }; use dapi_grpc::tonic::{Request, Response, Status}; use dashcore_rpc::dashcore::consensus::Decodable as _; -use dashcore_rpc::dashcore::{Block, InstantLock, Transaction, hashes::Hash}; +use dashcore_rpc::dashcore::{Block, InstantLock, Transaction}; use futures::TryFutureExt; use tokio::sync::{Mutex as AsyncMutex, OwnedSemaphorePermit, mpsc, watch}; use tokio::task::JoinSet; diff --git a/packages/rs-dpp/src/address_funds/platform_address.rs b/packages/rs-dpp/src/address_funds/platform_address.rs index c10b68d04d4..248eb209588 100644 --- a/packages/rs-dpp/src/address_funds/platform_address.rs +++ b/packages/rs-dpp/src/address_funds/platform_address.rs @@ -11,7 +11,7 @@ use bech32::{Bech32m, Hrp}; use bincode::{Decode, DecodeUntrusted, Encode}; use dashcore::address::Payload; use dashcore::blockdata::script::ScriptBuf; -use dashcore::hashes::{sha256d, Hash}; +use dashcore::hashes::sha256d; use dashcore::{ sign_message, signer, Address, Network, PrivateKey, PubkeyHash, PublicKey, ScriptHash, }; @@ -785,7 +785,6 @@ impl FromStr for PlatformAddress { mod tests { use super::*; use dashcore::blockdata::opcodes::all::*; - use dashcore::hashes::Hash; use dashcore::PublicKey; use platform_value::BinaryData; use secp256k1::{PublicKey as RawPublicKey, SecretKey as RawSecretKey}; diff --git a/packages/rs-dpp/src/core_types/validator/mod.rs b/packages/rs-dpp/src/core_types/validator/mod.rs index 7215cddba58..5fb57ebc191 100644 --- a/packages/rs-dpp/src/core_types/validator/mod.rs +++ b/packages/rs-dpp/src/core_types/validator/mod.rs @@ -139,7 +139,6 @@ impl ValidatorV0Setters for Validator { mod json_convertible_tests { use super::*; use crate::core_types::validator::v0::ValidatorV0; - use dashcore::hashes::Hash; use dashcore::{ProTxHash, PubkeyHash}; use platform_value::platform_value; use serde_json::json; diff --git a/packages/rs-dpp/src/core_types/validator/v0/mod.rs b/packages/rs-dpp/src/core_types/validator/v0/mod.rs index eedbcb3dd1b..30b7eabf697 100644 --- a/packages/rs-dpp/src/core_types/validator/v0/mod.rs +++ b/packages/rs-dpp/src/core_types/validator/v0/mod.rs @@ -11,8 +11,6 @@ use bincode::enc::Encoder; use bincode::error::{DecodeError, EncodeError}; #[cfg(feature = "core-types-serialization")] use bincode::Encode; -#[cfg(feature = "core-types-serialization")] -use dashcore::hashes::Hash; /// A validator in the context of a quorum #[derive(Clone, Eq, PartialEq)] diff --git a/packages/rs-dpp/src/core_types/validator_set/mod.rs b/packages/rs-dpp/src/core_types/validator_set/mod.rs index 0b517f4ed00..11a402ddc96 100644 --- a/packages/rs-dpp/src/core_types/validator_set/mod.rs +++ b/packages/rs-dpp/src/core_types/validator_set/mod.rs @@ -151,7 +151,6 @@ mod json_convertible_tests { use crate::bls::SecretKey; use crate::core_types::validator::v0::ValidatorV0; use crate::core_types::validator_set::v0::ValidatorSetV0; - use dashcore::hashes::Hash; use dashcore::{ProTxHash, PubkeyHash, QuorumHash}; use platform_value::{platform_value, Value}; use rand::rngs::StdRng; diff --git a/packages/rs-dpp/src/core_types/validator_set/v0/mod.rs b/packages/rs-dpp/src/core_types/validator_set/v0/mod.rs index b988a0a1f43..bb547eb3620 100644 --- a/packages/rs-dpp/src/core_types/validator_set/v0/mod.rs +++ b/packages/rs-dpp/src/core_types/validator_set/v0/mod.rs @@ -8,8 +8,6 @@ use bincode::enc::Encoder; use bincode::error::EncodeError; #[cfg(feature = "core-types-serialization")] use bincode::{BorrowDecode, Decode, Encode}; -#[cfg(feature = "core-types-serialization")] -use dashcore::hashes::Hash; use dashcore::{ProTxHash, QuorumHash}; use itertools::Itertools; #[cfg(feature = "serde-conversion")] diff --git a/packages/rs-dpp/src/identity/identity_public_key/v0/methods/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/v0/methods/mod.rs index 9f30211a538..953a6157973 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/v0/methods/mod.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/v0/methods/mod.rs @@ -8,7 +8,6 @@ use crate::identity::KeyType; use crate::util::hash::ripemd160_sha256; use crate::ProtocolError; use anyhow::anyhow; -use dashcore::hashes::Hash; use dashcore::{Network, PublicKey as ECDSAPublicKey}; use platform_value::{BinaryData, Bytes20}; use secp256k1::SecretKey; diff --git a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/chain/chain_asset_lock_proof.rs b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/chain/chain_asset_lock_proof.rs index c369f8ec16a..74f7bdd7bbf 100644 --- a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/chain/chain_asset_lock_proof.rs +++ b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/chain/chain_asset_lock_proof.rs @@ -111,7 +111,6 @@ mod tests { ))] mod json_convertible_tests { use super::*; - use dashcore::hashes::Hash; use dashcore::{OutPoint, Txid}; use platform_value::platform_value; use serde_json::json; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/address_funds/address_funding_from_asset_lock_transition/signing_tests.rs b/packages/rs-dpp/src/state_transition/state_transitions/address_funds/address_funding_from_asset_lock_transition/signing_tests.rs index 79f46a87c03..94b90c44637 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/address_funds/address_funding_from_asset_lock_transition/signing_tests.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/address_funds/address_funding_from_asset_lock_transition/signing_tests.rs @@ -13,7 +13,6 @@ use std::collections::{BTreeMap, HashMap}; -use dashcore::hashes::Hash; use dashcore::{OutPoint, PublicKey}; use platform_value::BinaryData; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/address_funds/address_funds_transfer_transition/signing_tests.rs b/packages/rs-dpp/src/state_transition/state_transitions/address_funds/address_funds_transfer_transition/signing_tests.rs index 1a53894720f..680010c9051 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/address_funds/address_funds_transfer_transition/signing_tests.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/address_funds/address_funds_transfer_transition/signing_tests.rs @@ -12,7 +12,6 @@ use std::collections::{BTreeMap, HashMap}; use dashcore::blockdata::opcodes::all::*; use dashcore::blockdata::script::ScriptBuf; -use dashcore::hashes::Hash; use dashcore::PublicKey; use platform_value::BinaryData; use secp256k1::{PublicKey as RawPublicKey, SecretKey as RawSecretKey}; diff --git a/packages/rs-dpp/src/tests/utils/mod.rs b/packages/rs-dpp/src/tests/utils/mod.rs index 7fac28875fb..30661cd5785 100644 --- a/packages/rs-dpp/src/tests/utils/mod.rs +++ b/packages/rs-dpp/src/tests/utils/mod.rs @@ -1,6 +1,5 @@ use anyhow::Result; use dashcore::block::Version; -use dashcore::hashes::Hash; use dashcore::{Block, BlockHash, CompactTarget, Header, TxMerkleNode}; use platform_value::Value; #[cfg(test)] diff --git a/packages/rs-dpp/src/util/hash.rs b/packages/rs-dpp/src/util/hash.rs index 6f7e1235fcd..161ea8014aa 100644 --- a/packages/rs-dpp/src/util/hash.rs +++ b/packages/rs-dpp/src/util/hash.rs @@ -1,4 +1,4 @@ -use dashcore::hashes::{ripemd160, sha256, Hash}; +use dashcore::hashes::{ripemd160, sha256}; use sha2::{Digest, Sha256}; pub fn hash_double_to_vec(payload: impl AsRef<[u8]>) -> Vec { diff --git a/packages/rs-dpp/tests/ecdsa_compatibility.rs b/packages/rs-dpp/tests/ecdsa_compatibility.rs index 0c0234dc177..a5885ffe1ca 100644 --- a/packages/rs-dpp/tests/ecdsa_compatibility.rs +++ b/packages/rs-dpp/tests/ecdsa_compatibility.rs @@ -8,7 +8,7 @@ mod vectors; use dpp::address_funds::{AddressWitness, AddressWitnessVerificationOperations, PlatformAddress}; use dpp::consensus::codes::ErrorWithCode; use dpp::dashcore::crypto::ecdsa::EcdsaError; -use dpp::dashcore::hashes::{hash160, Hash}; +use dpp::dashcore::hashes::hash160; use dpp::dashcore::key::Error as KeyError; use dpp::dashcore::sign_message::MessageSignatureError; use dpp::dashcore::signer::{sign, verify_hash_signature}; diff --git a/packages/rs-dpp/tests/historical_hash_compatibility.rs b/packages/rs-dpp/tests/historical_hash_compatibility.rs index e983be0ab01..ff01abc9a1e 100644 --- a/packages/rs-dpp/tests/historical_hash_compatibility.rs +++ b/packages/rs-dpp/tests/historical_hash_compatibility.rs @@ -5,7 +5,6 @@ mod vectors; use dpp::dashcore::consensus::{deserialize, serialize}; use dpp::dashcore::ephemerealdata::chain_lock::ChainLock; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::sml::llmq_type::LLMQType; use dpp::dashcore::{InstantLock, QuorumHash, Transaction}; use dpp::identity::KeyType; diff --git a/packages/rs-dpp/tests/untrusted_decode.rs b/packages/rs-dpp/tests/untrusted_decode.rs index ed1ef5ff385..ce6df156406 100644 --- a/packages/rs-dpp/tests/untrusted_decode.rs +++ b/packages/rs-dpp/tests/untrusted_decode.rs @@ -111,7 +111,6 @@ fn should_preserve_asset_lock_serde_wire_format_and_reject_missing_payloads() { #[test] fn should_preserve_foreign_txid_serde_encoding_in_consensus_errors() { use dpp::consensus::basic::identity::IdentityAssetLockProofLockedTransactionMismatchError; - use dpp::dashcore::hashes::Hash; use dpp::dashcore::Txid; let value = IdentityAssetLockProofLockedTransactionMismatchError::new( diff --git a/packages/rs-drive-abci/src/abci/handler/prepare_proposal.rs b/packages/rs-drive-abci/src/abci/handler/prepare_proposal.rs index 269abc53a7d..bd439c22abb 100644 --- a/packages/rs-drive-abci/src/abci/handler/prepare_proposal.rs +++ b/packages/rs-drive-abci/src/abci/handler/prepare_proposal.rs @@ -10,7 +10,6 @@ use crate::platform_types::block_proposal::v0::BlockProposal; use crate::platform_types::platform_state::PlatformStateV0Methods; use crate::platform_types::state_transitions_processing_result::StateTransitionExecutionResult; use crate::rpc::core::CoreRPCLike; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::Network; use dpp::version::TryIntoPlatformVersioned; use tenderdash_abci::proto::abci as proto; diff --git a/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v0/mod.rs index 609f63a56c8..73760f4ea31 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v0/mod.rs @@ -12,7 +12,6 @@ use crate::rpc::core::CoreRPCLike; use itertools::Itertools; use crate::platform_types::validator_set::ValidatorSetExt; -use dpp::dashcore::hashes::Hash; use tenderdash_abci::proto::abci::ValidatorSetUpdate; impl Platform diff --git a/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v1/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v1/mod.rs index 402051ce424..41cbd46de4c 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v1/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v1/mod.rs @@ -12,7 +12,6 @@ use crate::rpc::core::CoreRPCLike; use itertools::Itertools; use crate::platform_types::validator_set::ValidatorSetExt; -use dpp::dashcore::hashes::Hash; use tenderdash_abci::proto::abci::ValidatorSetUpdate; impl Platform diff --git a/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v2/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v2/mod.rs index e06ac4744ac..de238c10b0f 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v2/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v2/mod.rs @@ -12,7 +12,6 @@ use crate::rpc::core::CoreRPCLike; use itertools::Itertools; use crate::platform_types::validator_set::ValidatorSetExt; -use dpp::dashcore::hashes::Hash; use tenderdash_abci::proto::abci::ValidatorSetUpdate; impl Platform diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/create_owner_identity/v2/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/create_owner_identity/v2/mod.rs index aea2c9ec61f..1ef80b67e04 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/create_owner_identity/v2/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/create_owner_identity/v2/mod.rs @@ -1,7 +1,6 @@ use crate::error::Error; use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::{PubkeyHash, ScriptBuf}; use dpp::dashcore_rpc::dashcore_rpc_json::{DMNState, MasternodeListItem}; use dpp::identity::accessors::IdentityGettersV0; diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/create_voter_identity/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/create_voter_identity/v0/mod.rs index 0d667868338..4aa3ce78081 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/create_voter_identity/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/create_voter_identity/v0/mod.rs @@ -1,7 +1,6 @@ use crate::error::Error; use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; -use dpp::dashcore::hashes::Hash; use dpp::dashcore_rpc::dashcore_rpc_json::MasternodeListItem; use dpp::identifier::MasternodeIdentifiers; use dpp::identity::accessors::IdentityGettersV0; diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_masternode_identities/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_masternode_identities/v0/mod.rs index a4182e82e64..73b02be8b9c 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_masternode_identities/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_masternode_identities/v0/mod.rs @@ -16,7 +16,6 @@ use drive::util::batch::IdentityOperationType::AddNewIdentity; use crate::platform_types::platform_state::PlatformStateV0Methods; -use dpp::dashcore::hashes::Hash; use drive::grovedb::Transaction; use std::collections::BTreeMap; use tracing::Level; diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_masternode_identities/v1/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_masternode_identities/v1/mod.rs index 3b02bd1ec5c..981eb9adefa 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_masternode_identities/v1/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_masternode_identities/v1/mod.rs @@ -24,7 +24,6 @@ use drive::util::batch::IdentityOperationType::{ use crate::platform_types::platform_state::PlatformStateV0Methods; -use dpp::dashcore::hashes::Hash; use drive::grovedb::Transaction; use std::collections::BTreeMap; use tracing::Level; diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_operator_identity/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_operator_identity/v0/mod.rs index 9ac778d96d6..c34970dff1f 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_operator_identity/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_operator_identity/v0/mod.rs @@ -7,7 +7,6 @@ use crate::rpc::core::CoreRPCLike; use dpp::dashcore::ProTxHash; -use dpp::dashcore::hashes::Hash; use dpp::identifier::{Identifier, MasternodeIdentifiers}; use dpp::identity::accessors::IdentityGettersV0; diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_voter_identity/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_voter_identity/v0/mod.rs index 4fb72947486..bba7853cf37 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_voter_identity/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_voter_identity/v0/mod.rs @@ -5,7 +5,6 @@ use crate::platform_types::platform::Platform; use crate::platform_types::platform_state::PlatformState; use crate::platform_types::platform_state::PlatformStateV0Methods; use crate::rpc::core::CoreRPCLike; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::ProTxHash; use dpp::block::block_info::BlockInfo; diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_voter_identity/v1/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_voter_identity/v1/mod.rs index 78ccdeda3ab..02a476ae9f9 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_voter_identity/v1/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_voter_identity/v1/mod.rs @@ -5,7 +5,6 @@ use crate::platform_types::platform::Platform; use crate::platform_types::platform_state::PlatformState; use crate::platform_types::platform_state::PlatformStateV0Methods; use crate::rpc::core::CoreRPCLike; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::ProTxHash; use dpp::block::block_info::BlockInfo; diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/v0/mod.rs index aeebb38a229..2e571547147 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/v0/mod.rs @@ -1,5 +1,5 @@ use dpp::bls::PublicKey as BlsPublicKey; -use dpp::dashcore::hashes::{sha256d, Hash, HashEngine}; +use dpp::dashcore::hashes::{sha256d, HashEngine}; use dpp::dashcore::QuorumHash; use dpp::dashcore_rpc::dashcore_rpc_json::QuorumType; use std::collections::BTreeMap; diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/v0/mod.rs index 3163017992d..642d365a3cb 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/v0/mod.rs @@ -1,6 +1,6 @@ use dpp::bls::Signature; -use dpp::dashcore::hashes::{sha256d, Hash, HashEngine}; +use dpp::dashcore::hashes::{sha256d, HashEngine}; use dpp::dashcore::{ChainLock, QuorumSigningRequestId}; use crate::error::Error; @@ -92,13 +92,13 @@ where // From DIP 8: https://github.com/dashpay/dips/blob/master/dip-0008.md#finalization-of-signed-blocks // The request id is SHA256("clsig", blockHeight) and the message hash is the block hash of the previously successful attempt. - let mut engine = QuorumSigningRequestId::engine(); + let mut engine = sha256d::Hash::engine(); engine.input(&[CHAIN_LOCK_REQUEST_ID_PREFIX.len() as u8]); engine.input(CHAIN_LOCK_REQUEST_ID_PREFIX.as_bytes()); engine.input(chain_lock.block_height.to_le_bytes().as_slice()); - let request_id = QuorumSigningRequestId::from_engine(engine); + let request_id = QuorumSigningRequestId::from_raw_hash(sha256d::Hash::from_engine(engine)); tracing::trace!( ?chain_lock, @@ -246,13 +246,13 @@ mod tests { ); assert_eq!(hex::encode(122u32.to_le_bytes()), "7a000000"); - let mut engine = QuorumSigningRequestId::engine(); + let mut engine = sha256d::Hash::engine(); engine.input(&[CHAIN_LOCK_REQUEST_ID_PREFIX.len() as u8]); engine.input(CHAIN_LOCK_REQUEST_ID_PREFIX.as_bytes()); engine.input(122u32.to_le_bytes().as_slice()); - let request_id = QuorumSigningRequestId::from_engine(engine); + let request_id = QuorumSigningRequestId::from_raw_hash(sha256d::Hash::from_engine(engine)); assert_eq!( hex::encode(request_id.as_byte_array()), @@ -265,13 +265,13 @@ mod tests { #[test] fn verify_message_digest() { - let mut engine = QuorumSigningRequestId::engine(); + let mut engine = sha256d::Hash::engine(); engine.input(&[CHAIN_LOCK_REQUEST_ID_PREFIX.len() as u8]); engine.input(CHAIN_LOCK_REQUEST_ID_PREFIX.as_bytes()); engine.input(956087u32.to_le_bytes().as_slice()); - let request_id = QuorumSigningRequestId::from_engine(engine); + let request_id = QuorumSigningRequestId::from_raw_hash(sha256d::Hash::from_engine(engine)); assert_eq!( hex::encode(request_id.as_byte_array()), diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/v1/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/v1/mod.rs index 52d503ad170..5e5b176bea4 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/v1/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/v1/mod.rs @@ -1,6 +1,6 @@ use dpp::bls::Signature; -use dpp::dashcore::hashes::{sha256d, Hash, HashEngine}; +use dpp::dashcore::hashes::{sha256d, HashEngine}; use dpp::dashcore::{ChainLock, QuorumSigningRequestId}; use dpp::dashcore_rpc::json::QuorumType; @@ -117,13 +117,13 @@ where // From DIP 8: https://github.com/dashpay/dips/blob/master/dip-0008.md#finalization-of-signed-blocks // The request id is SHA256("clsig", blockHeight) and the message hash is the block hash of the previously successful attempt. - let mut engine = QuorumSigningRequestId::engine(); + let mut engine = sha256d::Hash::engine(); engine.input(&[CHAIN_LOCK_REQUEST_ID_PREFIX.len() as u8]); engine.input(CHAIN_LOCK_REQUEST_ID_PREFIX.as_bytes()); engine.input(chain_lock.block_height.to_le_bytes().as_slice()); - let request_id = QuorumSigningRequestId::from_engine(engine); + let request_id = QuorumSigningRequestId::from_raw_hash(sha256d::Hash::from_engine(engine)); tracing::trace!( ?chain_lock, diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_instant_send_lock/verify_recent_signature_locally/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_instant_send_lock/verify_recent_signature_locally/v0/mod.rs index dcf4160a1f0..a45023ea29a 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_instant_send_lock/verify_recent_signature_locally/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_instant_send_lock/verify_recent_signature_locally/v0/mod.rs @@ -1,7 +1,7 @@ use dpp::bls::Signature; use std::fmt::{Debug, Formatter}; -use dpp::dashcore::hashes::{sha256d, Hash, HashEngine}; +use dpp::dashcore::hashes::{sha256d, HashEngine}; use dpp::dashcore::InstantLock; use crate::error::execution::ExecutionError; diff --git a/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/v0/mod.rs index f211141e529..d9df3275bc0 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/v0/mod.rs @@ -4,7 +4,6 @@ use crate::platform_types::platform::Platform; use crate::platform_types::platform_state::PlatformState; use crate::platform_types::platform_state::PlatformStateV0Methods; use dpp::block::block_info::BlockInfo; -use dpp::dashcore::hashes::Hash; use dpp::data_contracts::SystemDataContract; use dpp::fee::Credits; use dpp::platform_value::Identifier; diff --git a/packages/rs-drive-abci/src/execution/platform_events/voting/keep_record_of_vote_poll/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/voting/keep_record_of_vote_poll/v0/mod.rs index 8fbac49de37..72191d2a58d 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/voting/keep_record_of_vote_poll/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/voting/keep_record_of_vote_poll/v0/mod.rs @@ -4,7 +4,6 @@ use crate::platform_types::platform_state::PlatformState; use crate::platform_types::platform_state::PlatformStateV0Methods; use crate::rpc::core::CoreRPCLike; use dpp::block::block_info::BlockInfo; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::ProTxHash; use dpp::dashcore_rpc::dashcore_rpc_json::MasternodeType; use dpp::identifier::Identifier; diff --git a/packages/rs-drive-abci/src/execution/platform_events/voting/remove_votes_for_removed_masternodes/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/voting/remove_votes_for_removed_masternodes/v0/mod.rs index be42633ee75..50f12959fe7 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/voting/remove_votes_for_removed_masternodes/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/voting/remove_votes_for_removed_masternodes/v0/mod.rs @@ -4,7 +4,6 @@ use crate::platform_types::platform_state::PlatformState; use crate::platform_types::platform_state::PlatformStateV0Methods; use crate::rpc::core::CoreRPCLike; use dpp::block::block_info::BlockInfo; -use dpp::dashcore::hashes::Hash; use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/platform_events/withdrawals/dequeue_and_build_unsigned_withdrawal_transactions/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/withdrawals/dequeue_and_build_unsigned_withdrawal_transactions/v0/mod.rs index 3d977cfae89..4bd41e9690f 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/withdrawals/dequeue_and_build_unsigned_withdrawal_transactions/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/withdrawals/dequeue_and_build_unsigned_withdrawal_transactions/v0/mod.rs @@ -3,7 +3,7 @@ use dpp::dashcore::transaction::special_transaction::asset_unlock::qualified_ass use dpp::dashcore::Transaction; use dpp::dashcore::{ blockdata::transaction::special_transaction::asset_unlock::request_info::AssetUnlockRequestInfo, - hashes::Hash, QuorumHash, + QuorumHash, }; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::document::document_methods::DocumentMethodsV0; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/transaction/fetch_asset_lock_transaction_output_sync/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/transaction/fetch_asset_lock_transaction_output_sync/v0/mod.rs index ae16085efc9..e77d4f5f13e 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/transaction/fetch_asset_lock_transaction_output_sync/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/transaction/fetch_asset_lock_transaction_output_sync/v0/mod.rs @@ -5,7 +5,6 @@ use dpp::consensus::basic::identity::{ IdentityAssetLockTransactionIsNotFoundError, IdentityAssetLockTransactionOutputNotFoundError, InvalidAssetLockProofTransactionHeightError, }; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::TxOut; use dpp::identity::state_transition::asset_lock_proof::validate_asset_lock_transaction_structure::validate_asset_lock_transaction_structure; use dpp::prelude::{AssetLockProof, ConsensusValidationResult}; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/address_funding_from_asset_lock/transform_into_action/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/address_funding_from_asset_lock/transform_into_action/v0/mod.rs index 6d580bbeb76..d1c45b073c3 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/address_funding_from_asset_lock/transform_into_action/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/address_funding_from_asset_lock/transform_into_action/v0/mod.rs @@ -6,7 +6,6 @@ use dpp::balances::credits::CREDITS_PER_DUFF; use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutPointNotEnoughBalanceError; use dpp::consensus::signature::{BasicECDSAError, SignatureError}; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::signer; use dpp::dashcore::{ScriptBuf, Txid}; use dpp::identity::state_transition::AssetLockProved; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/state/v0/mod.rs index b6292f538cb..b688f19d77f 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/state/v0/mod.rs @@ -7,7 +7,6 @@ use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutPointNotEnou use dpp::consensus::signature::{BasicECDSAError, SignatureError}; use dpp::consensus::state::identity::IdentityAlreadyExistsError; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::signer; use dpp::dashcore::{ScriptBuf, Txid}; use dpp::identity::KeyType; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/transform_into_action/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/transform_into_action/v0/mod.rs index 95f9ed1ecc7..174391c0975 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/transform_into_action/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/transform_into_action/v0/mod.rs @@ -6,7 +6,6 @@ use dpp::balances::credits::CREDITS_PER_DUFF; use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutPointNotEnoughBalanceError; use dpp::consensus::signature::{BasicECDSAError, SignatureError}; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::signer; use dpp::dashcore::{ScriptBuf, Txid}; use dpp::identity::state_transition::AssetLockProved; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/transform_into_action/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/transform_into_action/v0/mod.rs index 81c4878e860..b878b3712ff 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/transform_into_action/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/transform_into_action/v0/mod.rs @@ -6,7 +6,6 @@ use dpp::consensus::state::voting::masternode_not_found_error::MasternodeNotFoun use dpp::consensus::state::voting::masternode_vote_already_present_error::MasternodeVoteAlreadyPresentError; use dpp::consensus::state::voting::masternode_voted_too_many_times::MasternodeVotedTooManyTimesError; use dpp::consensus::ConsensusError; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::ProTxHash; use dpp::dashcore_rpc::dashcore_rpc_json::{MasternodeListItem, MasternodeType}; use dpp::identifier::Identifier; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/shield_from_asset_lock/transform_into_action/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/shield_from_asset_lock/transform_into_action/v0/mod.rs index ee5e5b80f18..da2000c1609 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/shield_from_asset_lock/transform_into_action/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/shield_from_asset_lock/transform_into_action/v0/mod.rs @@ -21,7 +21,6 @@ use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutPointNotEnou use dpp::consensus::basic::state_transition::ShieldedImplicitFeeCapExceededError; use dpp::consensus::signature::{BasicECDSAError, SignatureError}; use dpp::consensus::state::state_error::StateError; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::signer; use dpp::dashcore::{ ScriptBuf, Txid}; use dpp::fee::Credits; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/shield_from_asset_lock/transform_into_action/v1/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/shield_from_asset_lock/transform_into_action/v1/mod.rs index 2cb0a3d15ba..620dc964b83 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/shield_from_asset_lock/transform_into_action/v1/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/shield_from_asset_lock/transform_into_action/v1/mod.rs @@ -22,7 +22,6 @@ use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutPointNotEnou use dpp::consensus::basic::state_transition::ShieldedImplicitFeeCapExceededError; use dpp::consensus::signature::{BasicECDSAError, SignatureError}; use dpp::consensus::state::state_error::StateError; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::signer; use dpp::dashcore::{ ScriptBuf, Txid}; use dpp::fee::Credits; diff --git a/packages/rs-drive-abci/src/mimic/mod.rs b/packages/rs-drive-abci/src/mimic/mod.rs index b814088a0c7..36095770830 100644 --- a/packages/rs-drive-abci/src/mimic/mod.rs +++ b/packages/rs-drive-abci/src/mimic/mod.rs @@ -15,7 +15,6 @@ use ciborium::Value as CborValue; use dpp::block::block_info::BlockInfo; use dpp::consensus::ConsensusError; -use dpp::dashcore::hashes::Hash; use dpp::platform_value::btreemap_extensions::BTreeValueMapHelper; use dpp::platform_value::string_encoding::{decode, Encoding}; use dpp::platform_value::Value; diff --git a/packages/rs-drive-abci/src/mimic/test_quorum.rs b/packages/rs-drive-abci/src/mimic/test_quorum.rs index 1adebbf840f..9625c6f1645 100644 --- a/packages/rs-drive-abci/src/mimic/test_quorum.rs +++ b/packages/rs-drive-abci/src/mimic/test_quorum.rs @@ -1,7 +1,6 @@ use crate::platform_types::validator::v0::ValidatorV0; use crate::platform_types::validator_set::v0::ValidatorSetV0; use dpp::bls::{PublicKey as BlsPublicKey, PublicKey, SecretKey as BlsPrivateKey, SecretKey}; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::{ProTxHash, PubkeyHash, QuorumHash}; use dpp::dashcore_rpc::dashcore_rpc_json::{QuorumInfoResult, QuorumMember, QuorumType}; use rand::rngs::StdRng; diff --git a/packages/rs-drive-abci/src/platform_types/block_proposal/v0.rs b/packages/rs-drive-abci/src/platform_types/block_proposal/v0.rs index b92bfdc0231..87db0ba0993 100644 --- a/packages/rs-drive-abci/src/platform_types/block_proposal/v0.rs +++ b/packages/rs-drive-abci/src/platform_types/block_proposal/v0.rs @@ -1,7 +1,6 @@ use crate::abci::AbciError; use crate::error::Error; use dpp::dashcore::bls_sig_utils::BLSSignature; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::{BlockHash, ChainLock}; use dpp::platform_value::Bytes32; use std::fmt; diff --git a/packages/rs-drive-abci/src/platform_types/platform_state/mod.rs b/packages/rs-drive-abci/src/platform_types/platform_state/mod.rs index ec35566ab0c..fc65a3b472b 100644 --- a/packages/rs-drive-abci/src/platform_types/platform_state/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/platform_state/mod.rs @@ -29,7 +29,6 @@ use crate::platform_types::platform_state::platform_state_for_saving::v2::Platfo use crate::platform_types::platform_state::platform_state_for_saving::PlatformStateForSaving; use crate::platform_types::signature_verification_quorum_set::SignatureVerificationQuorumSet; use dpp::block::block_info::BlockInfo; -use dpp::dashcore::hashes::Hash; use dpp::dashcore_rpc::json::MasternodeListItem; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use dpp::platform_serialization::PLATFORM_BINCODE_CONFIG; diff --git a/packages/rs-drive-abci/src/platform_types/platform_state/platform_state_for_saving/v0/mod.rs b/packages/rs-drive-abci/src/platform_types/platform_state/platform_state_for_saving/v0/mod.rs index 6db1974da24..5fa538d3b1d 100644 --- a/packages/rs-drive-abci/src/platform_types/platform_state/platform_state_for_saving/v0/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/platform_state/platform_state_for_saving/v0/mod.rs @@ -5,7 +5,6 @@ use crate::platform_types::signature_verification_quorum_set::SignatureVerificat use bincode::Encode; use dpp::block::block_info::BlockInfo; use dpp::block::extended_block_info::ExtendedBlockInfo; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::{ProTxHash, QuorumHash}; use dpp::fee::default_costs::CachedEpochIndexFeeVersionsFieldsBeforeVersion4; use dpp::platform_serialization::de::Decode; diff --git a/packages/rs-drive-abci/src/platform_types/platform_state/platform_state_for_saving/v1/mod.rs b/packages/rs-drive-abci/src/platform_types/platform_state/platform_state_for_saving/v1/mod.rs index b91987dbe1e..a5fde122ef9 100644 --- a/packages/rs-drive-abci/src/platform_types/platform_state/platform_state_for_saving/v1/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/platform_state/platform_state_for_saving/v1/mod.rs @@ -8,7 +8,6 @@ use bincode::Encode; use dpp::block::block_info::BlockInfo; use dpp::block::extended_block_info::ExtendedBlockInfo; use dpp::core_types::validator_set::ValidatorSet; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::{ProTxHash, QuorumHash}; use dpp::fee::default_costs::EpochIndexFeeVersionsForStorage; use dpp::platform_serialization::de::Decode; diff --git a/packages/rs-drive-abci/src/platform_types/platform_state/recent.rs b/packages/rs-drive-abci/src/platform_types/platform_state/recent.rs index aff8c866a71..3d4a09632f5 100644 --- a/packages/rs-drive-abci/src/platform_types/platform_state/recent.rs +++ b/packages/rs-drive-abci/src/platform_types/platform_state/recent.rs @@ -17,7 +17,6 @@ use crate::platform_types::platform_state::PlatformState; use bincode::{Decode, Encode}; use dpp::block::extended_block_info::v0::ExtendedBlockInfoV0Getters; use dpp::block::extended_block_info::ExtendedBlockInfo; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::QuorumHash; use dpp::platform_serialization::PLATFORM_BINCODE_CONFIG; use dpp::platform_value::Bytes32; diff --git a/packages/rs-drive-abci/src/platform_types/signature_verification_quorum_set/v0/for_saving_v0.rs b/packages/rs-drive-abci/src/platform_types/signature_verification_quorum_set/v0/for_saving_v0.rs index 21c0c0e0e7b..8a0e14de0ac 100644 --- a/packages/rs-drive-abci/src/platform_types/signature_verification_quorum_set/v0/for_saving_v0.rs +++ b/packages/rs-drive-abci/src/platform_types/signature_verification_quorum_set/v0/for_saving_v0.rs @@ -5,7 +5,6 @@ use crate::platform_types::signature_verification_quorum_set::{ VerificationQuorum, }; use bincode::{Decode, Encode}; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::QuorumHash; use dpp::platform_value::Bytes32; diff --git a/packages/rs-drive-abci/src/platform_types/signature_verification_quorum_set/v0/for_saving_v1.rs b/packages/rs-drive-abci/src/platform_types/signature_verification_quorum_set/v0/for_saving_v1.rs index 7561f7eeae2..1978067e2d5 100644 --- a/packages/rs-drive-abci/src/platform_types/signature_verification_quorum_set/v0/for_saving_v1.rs +++ b/packages/rs-drive-abci/src/platform_types/signature_verification_quorum_set/v0/for_saving_v1.rs @@ -9,7 +9,6 @@ use crate::platform_types::signature_verification_quorum_set::{ }; use bincode::{Decode, Encode}; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::QuorumHash; use dpp::platform_value::Bytes32; diff --git a/packages/rs-drive-abci/src/platform_types/signature_verification_quorum_set/v0/quorums.rs b/packages/rs-drive-abci/src/platform_types/signature_verification_quorum_set/v0/quorums.rs index f8c2dc6caff..d421d534f75 100644 --- a/packages/rs-drive-abci/src/platform_types/signature_verification_quorum_set/v0/quorums.rs +++ b/packages/rs-drive-abci/src/platform_types/signature_verification_quorum_set/v0/quorums.rs @@ -10,7 +10,7 @@ use std::fmt::Debug; use crate::error::Error; use crate::platform_types::signature_verification_quorum_set::QuorumConfig; -use dpp::dashcore::hashes::{sha256d, Hash, HashEngine}; +use dpp::dashcore::hashes::{sha256d, HashEngine}; /// Quorum per hash #[derive(Clone, Deref, DerefMut, From)] diff --git a/packages/rs-drive-abci/src/platform_types/validator/v0/mod.rs b/packages/rs-drive-abci/src/platform_types/validator/v0/mod.rs index 810bb7013cb..99532198e72 100644 --- a/packages/rs-drive-abci/src/platform_types/validator/v0/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/validator/v0/mod.rs @@ -2,7 +2,6 @@ use crate::platform_types::platform_state::PlatformState; use crate::platform_types::platform_state::PlatformStateV0Methods; use dpp::bls::PublicKey as BlsPublicKey; pub use dpp::core_types::validator::v0::*; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::{ProTxHash, PubkeyHash}; use dpp::dashcore_rpc::json::{DMNState, MasternodeListItem}; pub(crate) trait NewValidatorIfMasternodeInState { diff --git a/packages/rs-drive-abci/src/platform_types/validator_set/v0/mod.rs b/packages/rs-drive-abci/src/platform_types/validator_set/v0/mod.rs index 60fe3d57a3c..a0164e936e4 100644 --- a/packages/rs-drive-abci/src/platform_types/validator_set/v0/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/validator_set/v0/mod.rs @@ -1,7 +1,6 @@ use crate::error::execution::ExecutionError; use crate::error::Error; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::{ProTxHash, PubkeyHash}; use crate::platform_types::platform_state::PlatformState; diff --git a/packages/rs-drive-abci/src/platform_types/withdrawal/unsigned_withdrawal_txs/v0/mod.rs b/packages/rs-drive-abci/src/platform_types/withdrawal/unsigned_withdrawal_txs/v0/mod.rs index f25a47d2ce3..9f76c50ac08 100644 --- a/packages/rs-drive-abci/src/platform_types/withdrawal/unsigned_withdrawal_txs/v0/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/withdrawal/unsigned_withdrawal_txs/v0/mod.rs @@ -1,7 +1,7 @@ //! Withdrawal transactions definitions and processing use dpp::dashcore::consensus::{serialize, Encodable}; -use dpp::dashcore::hashes::{sha256d, Hash}; +use dpp::dashcore::hashes::sha256d; use dpp::dashcore::transaction::special_transaction::TransactionPayload::AssetUnlockPayloadType; use dpp::dashcore::{Transaction, VarInt}; use std::collections::{BTreeMap, HashMap}; diff --git a/packages/rs-drive-abci/src/query/system/current_quorums_info/v0/mod.rs b/packages/rs-drive-abci/src/query/system/current_quorums_info/v0/mod.rs index b5c684c80f1..5e1c6a43e84 100644 --- a/packages/rs-drive-abci/src/query/system/current_quorums_info/v0/mod.rs +++ b/packages/rs-drive-abci/src/query/system/current_quorums_info/v0/mod.rs @@ -9,7 +9,6 @@ use dapi_grpc::platform::v0::get_current_quorums_info_request::GetCurrentQuorums use dapi_grpc::platform::v0::get_current_quorums_info_response::{ GetCurrentQuorumsInfoResponseV0, ValidatorSetV0, ValidatorV0, }; -use dpp::dashcore::hashes::Hash; impl Platform { pub(super) fn query_current_quorums_info_v0( diff --git a/packages/rs-drive-abci/src/test/helpers/chain_lock_quorums.rs b/packages/rs-drive-abci/src/test/helpers/chain_lock_quorums.rs index 5e1123ef66c..ffb39dbe3cd 100644 --- a/packages/rs-drive-abci/src/test/helpers/chain_lock_quorums.rs +++ b/packages/rs-drive-abci/src/test/helpers/chain_lock_quorums.rs @@ -68,11 +68,11 @@ pub fn quorums(members: &[&TestQuorum]) -> Quorums { /// The DIP8 request id of a chain lock at `height` pub fn chain_lock_request_id(height: u32) -> QuorumSigningRequestId { - let mut engine = QuorumSigningRequestId::engine(); + let mut engine = sha256d::Hash::engine(); engine.input(&[5u8]); engine.input(b"clsig"); engine.input(height.to_le_bytes().as_slice()); - QuorumSigningRequestId::from_engine(engine) + QuorumSigningRequestId::from_raw_hash(sha256d::Hash::from_engine(engine)) } /// The member of `active_at_signing_height` that Dash Core signs a llmq_test chain lock at diff --git a/packages/rs-drive-abci/src/test/helpers/withdrawals.rs b/packages/rs-drive-abci/src/test/helpers/withdrawals.rs index bc8d9c3d4f1..785cfb81143 100644 --- a/packages/rs-drive-abci/src/test/helpers/withdrawals.rs +++ b/packages/rs-drive-abci/src/test/helpers/withdrawals.rs @@ -1,7 +1,6 @@ use crate::platform_types::withdrawal::unsigned_withdrawal_txs::v0::UnsignedWithdrawalTxs; use dpp::dashcore::blockdata::transaction::special_transaction::asset_unlock::request_info::AssetUnlockRequestInfo; use dpp::dashcore::consensus::Encodable; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::transaction::special_transaction::asset_unlock::qualified_asset_unlock::build_asset_unlock_tx; use dpp::dashcore::transaction::special_transaction::asset_unlock::unqualified_asset_unlock::{ AssetUnlockBasePayload, AssetUnlockBaseTransactionInfo, diff --git a/packages/rs-drive-abci/tests/strategy_tests/execution.rs b/packages/rs-drive-abci/tests/strategy_tests/execution.rs index 8d6c12b2ab3..e59234f9aed 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/execution.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/execution.rs @@ -697,7 +697,7 @@ pub(crate) async fn run_chain_for_strategy<'a>( // From DIP 8: https://github.com/dashpay/dips/blob/master/dip-0008.md#finalization-of-signed-blocks // The request id is SHA256("clsig", blockHeight) and the message hash is the block hash of the previously successful attempt. - let mut engine = QuorumSigningRequestId::engine(); + let mut engine = sha256d::Hash::engine(); // Prefix let prefix_len = VarInt("clsig".len() as u64); @@ -708,7 +708,8 @@ pub(crate) async fn run_chain_for_strategy<'a>( engine.input("clsig".as_bytes()); engine.input(block_height.to_le_bytes().as_slice()); - let request_id = QuorumSigningRequestId::from_engine(engine); + let request_id = + QuorumSigningRequestId::from_raw_hash(sha256d::Hash::from_engine(engine)); // Based on the deterministic masternode list at the given height, a quorum must be selected that was active at the time this block was mined diff --git a/packages/rs-drive-proof-verifier/src/proof.rs b/packages/rs-drive-proof-verifier/src/proof.rs index 6b69adafd91..3ea3056817f 100644 --- a/packages/rs-drive-proof-verifier/src/proof.rs +++ b/packages/rs-drive-proof-verifier/src/proof.rs @@ -84,7 +84,6 @@ use dpp::block::epoch::EpochIndex; use dpp::block::extended_epoch_info::ExtendedEpochInfo; use dpp::core_subsidy::NetworkCoreSubsidy; use dpp::data_contract::accessors::v0::DataContractV0Getters; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::{Network, ProTxHash}; use dpp::document::{Document, DocumentV0Getters}; use dpp::fee::Credits; diff --git a/packages/rs-drive-proof-verifier/src/types.rs b/packages/rs-drive-proof-verifier/src/types.rs index cd3ea1f8f70..7593f209222 100644 --- a/packages/rs-drive-proof-verifier/src/types.rs +++ b/packages/rs-drive-proof-verifier/src/types.rs @@ -69,7 +69,6 @@ use drive::grovedb::Element; pub use indexmap::IndexMap; use std::collections::{BTreeMap, BTreeSet}; -use dpp::dashcore::hashes::Hash; #[cfg(feature = "mocks")] use { bincode::{Decode, Encode}, diff --git a/packages/rs-drive-proof-verifier/src/unproved.rs b/packages/rs-drive-proof-verifier/src/unproved.rs index 2380bed82c5..328634f8fbb 100644 --- a/packages/rs-drive-proof-verifier/src/unproved.rs +++ b/packages/rs-drive-proof-verifier/src/unproved.rs @@ -34,7 +34,6 @@ use dpp::bls::PublicKey as BlsPublicKey; use dpp::core_types::validator::v0::ValidatorV0; use dpp::core_types::validator_set::v0::ValidatorSetV0; use dpp::core_types::validator_set::ValidatorSet; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::{Network, ProTxHash, PubkeyHash, QuorumHash}; use dpp::data_contract::DataContract; use dpp::identifier::Identifier; diff --git a/packages/rs-platform-wallet-ffi/src/asset_lock/built_callback.rs b/packages/rs-platform-wallet-ffi/src/asset_lock/built_callback.rs index eebb444b877..07414555005 100644 --- a/packages/rs-platform-wallet-ffi/src/asset_lock/built_callback.rs +++ b/packages/rs-platform-wallet-ffi/src/asset_lock/built_callback.rs @@ -83,7 +83,6 @@ where #[cfg(test)] mod tests { use super::*; - use dashcore::hashes::Hash; use dashcore::Txid; use std::sync::Mutex; diff --git a/packages/rs-platform-wallet-ffi/src/asset_lock/sync.rs b/packages/rs-platform-wallet-ffi/src/asset_lock/sync.rs index 770ba233b63..2f47f639170 100644 --- a/packages/rs-platform-wallet-ffi/src/asset_lock/sync.rs +++ b/packages/rs-platform-wallet-ffi/src/asset_lock/sync.rs @@ -139,7 +139,6 @@ fn forwarded(timeout: Option) -> Option { /// with a fallible return. Don't relax the signature without /// hardening the body. fn parse_outpoint(txid: *const [u8; 32], vout: u32) -> dashcore::OutPoint { - use dashcore::hashes::Hash; let txid_bytes = unsafe { *txid }; dashcore::OutPoint { txid: dashcore::Txid::from_slice(&txid_bytes).expect("txid is 32 bytes"), diff --git a/packages/rs-platform-wallet-ffi/src/core_wallet/broadcast.rs b/packages/rs-platform-wallet-ffi/src/core_wallet/broadcast.rs index edd24759bbc..96b746d6e04 100644 --- a/packages/rs-platform-wallet-ffi/src/core_wallet/broadcast.rs +++ b/packages/rs-platform-wallet-ffi/src/core_wallet/broadcast.rs @@ -218,7 +218,6 @@ pub unsafe extern "C" fn core_wallet_signed_transaction_bytes( #[cfg(test)] mod outcome_tests { - use dashcore::hashes::Hash; use super::*; diff --git a/packages/rs-platform-wallet-ffi/src/core_wallet/transaction_builder.rs b/packages/rs-platform-wallet-ffi/src/core_wallet/transaction_builder.rs index bb3f8f3d6dc..2eb53fbbdb4 100644 --- a/packages/rs-platform-wallet-ffi/src/core_wallet/transaction_builder.rs +++ b/packages/rs-platform-wallet-ffi/src/core_wallet/transaction_builder.rs @@ -7,7 +7,6 @@ use crate::runtime::runtime; use crate::types::{FFINetwork, Network}; use crate::{check_ptr, unwrap_option_or_return, unwrap_result_or_return}; use dashcore::blockdata::transaction::special_transaction::TransactionPayload; -use dashcore::hashes::Hash; use dashcore::{Address as DashAddress, OutPoint, TxOut, Txid}; use key_wallet::account::ManagedAccountCollection; use key_wallet::managed_account::ManagedCoreFundsAccount; diff --git a/packages/rs-platform-wallet-ffi/src/core_wallet_types.rs b/packages/rs-platform-wallet-ffi/src/core_wallet_types.rs index fbe02f4b56e..2943926d9f8 100644 --- a/packages/rs-platform-wallet-ffi/src/core_wallet_types.rs +++ b/packages/rs-platform-wallet-ffi/src/core_wallet_types.rs @@ -46,7 +46,6 @@ impl From<&OutPointFFI> for dashcore::OutPoint { /// an outpoint a host hands back (a page cursor, a classification /// query), so the byte order round-trips exactly. fn from(outpoint: &OutPointFFI) -> Self { - use dashcore::hashes::Hash as _; dashcore::OutPoint { txid: dashcore::Txid::from_byte_array(outpoint.txid), vout: outpoint.vout, @@ -1380,7 +1379,6 @@ pub struct MasternodeEntryV2FFI { /// interior-nul error. fn masternode_p2pkh_cstring(hash: [u8; 20], network: dashcore::Network) -> *mut c_char { use dashcore::address::Payload; - use dashcore::hashes::Hash; use dashcore::PubkeyHash; let address = dashcore::Address::new( network, @@ -1413,7 +1411,7 @@ pub(crate) fn masternode_entry_ffi( mn: &MasternodeRecord, network: dashcore::Network, ) -> MasternodeEntryFFI { - use dashcore::hashes::{hash160, Hash}; + use dashcore::hashes::hash160; use std::ffi::CString; // Operator pseudo-address = P2PKH of hash160(BLS key); platform-node diff --git a/packages/rs-platform-wallet-ffi/src/dashpay.rs b/packages/rs-platform-wallet-ffi/src/dashpay.rs index 858ee5c84cd..85dde7ca6ea 100644 --- a/packages/rs-platform-wallet-ffi/src/dashpay.rs +++ b/packages/rs-platform-wallet-ffi/src/dashpay.rs @@ -1049,7 +1049,6 @@ fn prepared_send_outcome( /// A txid as the 32 bytes the FFI hands out. fn txid_bytes(txid: &dashcore::Txid) -> [u8; 32] { - use dashcore::hashes::Hash; txid.to_raw_hash().to_byte_array() } @@ -1959,7 +1958,6 @@ mod tests { TestCore, platform_wallet::test_support::WalletSigner, ) { - use dashcore::hashes::Hash; use key_wallet::account::account_type::StandardAccountType; use platform_wallet::test_support::{funded_spv_core_wallet, test_platform_wallet_manager}; use platform_wallet::PreparedDashPayPayment; @@ -1999,7 +1997,6 @@ mod tests { /// stale payment. #[test] fn should_carry_the_txid_for_every_send_outcome_that_built_it() { - use dashcore::hashes::Hash; use platform_wallet::PlatformWalletError; let local = dashcore::Txid::from_byte_array([0x42; 32]); diff --git a/packages/rs-platform-wallet-ffi/src/derivation.rs b/packages/rs-platform-wallet-ffi/src/derivation.rs index 9140daaf27a..10ac4f82a09 100644 --- a/packages/rs-platform-wallet-ffi/src/derivation.rs +++ b/packages/rs-platform-wallet-ffi/src/derivation.rs @@ -10,7 +10,6 @@ use platform_wallet::wallet::identity::network::identity_auth_derivation_path_fo use platform_wallet::{ first_receive_address_for_mnemonic, parse_mnemonic_any_language, wallet_id_for_mnemonic, }; -use zeroize::Zeroizing; use crate::error::*; use crate::types::{FFINetwork, Network}; @@ -48,7 +47,7 @@ use crate::{check_ptr, unwrap_result_or_return}; /// /// # Zeroization /// The derived master xpriv, the derived xpriv at `path`, and the -/// intermediate seed are wrapped in [`Zeroizing`] inside this +/// intermediate seed are wrapped in [`zeroize::Zeroizing`] inside this /// function. The only material left in memory after return is the /// 32-byte secret bytes written into the caller's buffer (caller's /// responsibility to manage). @@ -81,7 +80,7 @@ pub unsafe extern "C" fn platform_wallet_derive_ext_priv_key_from_mnemonic( let mnemonic_obj = unwrap_result_or_return!(parse_mnemonic_any_language(mnemonic_str)); - let seed = Zeroizing::new(mnemonic_obj.to_seed(passphrase_str)); + let seed = mnemonic_obj.to_seed(passphrase_str); let master = unwrap_result_or_return!(ExtendedPrivKey::new_master(network, &*seed)); diff --git a/packages/rs-platform-wallet-ffi/src/derive_connect_key.rs b/packages/rs-platform-wallet-ffi/src/derive_connect_key.rs index 6de65bdcaeb..458faa2ed70 100644 --- a/packages/rs-platform-wallet-ffi/src/derive_connect_key.rs +++ b/packages/rs-platform-wallet-ffi/src/derive_connect_key.rs @@ -407,7 +407,7 @@ mod tests { assert_eq!(first.public_key_bytes, second.public_key_bytes); let mnemonic = Mnemonic::from_phrase(TEST_MNEMONIC).unwrap(); - let master = ExtendedPrivKey::new_master(Network::Testnet, &mnemonic.to_seed("")).unwrap(); + let master = ExtendedPrivKey::new_master(Network::Testnet, &*mnemonic.to_seed("")).unwrap(); let expected = derive_connect_keypair_from_master( &master, Network::Testnet, diff --git a/packages/rs-platform-wallet-ffi/src/derive_identity_key_at_slot.rs b/packages/rs-platform-wallet-ffi/src/derive_identity_key_at_slot.rs index af9363e79cf..cbddd1409fc 100644 --- a/packages/rs-platform-wallet-ffi/src/derive_identity_key_at_slot.rs +++ b/packages/rs-platform-wallet-ffi/src/derive_identity_key_at_slot.rs @@ -62,7 +62,7 @@ unsafe fn derive_at_slot_inner( out_row: *mut IdentityKeyPreviewFFI, ) -> PlatformWalletFFIResult { let mnemonic = unwrap_result_or_return!(parse_mnemonic_any_language(mnemonic_str)); - let seed: Zeroizing<[u8; 64]> = Zeroizing::new(mnemonic.to_seed(passphrase_str)); + let seed: Zeroizing<[u8; 64]> = mnemonic.to_seed(passphrase_str); let kw_network: Network = network.into(); let master = unwrap_result_or_return!(ExtendedPrivKey::new_master(kw_network, seed.as_ref())); diff --git a/packages/rs-platform-wallet-ffi/src/error.rs b/packages/rs-platform-wallet-ffi/src/error.rs index 0039095186a..eb4b9e74127 100644 --- a/packages/rs-platform-wallet-ffi/src/error.rs +++ b/packages/rs-platform-wallet-ffi/src/error.rs @@ -1041,7 +1041,10 @@ impl From for PlatformWalletFFIResult { // `available`/`required` duff amounts still travel in the message // (there are no out-params for them), but the code now lets a host // branch on the shortfall without parsing text. - PlatformWalletError::AssetLockInsufficientFunds { .. } => { + // Funds awaiting finality share the shortfall code until hosts + // get a dedicated code for it. + PlatformWalletError::AssetLockInsufficientFunds { .. } + | PlatformWalletError::AssetLockFundsAwaitingFinality { .. } => { PlatformWalletFFIResultCode::ErrorAssetLockInsufficientFunds } PlatformWalletError::AssetLockTooManyInputs { .. } => { @@ -1599,6 +1602,14 @@ mod tests { msg, rendered, "structured available/required duffs must survive the FFI boundary verbatim" ); + + let result: PlatformWalletFFIResult = + PlatformWalletError::AssetLockFundsAwaitingFinality { waiting: 600 }.into(); + assert_eq!( + result.code, + PlatformWalletFFIResultCode::ErrorAssetLockInsufficientFunds, + "funds awaiting finality share the shortfall code" + ); } /// The numeric value of `ErrorAssetLockInsufficientFunds` is ABI, mirrored diff --git a/packages/rs-platform-wallet-ffi/src/identity_derive_and_persist.rs b/packages/rs-platform-wallet-ffi/src/identity_derive_and_persist.rs index db7821c3ca8..42ce101cc4f 100644 --- a/packages/rs-platform-wallet-ffi/src/identity_derive_and_persist.rs +++ b/packages/rs-platform-wallet-ffi/src/identity_derive_and_persist.rs @@ -92,7 +92,6 @@ use std::os::raw::c_char; use std::ptr; use crate::types::{FFINetwork, Network}; -use dashcore::hashes::Hash; use key_wallet::bip32::{ExtendedPrivKey, ExtendedPubKey}; use zeroize::{Zeroize, Zeroizing}; @@ -251,7 +250,7 @@ pub unsafe extern "C" fn dash_sdk_derive_and_persist_identity_keys( // ---- Derive seed + master xpriv ------------------------------------------ // Empty passphrase to mirror the rest of the SDK (no caller // surface for a BIP-39 passphrase yet). - let seed: Zeroizing<[u8; 64]> = Zeroizing::new(mnemonic.to_seed("")); + let seed: Zeroizing<[u8; 64]> = mnemonic.to_seed(""); // Mnemonic is no longer needed; explicit drop releases its // (non-zeroized) `String` storage early. drop(mnemonic); diff --git a/packages/rs-platform-wallet-ffi/src/identity_keys_from_mnemonic.rs b/packages/rs-platform-wallet-ffi/src/identity_keys_from_mnemonic.rs index 090221c41fd..3bd8fe98eb3 100644 --- a/packages/rs-platform-wallet-ffi/src/identity_keys_from_mnemonic.rs +++ b/packages/rs-platform-wallet-ffi/src/identity_keys_from_mnemonic.rs @@ -311,7 +311,7 @@ pub unsafe extern "C" fn dash_sdk_derive_identity_keys_from_mnemonic( }; let mnemonic = unwrap_result_or_return!(parse_mnemonic_any_language(mnemonic_str)); - let seed: Zeroizing<[u8; 64]> = Zeroizing::new(mnemonic.to_seed(passphrase_str)); + let seed: Zeroizing<[u8; 64]> = mnemonic.to_seed(passphrase_str); let kw_network: Network = network.into(); let master = unwrap_result_or_return!(ExtendedPrivKey::new_master(kw_network, seed.as_ref())); diff --git a/packages/rs-platform-wallet-ffi/src/identity_registration_funded_with_signer.rs b/packages/rs-platform-wallet-ffi/src/identity_registration_funded_with_signer.rs index a323a132cb5..69e83d6a28c 100644 --- a/packages/rs-platform-wallet-ffi/src/identity_registration_funded_with_signer.rs +++ b/packages/rs-platform-wallet-ffi/src/identity_registration_funded_with_signer.rs @@ -15,7 +15,6 @@ //! crosses the FFI boundary as raw bytes — see //! [`rs_sdk_ffi::MnemonicResolverCoreSigner`]. -use dashcore::hashes::Hash; use dpp::identity::accessors::IdentityGettersV0; use dpp::prelude::Identifier; use platform_wallet::AssetLockFunding; diff --git a/packages/rs-platform-wallet-ffi/src/invitation_persistence.rs b/packages/rs-platform-wallet-ffi/src/invitation_persistence.rs index 7f7d7fdce5b..91f3ae5dffd 100644 --- a/packages/rs-platform-wallet-ffi/src/invitation_persistence.rs +++ b/packages/rs-platform-wallet-ffi/src/invitation_persistence.rs @@ -80,7 +80,6 @@ pub fn status_to_u8(status: &InvitationStatus) -> u8 { #[cfg(test)] mod tests { use super::*; - use dashcore::hashes::Hash; fn entry(vout: u32, status: InvitationStatus) -> InvitationEntry { InvitationEntry { diff --git a/packages/rs-platform-wallet-ffi/src/masternode_update_service.rs b/packages/rs-platform-wallet-ffi/src/masternode_update_service.rs index e6c3938b2e3..2071cc4c54c 100644 --- a/packages/rs-platform-wallet-ffi/src/masternode_update_service.rs +++ b/packages/rs-platform-wallet-ffi/src/masternode_update_service.rs @@ -25,7 +25,6 @@ use std::os::raw::c_char; use std::sync::Arc; -use dashcore::hashes::Hash; use platform_wallet::masternode::{ execute_masternode_update_service, parse_secret_for_role, prepare_masternode_update_service, LocatorSecret, MasternodeKeyRole, MasternodeUpdateServiceParams, diff --git a/packages/rs-platform-wallet-ffi/src/mnemonic_words.rs b/packages/rs-platform-wallet-ffi/src/mnemonic_words.rs index b26c8b60bb1..690d98f0c90 100644 --- a/packages/rs-platform-wallet-ffi/src/mnemonic_words.rs +++ b/packages/rs-platform-wallet-ffi/src/mnemonic_words.rs @@ -17,7 +17,7 @@ use std::ffi::{CStr, CString}; use std::os::raw::c_char; use std::ptr; -use zeroize::{Zeroize, Zeroizing}; +use zeroize::Zeroize; use crate::address_private_key::secret_string_into_raw; use crate::error::{PlatformWalletFFIResult, PlatformWalletFFIResultCode}; @@ -139,8 +139,7 @@ pub unsafe extern "C" fn platform_wallet_mnemonic_generate( word_count as usize, language.into() )); - *out_mnemonic = - unwrap_result_or_return!(secret_string_into_raw(Zeroizing::new(mnemonic.phrase()))); + *out_mnemonic = unwrap_result_or_return!(secret_string_into_raw(mnemonic.phrase())); PlatformWalletFFIResult::ok() } diff --git a/packages/rs-platform-wallet-ffi/src/persistence.rs b/packages/rs-platform-wallet-ffi/src/persistence.rs index bbc3861e23a..eb5865fc361 100644 --- a/packages/rs-platform-wallet-ffi/src/persistence.rs +++ b/packages/rs-platform-wallet-ffi/src/persistence.rs @@ -4010,7 +4010,6 @@ impl PlatformWalletPersistence for FFIPersister { PersistenceError, > { use dashcore::consensus::Decodable; - use dashcore::hashes::Hash; use key_wallet::account::{AccountType, StandardAccountType}; use key_wallet::managed_account::transaction_record::{ TransactionDirection, TransactionRecord, @@ -4187,8 +4186,6 @@ impl PlatformWalletPersistence for FFIPersister { &self, wallet_id: WalletId, ) -> Result>, PersistenceError> { - use dashcore::hashes::Hash; - // An unset callback means this host never wired wallet-scoped // transaction enumeration (the Android vtable leaves both slots // `None`). Report the capability as absent — NOT an empty table — @@ -5372,7 +5369,6 @@ fn decode_unconfirmed_outgoing( entry: &WalletRestoreEntryFFI, ) -> Vec { use dashcore::consensus::Decodable; - use dashcore::hashes::Hash; let recs: &[UnconfirmedOutgoingTxRecordFFI] = if entry.unconfirmed_outgoing_tx_records.is_null() || entry.unconfirmed_outgoing_tx_records_count == 0 { @@ -5790,10 +5786,6 @@ fn build_wallet_start_state( let mut dropped_bad_script = 0usize; let mut dropped_no_account = 0usize; for u in utxo_entries { - // Bring `Hash` into scope locally so `Txid::from_slice` is - // available — matches the pattern used elsewhere in this - // crate (see e.g. asset_lock/sync.rs). - use dashcore::hashes::Hash; let script_bytes = unsafe { slice_from_raw(u.script_pubkey, u.script_pubkey_len) }; // Build the AccountType via the same helper the per-spec path // uses, repackaged as an `AccountSpecFFI` so we can reuse @@ -6261,8 +6253,6 @@ fn build_unused_asset_locks( BTreeMap>, PersistenceError, > { - use dashcore::hashes::Hash; - if entry.tracked_asset_locks.is_null() && entry.tracked_asset_locks_count != 0 { return Err(PersistenceError::backend( "tracked asset locks: missing row buffer", @@ -7164,7 +7154,6 @@ fn restore_unresolved_asset_lock_tx_records( wallet_info: &mut ManagedWalletInfo, records: &[UnresolvedAssetLockTxRecordFFI], ) -> Result { - use dashcore::hashes::Hash; use key_wallet::managed_account::managed_account_trait::ManagedAccountTrait; use key_wallet::managed_account::transaction_record::{ TransactionDirection, TransactionRecord, @@ -7328,7 +7317,6 @@ fn restore_provider_special_txs( wallet_info: &mut ManagedWalletInfo, records: &[ProviderSpecialTxRestoreEntryFFI], ) -> Result { - use dashcore::hashes::Hash; use dashcore::transaction::TransactionPayload; use key_wallet::account::AccountType; use key_wallet::managed_account::transaction_record::{ @@ -8472,7 +8460,6 @@ mod tests { /// turns that into a withheld watermark rather than a false success. #[test] fn store_delivers_sweeps_through_the_extension_slot_after_the_changeset() { - use dashcore::hashes::Hash as _; use platform_wallet::changeset::changeset::SweepBatch; use platform_wallet::changeset::CoreChangeSet; @@ -9403,7 +9390,7 @@ mod tests { .expect("static BIP-39 vector") .to_seed(""); let master = - ExtendedPrivKey::new_master(dashcore::Network::Testnet, &seed).expect("master"); + ExtendedPrivKey::new_master(dashcore::Network::Testnet, &*seed).expect("master"); let xpub = ExtendedPubKey::from_priv(&master); let owner = Identifier::from([0xAA; 32]); let contact = Identifier::from([0x01; 32]); @@ -9565,7 +9552,6 @@ mod tests { } fn chain_lock_at(height: u32) -> dashcore::ephemerealdata::chain_lock::ChainLock { use dashcore::bls_sig_utils::BLSSignature; - use dashcore::hashes::Hash as _; use dashcore::BlockHash; dashcore::ephemerealdata::chain_lock::ChainLock { block_height: height, @@ -9663,7 +9649,6 @@ mod tests { /// before the slot existed. #[test] fn store_delivers_credit_verdicts_through_the_extension_slot_before_the_changeset() { - use dashcore::hashes::Hash as _; use platform_wallet::changeset::changeset::UtxoCreditVerdict; use platform_wallet::changeset::CoreChangeSet; @@ -9787,7 +9772,6 @@ mod tests { #[test] fn should_roundtrip_drain_operation_ids_including_consumed_tombstones() { - use dashcore::hashes::Hash; use key_wallet::wallet::managed_wallet_info::asset_lock_builder::AssetLockFundingType; unsafe extern "C" fn load_id( @@ -10553,7 +10537,6 @@ mod tests { use dashcore::blockdata::transaction::Transaction; use dashcore::consensus::encode::serialize; use dashcore::ephemerealdata::instant_lock::InstantLock; - use dashcore::hashes::Hash; use dashcore::transaction::special_transaction::asset_lock::AssetLockPayload; use dashcore::transaction::special_transaction::TransactionPayload; use dashcore::{BlockHash, OutPoint, Txid}; @@ -11021,7 +11004,7 @@ mod tests { ) .expect("static BIP-39 vector must parse"); let seed = mnemonic.to_seed(""); - let master = ExtendedPrivKey::new_master(Network::Testnet, &seed) + let master = ExtendedPrivKey::new_master(Network::Testnet, &*seed) .expect("master derivation must succeed"); let xpub = ExtendedPubKey::from_priv(&master); let account = Account::from_xpub( @@ -11053,7 +11036,7 @@ mod tests { ) .expect("static BIP-39 vector must parse"); let seed = mnemonic.to_seed(""); - let master = ExtendedPrivKey::new_master(Network::Testnet, &seed) + let master = ExtendedPrivKey::new_master(Network::Testnet, &*seed) .expect("master derivation must succeed"); let xpub = ExtendedPubKey::from_priv(&master); let account = Account::from_xpub(None, account_type, xpub, Network::Testnet) @@ -11167,7 +11150,7 @@ mod tests { ) .expect("static BIP-39 vector must parse"); let seed = mnemonic.to_seed(""); - let master = ExtendedPrivKey::new_master(Network::Testnet, &seed) + let master = ExtendedPrivKey::new_master(Network::Testnet, &*seed) .expect("master derivation must succeed"); let xpub = ExtendedPubKey::from_priv(&master); let account = @@ -11288,7 +11271,6 @@ mod tests { #[test] fn provider_special_tx_restore_round_trips_block_position() { use dashcore::blockdata::transaction::special_transaction::provider_update_service::ProviderUpdateServicePayload; - use dashcore::hashes::Hash; use dashcore::transaction::TransactionPayload; let payload = ProviderUpdateServicePayload { @@ -11364,7 +11346,6 @@ mod tests { /// [`address_info_from_ffi`], which re-parses the rendered string and /// rebuilds the address from its script. fn typed_key_test_address_info(index: u32, public_key: Option) -> AddressInfo { - use dashcore::hashes::Hash; let mut h = [0u8; 20]; h[0] = index as u8; h[1] = (index >> 8) as u8; @@ -11611,7 +11592,7 @@ mod tests { .expect("static BIP-39 vector must parse"); let seed = mnemonic.to_seed(""); let wallet = Wallet::from_seed_bytes( - seed, + *seed, Network::Testnet, key_wallet::wallet::initialization::WalletAccountCreationOptions::Default, ) @@ -12552,7 +12533,6 @@ mod tests { #[test] fn should_restore_only_committed_asset_lock_status_after_a_failed_round() { - use dashcore::hashes::Hash; use key_wallet::wallet::managed_wallet_info::asset_lock_builder::AssetLockFundingType; use std::sync::{mpsc, Condvar, Mutex as StdMutex}; use std::time::Duration; diff --git a/packages/rs-platform-wallet-ffi/src/platform_addresses/fund_from_asset_lock.rs b/packages/rs-platform-wallet-ffi/src/platform_addresses/fund_from_asset_lock.rs index 4bcd458752d..ae7a7d36589 100644 --- a/packages/rs-platform-wallet-ffi/src/platform_addresses/fund_from_asset_lock.rs +++ b/packages/rs-platform-wallet-ffi/src/platform_addresses/fund_from_asset_lock.rs @@ -17,7 +17,6 @@ use std::collections::BTreeMap; use std::os::raw::c_void; -use dashcore::hashes::Hash; use dpp::address_funds::PlatformAddress; use platform_wallet::wallet::asset_lock::AssetLockFunding; use rs_sdk_ffi::{MnemonicResolverCoreSigner, MnemonicResolverHandle, SignerHandle, VTableSigner}; diff --git a/packages/rs-platform-wallet-ffi/src/shielded_send.rs b/packages/rs-platform-wallet-ffi/src/shielded_send.rs index 478d7fae658..43cb4aa4f9b 100644 --- a/packages/rs-platform-wallet-ffi/src/shielded_send.rs +++ b/packages/rs-platform-wallet-ffi/src/shielded_send.rs @@ -42,7 +42,6 @@ use std::ffi::CStr; use std::os::raw::{c_char, c_void}; -use dashcore::hashes::Hash; use dpp::address_funds::{OrchardAddress, PlatformAddress}; use dpp::shielded::{ compute_minimum_shielded_fee, compute_shielded_identity_balance_write_fee, @@ -810,6 +809,8 @@ pub(crate) fn catch_funding_panic( /// drainable balance sits under the required minimum lock floor, so the /// host's only remedies are to add funds to that account or lower the /// floor. Do not surface "try a smaller amount" for the drain form. +/// `AssetLockFundsAwaitingFinality` shares code 29, as it does on the +/// non-shielded entry points. /// /// Without this arm the shortfall flattened into the generic /// `ErrorWalletOperation` (6) catch-all below, hiding a typed error behind @@ -855,7 +856,10 @@ fn map_asset_lock_funding_result( e @ (PlatformWalletError::AssetLockInputConflict { .. } | PlatformWalletError::AssetLockInputContested { .. }), ) => e.into(), - Err(e @ PlatformWalletError::AssetLockInsufficientFunds { .. }) => e.into(), + Err( + e @ (PlatformWalletError::AssetLockInsufficientFunds { .. } + | PlatformWalletError::AssetLockFundsAwaitingFinality { .. }), + ) => e.into(), Err( e @ (PlatformWalletError::TransactionBroadcast(_) | PlatformWalletError::TransactionBroadcastUnconfirmed(_)), @@ -3297,5 +3301,11 @@ mod tests { result.code, PlatformWalletFFIResultCode::ErrorAssetLockInsufficientFunds ); + + let awaiting = PlatformWalletError::AssetLockFundsAwaitingFinality { waiting: 600 }; + let rendered = awaiting.to_string(); + let result = map_asset_lock_funding_result(Err(awaiting), "shielded fund-from-asset-lock"); + assert_eq!(result.code as i32, 29); + assert_eq!(message_of(&result), rendered); } } diff --git a/packages/rs-platform-wallet-ffi/src/shielded_wallet_drain.rs b/packages/rs-platform-wallet-ffi/src/shielded_wallet_drain.rs index e802b628779..8cc05ce8f8b 100644 --- a/packages/rs-platform-wallet-ffi/src/shielded_wallet_drain.rs +++ b/packages/rs-platform-wallet-ffi/src/shielded_wallet_drain.rs @@ -1,6 +1,5 @@ //! Pooled Core-to-shielded Max with a stable, per-operation recovery identity. -use dashcore::hashes::Hash; use dpp::address_funds::OrchardAddress; use platform_wallet::wallet::asset_lock::{ AssetLockFunding, AssetLockOperationContext, AssetLockOperationSnapshot, diff --git a/packages/rs-platform-wallet-ffi/src/sign_with_mnemonic_resolver.rs b/packages/rs-platform-wallet-ffi/src/sign_with_mnemonic_resolver.rs index 87d18962d64..956dbd05739 100644 --- a/packages/rs-platform-wallet-ffi/src/sign_with_mnemonic_resolver.rs +++ b/packages/rs-platform-wallet-ffi/src/sign_with_mnemonic_resolver.rs @@ -253,7 +253,7 @@ pub unsafe extern "C" fn dash_sdk_sign_with_mnemonic_resolver_and_path( }; // ---- Derive seed + derivation path -------------------------------------- - let seed: Zeroizing<[u8; 64]> = Zeroizing::new(mnemonic.to_seed("")); + let seed: Zeroizing<[u8; 64]> = mnemonic.to_seed(""); drop(mnemonic); let path_str = match CStr::from_ptr(derivation_path_cstr).to_str() { @@ -492,7 +492,7 @@ mod tests { // same mnemonic the resolver returns. let mnemonic = parse_mnemonic_any_language(ENGLISH_PHRASE).expect("mnemonic"); let seed = mnemonic.to_seed(""); - let master = ExtendedPrivKey::new_master(Network::Testnet, &seed).expect("master"); + let master = ExtendedPrivKey::new_master(Network::Testnet, &*seed).expect("master"); let derived = master .derive_priv(&DerivationPath::from_str(path_str).unwrap()) .expect("derive"); @@ -587,7 +587,7 @@ mod tests { let mnemonic = parse_mnemonic_any_language(ENGLISH_PHRASE).expect("mnemonic"); let seed = mnemonic.to_seed(""); - let master = ExtendedPrivKey::new_master(Network::Testnet, &seed).expect("master"); + let master = ExtendedPrivKey::new_master(Network::Testnet, &*seed).expect("master"); let derived = master .derive_priv(&DerivationPath::from_str(path_str).unwrap()) .expect("derive"); diff --git a/packages/rs-platform-wallet-ffi/src/spv.rs b/packages/rs-platform-wallet-ffi/src/spv.rs index 0e6c9c49640..c0e1846194a 100644 --- a/packages/rs-platform-wallet-ffi/src/spv.rs +++ b/packages/rs-platform-wallet-ffi/src/spv.rs @@ -3,7 +3,6 @@ use std::ffi::{CStr, CString}; use std::os::raw::c_char; -use dashcore::hashes::Hash; use dashcore::sml::llmq_type::LlmqDevnetParams; use dashcore::PubkeyHash; use platform_wallet::spv::{ @@ -493,12 +492,21 @@ pub unsafe extern "C" fn platform_wallet_manager_spv_start( "llmq_devnet_params is only valid on devnet", ); } + let (Ok(llmq_devnet_size), Ok(llmq_devnet_threshold)) = ( + u16::try_from(llmq_devnet_size), + u16::try_from(llmq_devnet_threshold), + ) else { + return PlatformWalletFFIResult::err( + PlatformWalletFFIResultCode::ErrorInvalidParameter, + "llmq_devnet_size and llmq_devnet_threshold must fit in 16 bits", + ); + }; // Dash Core devnet peers disconnect any inbound connection whose // user agent doesn't contain `devnet.devnet-`. Rebuild the // user agent to embed the substring while keeping whatever base // the caller (or our default) provided. Mirrors the dash-spv - // binary's `/rust-dash-spv:VERSION(devnet.devnet-NAME)/` format. + // binary's `/dash-spv:VERSION(devnet.devnet-NAME)/` format. if let Some(name) = devnet_name_str.as_deref() { let base = user_agent_str .clone() @@ -522,8 +530,8 @@ pub unsafe extern "C" fn platform_wallet_manager_spv_start( let mut config = ClientConfig::default(); config.network = net; config.storage_path = std::path::PathBuf::from(&data_dir_str); - if let Some(ua) = user_agent_str.clone() { - config.user_agent = Some(ua); + if let Some(ua) = user_agent_str { + config.user_agent = ua; } if start_from_height > 0 { config.start_from_height = Some(start_from_height); diff --git a/packages/rs-platform-wallet-ffi/src/tx_decode.rs b/packages/rs-platform-wallet-ffi/src/tx_decode.rs index ada1a2d2cbf..c0f08a49560 100644 --- a/packages/rs-platform-wallet-ffi/src/tx_decode.rs +++ b/packages/rs-platform-wallet-ffi/src/tx_decode.rs @@ -7,7 +7,6 @@ use std::ffi::CString; use std::os::raw::c_char; use std::{ptr, slice}; -use dashcore::hashes::Hash; use platform_wallet::decode_transaction; use crate::core_wallet_types::vec_to_ptr; diff --git a/packages/rs-platform-wallet-ffi/src/utils.rs b/packages/rs-platform-wallet-ffi/src/utils.rs index 5583e08df85..d24d92389d1 100644 --- a/packages/rs-platform-wallet-ffi/src/utils.rs +++ b/packages/rs-platform-wallet-ffi/src/utils.rs @@ -166,7 +166,6 @@ pub unsafe extern "C" fn platform_wallet_hash160( if data.is_null() || data_len == 0 || out_hash.is_null() { return -1; } - use dashcore::hashes::Hash; let bytes = std::slice::from_raw_parts(data, data_len); let hash = dashcore::hashes::hash160::Hash::hash(bytes); let h: [u8; 20] = hash.to_byte_array(); @@ -205,7 +204,6 @@ pub unsafe extern "C" fn platform_wallet_pubkey_hash_from_private_key( if private_key.is_null() || out_hash.is_null() { return -1; } - use dashcore::hashes::Hash; use dpp::secp256k1::{PublicKey, SecretKey}; let sk_bytes = std::slice::from_raw_parts(private_key, 32); @@ -255,7 +253,6 @@ mod tests { #[test] fn test_hash160_matches_known_vector() { - use dashcore::hashes::Hash; let input = [0u8; 33]; let mut out = [0u8; 20]; let rc = unsafe { platform_wallet_hash160(input.as_ptr(), input.len(), out.as_mut_ptr()) }; @@ -290,7 +287,6 @@ mod tests { #[test] fn test_pubkey_hash_from_private_key_matches_canonical_derivation() { - use dashcore::hashes::Hash; use dpp::secp256k1::{PublicKey, SecretKey}; // A fixed, in-range scalar. diff --git a/packages/rs-platform-wallet-storage/src/sqlite/provider_accounts.rs b/packages/rs-platform-wallet-storage/src/sqlite/provider_accounts.rs index ec6fb8bdc6e..9e6cc766478 100644 --- a/packages/rs-platform-wallet-storage/src/sqlite/provider_accounts.rs +++ b/packages/rs-platform-wallet-storage/src/sqlite/provider_accounts.rs @@ -109,7 +109,6 @@ mod tests { #[test] fn insert_used_platform_node_pool_entry_restores_used_bookkeeping() { - use dashcore::hashes::Hash; use key_wallet::managed_account::address_pool::AddressPoolType; use key_wallet::managed_account::managed_account_trait::ManagedAccountTrait; use key_wallet::wallet::managed_wallet_info::ManagedWalletInfo; @@ -157,7 +156,6 @@ mod tests { #[test] fn insert_platform_node_pool_entry_rejects_unmanaged_account() { - use dashcore::hashes::Hash; use key_wallet::wallet::managed_wallet_info::ManagedWalletInfo; let wallet = provider_key_test_wallet(); @@ -186,7 +184,6 @@ mod tests { #[test] fn insert_platform_node_pool_entry_clears_stale_used_bookkeeping_on_downgrade() { - use dashcore::hashes::Hash; use key_wallet::managed_account::address_pool::AddressPoolType; use key_wallet::managed_account::managed_account_trait::ManagedAccountTrait; use key_wallet::wallet::managed_wallet_info::ManagedWalletInfo; @@ -264,7 +261,6 @@ mod tests { pool.pool_type = AddressPoolType::Absent; } - use dashcore::hashes::Hash; let key = &keys[0]; let address = dashcore::Address::new( Network::Testnet, diff --git a/packages/rs-platform-wallet-storage/src/sqlite/rehydrate.rs b/packages/rs-platform-wallet-storage/src/sqlite/rehydrate.rs index 270e0a436d0..46af1bc4a5e 100644 --- a/packages/rs-platform-wallet-storage/src/sqlite/rehydrate.rs +++ b/packages/rs-platform-wallet-storage/src/sqlite/rehydrate.rs @@ -2473,7 +2473,6 @@ mod tests { fn rehydration_utxos_without_funds_account_errors() { use dashcore::address::Payload; use dashcore::blockdata::transaction::txout::TxOut; - use dashcore::hashes::Hash; use dashcore::{OutPoint, PubkeyHash, Txid}; use key_wallet::account::AccountType; use key_wallet::wallet::managed_wallet_info::ManagedWalletInfo; @@ -2591,7 +2590,6 @@ mod tests { #[test] fn rehydration_restores_last_applied_chain_lock() { use dashcore::ephemerealdata::chain_lock::ChainLock; - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::wallet::managed_wallet_info::ManagedWalletInfo; diff --git a/packages/rs-platform-wallet-storage/src/sqlite/schema/asset_locks.rs b/packages/rs-platform-wallet-storage/src/sqlite/schema/asset_locks.rs index 6256705bfbb..ced3c0e2ec6 100644 --- a/packages/rs-platform-wallet-storage/src/sqlite/schema/asset_locks.rs +++ b/packages/rs-platform-wallet-storage/src/sqlite/schema/asset_locks.rs @@ -460,8 +460,6 @@ mod tests { conn } - use dashcore::hashes::Hash; - fn sample_outpoint(b: u8) -> OutPoint { OutPoint { txid: dashcore::Txid::from_byte_array([b; 32]), diff --git a/packages/rs-platform-wallet-storage/src/sqlite/schema/blob.rs b/packages/rs-platform-wallet-storage/src/sqlite/schema/blob.rs index c53f2584be2..88fc75b1ea7 100644 --- a/packages/rs-platform-wallet-storage/src/sqlite/schema/blob.rs +++ b/packages/rs-platform-wallet-storage/src/sqlite/schema/blob.rs @@ -216,7 +216,6 @@ mod tests { #[test] fn outpoint_roundtrip() { - use dashcore::hashes::Hash; let op = dashcore::OutPoint { txid: dashcore::Txid::from_byte_array([7u8; 32]), vout: 9, @@ -235,7 +234,6 @@ mod tests { /// so the key length is not fixed but decoding recovers the value. #[test] fn outpoint_roundtrip_large_vout() { - use dashcore::hashes::Hash; let op = dashcore::OutPoint { txid: dashcore::Txid::from_byte_array([0xABu8; 32]), vout: u32::MAX, @@ -262,7 +260,6 @@ mod tests { /// in the encoding must fail here rather than backfill the wrong bytes. #[test] fn encode_outpoint_txid_occupies_bytes_two_to_thirty_three() { - use dashcore::hashes::Hash; let txid_bytes = [0x5Au8; 32]; let op = dashcore::OutPoint::new(dashcore::Txid::from_byte_array(txid_bytes), 3); let encoded = encode_outpoint(&op).unwrap(); diff --git a/packages/rs-platform-wallet-storage/src/sqlite/schema/core_pool.rs b/packages/rs-platform-wallet-storage/src/sqlite/schema/core_pool.rs index f5b3d4056d3..79aa66b0319 100644 --- a/packages/rs-platform-wallet-storage/src/sqlite/schema/core_pool.rs +++ b/packages/rs-platform-wallet-storage/src/sqlite/schema/core_pool.rs @@ -497,8 +497,6 @@ mod tests { #[test] fn should_accept_current_and_legacy_pool_account_labels() { - use dashcore::hashes::Hash; - let conn = migrated_conn(); let wallet = [0x79; 32]; conn.execute( @@ -539,7 +537,6 @@ mod tests { #[test] fn shared_script_resolvers_apply_their_distinct_source_filters() { use dashcore::address::Payload; - use dashcore::hashes::Hash; use dashcore::PubkeyHash; let mut conn = migrated_conn(); @@ -635,7 +632,6 @@ mod tests { #[test] fn apply_pools_refuses_an_empty_script() { use dashcore::address::Payload; - use dashcore::hashes::Hash; use key_wallet::account::{AccountType, StandardAccountType}; use key_wallet::bip32::DerivationPath; use key_wallet::managed_account::address_pool::AddressState; diff --git a/packages/rs-platform-wallet-storage/src/sqlite/schema/core_state.rs b/packages/rs-platform-wallet-storage/src/sqlite/schema/core_state.rs index 4e1f02f6b8a..cc103ad5570 100644 --- a/packages/rs-platform-wallet-storage/src/sqlite/schema/core_state.rs +++ b/packages/rs-platform-wallet-storage/src/sqlite/schema/core_state.rs @@ -444,8 +444,6 @@ fn surviving_stored_input_claims( wallet_id: &WalletId, swept_txids: &HashSet, ) -> Result, WalletStorageError> { - use dashcore::hashes::Hash; - let mut stmt = tx.prepare_cached("SELECT txid, record_blob FROM core_transactions WHERE wallet_id = ?1 AND record_blob IS NOT NULL")?; let mut rows = stmt.query(params![wallet_id.as_slice()])?; @@ -921,8 +919,6 @@ pub fn load_state( let mut transaction_heights: HashMap> = HashMap::new(); let mut blob_backed_transaction_heights = HashSet::new(); { - use dashcore::hashes::Hash; - // Pre-read length gates keep fixed-width txids and record blobs from // being materialized before their stored sizes are validated. let mut stmt = conn.prepare( @@ -1029,7 +1025,6 @@ pub fn load_state( )?; let mut rows = stmt.query(params![wallet_id.as_slice()])?; while let Some(row) = rows.next()? { - use dashcore::hashes::Hash; blob::check_fixed_width(row.get::<_, i64>(0)?, 32, "core_instant_locks.txid")?; let txid_bytes: Vec = row.get(1)?; blob::check_size(row.get::<_, i64>(2)?)?; @@ -1345,7 +1340,6 @@ pub fn list_unspent_utxos( mod tests { use super::*; use dashcore::address::Payload; - use dashcore::hashes::Hash; use dashcore::{BlockHash, OutPoint, PubkeyHash, Transaction, TxOut, Txid}; use key_wallet::account::{AccountType, StandardAccountType}; use key_wallet::managed_account::transaction_record::{ diff --git a/packages/rs-platform-wallet-storage/src/sqlite/schema/invitations.rs b/packages/rs-platform-wallet-storage/src/sqlite/schema/invitations.rs index 16f0c86138d..efa1a7f5b21 100644 --- a/packages/rs-platform-wallet-storage/src/sqlite/schema/invitations.rs +++ b/packages/rs-platform-wallet-storage/src/sqlite/schema/invitations.rs @@ -134,7 +134,6 @@ pub fn read_all( #[cfg(test)] mod tests { use super::*; - use dashcore::hashes::Hash; fn entry(vout: u32, status: InvitationStatus) -> InvitationEntry { InvitationEntry { diff --git a/packages/rs-platform-wallet-storage/tests/integration/fixture_gen.rs b/packages/rs-platform-wallet-storage/tests/integration/fixture_gen.rs index df75b039416..98bca6f84fa 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/fixture_gen.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/fixture_gen.rs @@ -90,7 +90,6 @@ fn first_external_info(byte: u8) -> key_wallet::AddressInfo { /// A chain-locked transaction record at height 200, so the migrated store can /// be asserted to preserve both the height column and the blob's own context. fn one_tx_record() -> key_wallet::managed_account::transaction_record::TransactionRecord { - use dashcore::hashes::Hash; use dashcore::{BlockHash, Transaction, Txid}; use key_wallet::managed_account::transaction_record::{ TransactionDirection, TransactionRecord, diff --git a/packages/rs-platform-wallet-storage/tests/integration/review_4651_concurrent_payment.rs b/packages/rs-platform-wallet-storage/tests/integration/review_4651_concurrent_payment.rs index 60e2cbb3261..07737444c05 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/review_4651_concurrent_payment.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/review_4651_concurrent_payment.rs @@ -7,7 +7,6 @@ use std::sync::{Arc, Mutex}; use std::time::Duration; use common::{ensure_wallet_meta, secure_tempdir}; -use dashcore::hashes::Hash; use dpp::identity::{Identity, IdentityV0}; use dpp::prelude::Identifier; use key_wallet::account::account_type::StandardAccountType; diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_account_zero_attribution.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_account_zero_attribution.rs index 8e2530a0f09..a19e52c0e95 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_account_zero_attribution.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_account_zero_attribution.rs @@ -65,7 +65,6 @@ fn wallet_and_gap_limit_edge_address(seed_byte: u8) -> (Wallet, AddressInfo) { } fn utxo_at(addr: &dashcore::Address, vout: u32, value: u64) -> key_wallet::Utxo { - use dashcore::hashes::Hash; key_wallet::Utxo { outpoint: dashcore::OutPoint { txid: dashcore::Txid::from_byte_array([0x7E; 32]), diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_asset_locks_filter.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_asset_locks_filter.rs index b3cac135312..f8e1250bf09 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_asset_locks_filter.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_asset_locks_filter.rs @@ -7,7 +7,6 @@ use crate::common; use common::{ensure_wallet_meta, fresh_persister, wid}; -use dashcore::hashes::Hash; use dashcore::{OutPoint, Transaction, Txid}; use key_wallet::wallet::managed_wallet_info::asset_lock_builder::AssetLockFundingType; use platform_wallet::changeset::{AssetLockChangeSet, AssetLockEntry, PlatformWalletPersistence}; diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_blob_roundtrip_coverage.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_blob_roundtrip_coverage.rs index c0235fc8e5e..d3b06a00f37 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_blob_roundtrip_coverage.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_blob_roundtrip_coverage.rs @@ -16,7 +16,6 @@ use crate::common; use common::{ensure_wallet_meta, fresh_persister, wid}; -use dashcore::hashes::Hash; use dashcore::{OutPoint, Transaction, Txid}; use dpp::identity::state_transition::asset_lock_proof::chain::ChainAssetLockProof; use dpp::identity::state_transition::asset_lock_proof::instant::InstantAssetLockProof; diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_buffer_semantics.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_buffer_semantics.rs index a96ec53f41b..af151578e6a 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_buffer_semantics.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_buffer_semantics.rs @@ -14,7 +14,6 @@ use std::collections::BTreeMap; use common::{ensure_wallet_meta, fresh_persister, fresh_persister_with_mode, ro_conn, wid}; -use dashcore::hashes::Hash; use platform_wallet::changeset::{ CoreChangeSet, PlatformWalletChangeSet, PlatformWalletPersistence, }; diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_core_pool_writer.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_core_pool_writer.rs index 4a8922b3da4..71abde0dc61 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_core_pool_writer.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_core_pool_writer.rs @@ -53,7 +53,6 @@ fn external_infos(seed_byte: u8) -> Vec { } fn utxo_on(info: &AddressInfo, value: u64) -> Utxo { - use dashcore::hashes::Hash; Utxo { outpoint: dashcore::OutPoint { txid: dashcore::Txid::from_byte_array([info.index as u8 ^ 0x5A; 32]), diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_core_state_reader.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_core_state_reader.rs index bfe588a00f1..1c7f5df83c8 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_core_state_reader.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_core_state_reader.rs @@ -7,7 +7,6 @@ use crate::common; use common::{ensure_wallet_meta, fresh_persister, wid}; -use dashcore::hashes::Hash; use dashcore::{OutPoint, Txid}; use key_wallet::wallet::initialization::WalletAccountCreationOptions; use key_wallet::wallet::managed_wallet_info::wallet_info_interface::WalletInfoInterface; @@ -332,7 +331,6 @@ fn b4_empty_core_state_is_ok() { #[test] fn b5_last_applied_chain_lock_round_trips() { use dashcore::ephemerealdata::chain_lock::ChainLock; - use dashcore::hashes::Hash; use dashcore::BlockHash; let (persister, _tmp, path) = fresh_persister(); diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_error_classification.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_error_classification.rs index 36d46cb6073..a67f27e8080 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_error_classification.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_error_classification.rs @@ -11,7 +11,6 @@ use std::path::PathBuf; -use dashcore::hashes::Hash; use platform_wallet::changeset::PersistenceError; use platform_wallet_storage::sqlite::error::AutoBackupOperation; use platform_wallet_storage::sqlite::util::safe_cast::SafeCastTarget; diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_identity_key_restore.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_identity_key_restore.rs index cdf8a10cbfb..56c2ef0ba6b 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_identity_key_restore.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_identity_key_restore.rs @@ -43,6 +43,7 @@ use platform_wallet_storage::sqlite::schema::{identity_keys, identity_scan_state use platform_wallet_storage::{ LoadCtx, SqlitePersister, SqlitePersisterConfig, WalletStorageError, }; +use zeroize::Zeroizing; const MNEMONIC_A: &str = "abandon abandon abandon abandon abandon abandon \ abandon abandon abandon abandon abandon about"; @@ -207,12 +208,12 @@ struct Noop; impl platform_wallet::events::EventHandler for Noop {} impl PlatformEventHandler for Noop {} -fn seed(phrase: &str) -> [u8; 64] { +fn seed(phrase: &str) -> Zeroizing<[u8; 64]> { Mnemonic::from_phrase(phrase).unwrap().to_seed("") } fn master(phrase: &str) -> ExtendedPrivKey { - ExtendedPrivKey::new_master(NET, &seed(phrase)).unwrap() + ExtendedPrivKey::new_master(NET, &*seed(phrase)).unwrap() } /// The DIP-9 ECDSA auth key a wallet derives at `(identity_index, key_index)`. diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_load_reconstruction.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_load_reconstruction.rs index 4206b1db3bc..b473251becb 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_load_reconstruction.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_load_reconstruction.rs @@ -1064,7 +1064,6 @@ fn received_then_matching_sent_promotes_to_established() { /// asset locks bucketed by (wallet, account, outpoint). #[test] fn tc_p4_005_load_asset_locks_bucketed() { - use dashcore::hashes::Hash; use dashcore::{OutPoint, Transaction, Txid}; use key_wallet::wallet::managed_wallet_info::asset_lock_builder::AssetLockFundingType; use platform_wallet::changeset::{AssetLockChangeSet, AssetLockEntry}; @@ -1340,7 +1339,6 @@ fn tc_p4_008b_contacts_corruption_is_hard_error() { /// typed decode error. An intact wallet still decodes cleanly. #[test] fn tc_p4_008c_asset_locks_corruption_is_hard_error() { - use dashcore::hashes::Hash; use dashcore::{OutPoint, Transaction, Txid}; use key_wallet::wallet::managed_wallet_info::asset_lock_builder::AssetLockFundingType; use platform_wallet::changeset::{AssetLockChangeSet, AssetLockEntry}; diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_load_wiring.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_load_wiring.rs index 24c5cc9f9a6..36266ef1e73 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_load_wiring.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_load_wiring.rs @@ -66,10 +66,7 @@ fn c1_load_populates_keyless_wallet_payload() { // A UTXO so the balance is non-zero. let utxo = key_wallet::Utxo { outpoint: dashcore::OutPoint { - txid: { - use dashcore::hashes::Hash; - dashcore::Txid::from_byte_array([0x99; 32]) - }, + txid: { dashcore::Txid::from_byte_array([0x99; 32]) }, vout: 0, }, txout: dashcore::TxOut { diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_migration_execution.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_migration_execution.rs index a25039593a0..2a4f6d242ee 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_migration_execution.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_migration_execution.rs @@ -239,8 +239,6 @@ fn v4_2_dev_database_opens_and_migrates_forward() { /// pre-V014 `core_utxos` row. #[test] fn v014_backfills_recordless_confirmed_utxo_height() { - use dashcore::hashes::Hash; - let tmp = common::secure_tempdir().unwrap(); let path = tmp.path().join("recordless-v013.db"); let wallet_id = wid(0xC3); diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_money_column_overflow_on_read.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_money_column_overflow_on_read.rs index 5b1e9254aa9..f815db36a4b 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_money_column_overflow_on_read.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_money_column_overflow_on_read.rs @@ -86,7 +86,6 @@ fn platform_address_balance_negative_on_disk_errors_on_load() { /// reporting a sign-extended u64 amount for live funds. #[test] fn core_utxo_value_negative_on_disk_errors_on_read() { - use dashcore::hashes::Hash; use platform_wallet_storage::sqlite::schema::{blob, core_state}; let (persister, _tmp, _path) = fresh_persister(); let w = wid(0xE2); diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_persist_roundtrip.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_persist_roundtrip.rs index d13e50be66f..c33c3959fbc 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_persist_roundtrip.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_persist_roundtrip.rs @@ -385,7 +385,6 @@ fn tc014_account_registration_roundtrip() { /// the bincode-serde payload in `asset_locks.lifecycle_blob`. #[test] fn tc010_asset_lock_roundtrip() { - use dashcore::hashes::Hash; use dashcore::{OutPoint, Transaction, Txid}; use key_wallet::wallet::managed_wallet_info::asset_lock_builder::AssetLockFundingType; use platform_wallet::changeset::{AssetLockChangeSet, AssetLockEntry}; @@ -452,7 +451,6 @@ fn tc010_asset_lock_roundtrip() { /// lifecycle blob, chain proof included. #[test] fn tc010b_recovered_from_chain_lock_roundtrip() { - use dashcore::hashes::Hash; use dashcore::{OutPoint, Transaction, Txid}; use dpp::identity::state_transition::asset_lock_proof::chain::ChainAssetLockProof; use key_wallet::wallet::managed_wallet_info::asset_lock_builder::AssetLockFundingType; @@ -526,7 +524,6 @@ fn tc010b_recovered_from_chain_lock_roundtrip() { /// landing over `RecoveredFromChain`. #[test] fn tc010c_stale_recovery_snapshot_cannot_regress_consumed_row() { - use dashcore::hashes::Hash; use dashcore::{OutPoint, Transaction, Txid}; use dpp::identity::state_transition::asset_lock_proof::chain::ChainAssetLockProof; use key_wallet::wallet::managed_wallet_info::asset_lock_builder::AssetLockFundingType; diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_pool_reader.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_pool_reader.rs index 6d98b1f39de..95434bd798e 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_pool_reader.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_pool_reader.rs @@ -21,7 +21,6 @@ use crate::common; use common::{ensure_wallet_meta, fresh_persister, wid}; use dashcore::address::Payload; -use dashcore::hashes::Hash; use dashcore::{Address, Network, PubkeyHash}; use key_wallet::account::{AccountType, StandardAccountType}; use key_wallet::managed_account::address_pool::{AddressPoolType, AddressState}; diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_recovery_mode.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_recovery_mode.rs index a2f518dcf97..f99dd4d9310 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_recovery_mode.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_recovery_mode.rs @@ -11,7 +11,6 @@ use crate::common; use common::{ensure_wallet_meta, fresh_persister, fresh_recovery_persister, wid}; -use dashcore::hashes::Hash; use dashcore::Txid; use dpp::identity::accessors::IdentityGettersV0; use platform_wallet::changeset::{ diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_sent_payment_verdict_durability.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_sent_payment_verdict_durability.rs index f0911a20c3f..b4ce626b3ed 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_sent_payment_verdict_durability.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_sent_payment_verdict_durability.rs @@ -52,7 +52,6 @@ const CONTACT: [u8; 32] = [0xB7; 32]; /// under. A dummy txid is enough — the verdict path keys on the display /// string, and nothing here inspects the transaction itself. fn loser_txid() -> dashcore::Txid { - use dashcore::hashes::Hash as _; dashcore::Txid::from_byte_array([0x5f; 32]) } @@ -145,10 +144,7 @@ async fn a_swept_sent_payments_failed_verdict_survives_a_reopen() { tx.send(WalletEvent::TransactionsSwept { wallet_id, txids: vec![loser_txid()], - superseded_by: { - use dashcore::hashes::Hash as _; - dashcore::Txid::from_byte_array([0x77; 32]) - }, + superseded_by: { dashcore::Txid::from_byte_array([0x77; 32]) }, winner_mined_height: Some(1_499_050), released_outpoints: Vec::new(), balance: key_wallet::WalletCoreBalance::default(), diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_structural_hardening.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_structural_hardening.rs index 414f37074d4..fdbb97788c7 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_structural_hardening.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_structural_hardening.rs @@ -99,17 +99,13 @@ fn platform_addr_mixed_wallet_rejected() { fn p2pkh(byte: u8) -> Address { use dashcore::address::Payload; - use dashcore::hashes::Hash; use dashcore::PubkeyHash; let hash = PubkeyHash::from_byte_array([byte; 20]); Address::new(Network::Testnet, Payload::PubkeyHash(hash)) } fn make_utxo(addr: &Address, vout: u32, value: u64) -> Utxo { - let outpoint = OutPoint::new( - Txid::from_raw_hash(dashcore::hashes::Hash::all_zeros()), - vout, - ); + let outpoint = OutPoint::new(Txid::all_zeros(), vout); let txout = TxOut { value, script_pubkey: addr.script_pubkey(), @@ -367,7 +363,7 @@ fn asset_lock_typed_vs_blob_mismatch_rejected() { // Forge a blob whose internal account_index disagrees with the // typed column we'll insert it under. - let outpoint = OutPoint::new(Txid::from_raw_hash(dashcore::hashes::Hash::all_zeros()), 7); + let outpoint = OutPoint::new(Txid::all_zeros(), 7); let entry = AssetLockEntry { out_point: outpoint, transaction: DashTx { diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_transaction_sweeps.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_transaction_sweeps.rs index 8e13fdabbed..53e4fa65026 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_transaction_sweeps.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_transaction_sweeps.rs @@ -12,7 +12,6 @@ use crate::common; use common::{ensure_wallet_meta, fresh_persister, wid, SqlitePersister, SqlitePersisterConfig}; -use dashcore::hashes::Hash; use dashcore::{Address, Network, OutPoint, Transaction, TxIn, TxOut, Txid}; use key_wallet::account::{AccountType, StandardAccountType}; use key_wallet::managed_account::transaction_record::{TransactionDirection, TransactionRecord}; @@ -31,7 +30,6 @@ const WINNER_HEIGHT: u32 = 400; fn p2pkh(byte: u8) -> Address { use dashcore::address::Payload; - use dashcore::hashes::Hash; use dashcore::PubkeyHash; let hash = PubkeyHash::from_byte_array([byte; 20]); Address::new(Network::Testnet, Payload::PubkeyHash(hash)) diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_used_core_addresses.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_used_core_addresses.rs index 131b38d72bf..1909bbca28c 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_used_core_addresses.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_used_core_addresses.rs @@ -71,10 +71,7 @@ fn spent_utxo_address_is_marked_used() { // spent = 1 and contributes no balance. let utxo = key_wallet::Utxo { outpoint: dashcore::OutPoint { - txid: { - use dashcore::hashes::Hash; - dashcore::Txid::from_byte_array([0x99; 32]) - }, + txid: { dashcore::Txid::from_byte_array([0x99; 32]) }, vout: 0, }, txout: dashcore::TxOut { diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_version_bump.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_version_bump.rs index 73d2437db0b..d51d95f7e35 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_version_bump.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_version_bump.rs @@ -214,7 +214,6 @@ fn single_domain_changeset(domain: Domain) -> PlatformWalletChangeSet { }]; } Domain::Invitations => { - use dashcore::hashes::Hash; use dashcore::{OutPoint, Txid}; use platform_wallet::changeset::{ InvitationChangeSet, InvitationEntry, InvitationStatus, @@ -342,7 +341,6 @@ fn contact_request_entry(sender: u8, recipient: u8) -> ContactRequestEntry { } fn asset_lock_changeset() -> AssetLockChangeSet { - use dashcore::hashes::Hash; use dashcore::{OutPoint, Transaction, Txid}; use key_wallet::wallet::managed_wallet_info::asset_lock_builder::AssetLockFundingType; use platform_wallet::changeset::AssetLockEntry; diff --git a/packages/rs-platform-wallet/examples/dpns_marketplace_testnet.rs b/packages/rs-platform-wallet/examples/dpns_marketplace_testnet.rs index 440e00a5d65..88e211a70bf 100644 --- a/packages/rs-platform-wallet/examples/dpns_marketplace_testnet.rs +++ b/packages/rs-platform-wallet/examples/dpns_marketplace_testnet.rs @@ -30,7 +30,7 @@ use std::sync::Arc; use dash_sdk::sdk::{Address, AddressList}; use dash_sdk::SdkBuilder; -use dashcore::hashes::{hash160, Hash}; +use dashcore::hashes::hash160; use dashcore::Network; use dpp::fee::Credits; use dpp::identity::accessors::IdentityGettersV0; @@ -585,7 +585,7 @@ async fn run() -> Result<(), Box> { let idw = wallet.identity(); let mnemonic: key_wallet::Mnemonic = phrase.parse()?; - let master = ExtendedPrivKey::new_master(key_wallet::Network::Testnet, &mnemonic.to_seed(""))?; + let master = ExtendedPrivKey::new_master(key_wallet::Network::Testnet, &*mnemonic.to_seed(""))?; match std::env::var("DPNS_PHASE").as_deref() { Ok("run") => run_flow(idw, &master).await, diff --git a/packages/rs-platform-wallet/src/changeset/changeset.rs b/packages/rs-platform-wallet/src/changeset/changeset.rs index e8beae1b385..36d3faeef7c 100644 --- a/packages/rs-platform-wallet/src/changeset/changeset.rs +++ b/packages/rs-platform-wallet/src/changeset/changeset.rs @@ -2512,8 +2512,6 @@ mod serde_compat_tests { /// it. #[test] fn a_populated_sweep_batch_round_trips() { - use dashcore::hashes::Hash; - let loser = Txid::from_byte_array([0x11; 32]); let winner = Txid::from_byte_array([0x22; 32]); let released = OutPoint::new(Txid::from_byte_array([0x33; 32]), 7); @@ -2731,7 +2729,6 @@ mod tests { /// Consumed — while Consumed itself must still land over anything. #[test] fn asset_lock_merge_never_regresses_consumed() { - use dashcore::hashes::Hash; use key_wallet::wallet::managed_wallet_info::asset_lock_builder::AssetLockFundingType; let outpoint = OutPoint { @@ -3736,7 +3733,6 @@ mod tests { #[cfg(test)] mod utxo_credit_verdict_merge_tests { use super::*; - use dashcore::hashes::Hash; fn outpoint(byte: u8) -> OutPoint { OutPoint { diff --git a/packages/rs-platform-wallet/src/changeset/core_bridge.rs b/packages/rs-platform-wallet/src/changeset/core_bridge.rs index ff7fbe734f8..407ad4325d5 100644 --- a/packages/rs-platform-wallet/src/changeset/core_bridge.rs +++ b/packages/rs-platform-wallet/src/changeset/core_bridge.rs @@ -2745,7 +2745,6 @@ mod swept_transaction_projection_tests { //! and a sweep that never reaches it leaves the dead rows on disk. use super::*; - use dashcore::hashes::Hash; use dashcore::Txid; use key_wallet::WalletCoreBalance; use key_wallet_manager::WalletManager; @@ -3050,7 +3049,6 @@ mod sent_payment_verdict_tests { use super::*; use dashcore::ephemerealdata::instant_lock::InstantLock; - use dashcore::hashes::Hash as _; use dashcore::{BlockHash, Transaction, TxIn, Txid}; use dpp::identity::{Identity, IdentityV0}; use dpp::prelude::Identifier; @@ -3478,7 +3476,6 @@ mod contact_watch_only_projection_tests { use crate::wallet::identity::IdentityManager; use dashcore::bls_sig_utils::BLSSignature; use dashcore::ephemerealdata::chain_lock::ChainLock; - use dashcore::hashes::Hash; use dashcore::{Address as DashAddress, BlockHash, Txid}; use dashcore::{OutPoint, ScriptBuf, Transaction, TxIn, TxOut, Witness}; use key_wallet::account::{Account, AccountType, StandardAccountType}; @@ -5079,7 +5076,6 @@ mod usage_delta_tests { //! as the event adapter does at runtime. use super::*; - use dashcore::hashes::Hash; use dashcore::{BlockHash, OutPoint, ScriptBuf, Transaction, TxIn, TxOut, Txid, Witness}; use key_wallet::account::{AccountType, StandardAccountType}; use key_wallet::test_utils::TestWalletContext; @@ -5323,7 +5319,6 @@ mod tests { /// enforce the address/script pairing. #[test] fn spent_utxos_carry_the_real_script_of_the_address_they_spend() { - use dashcore::hashes::Hash; use dashcore::{OutPoint, Transaction, TxIn, Txid}; use key_wallet::account::{AccountType, StandardAccountType}; use key_wallet::managed_account::transaction_record::{ @@ -7166,7 +7161,6 @@ mod tests { /// A `TransactionsSwept` event for a helper below. fn swept_event(wallet_id: WalletId, txid_byte: u8, superseded_by_byte: u8) -> WalletEvent { - use dashcore::hashes::Hash as _; WalletEvent::TransactionsSwept { wallet_id, txids: vec![dashcore::Txid::from_byte_array([txid_byte; 32])], @@ -7380,7 +7374,6 @@ mod tests { /// mirror after a wipe & recover. #[tokio::test] async fn block_processed_asset_lock_record_reconstructs_and_persists() { - use dashcore::hashes::Hash as _; use key_wallet::account::account_type::StandardAccountType; use key_wallet::account::AccountType; use key_wallet::managed_account::transaction_record::{ @@ -7509,7 +7502,6 @@ mod tests { /// every store mirrors it forever. #[tokio::test] async fn transactions_swept_removes_the_tracked_asset_lock_it_funded() { - use dashcore::hashes::Hash as _; use key_wallet::account::account_type::StandardAccountType; use key_wallet::account::AccountType; use key_wallet::managed_account::transaction_record::{ @@ -7659,7 +7651,6 @@ mod tests { /// funding transaction survived. #[tokio::test] async fn a_reinstating_reconstruction_folded_after_a_sweep_cancels_its_tombstone() { - use dashcore::hashes::Hash as _; use key_wallet::account::account_type::StandardAccountType; use key_wallet::account::AccountType; use key_wallet::managed_account::transaction_record::{ @@ -7787,7 +7778,6 @@ mod tests { use std::sync::Arc; use dashcore::ephemerealdata::chain_lock::ChainLock; - use dashcore::hashes::Hash as _; use key_wallet::account::account_type::StandardAccountType; use key_wallet::account::AccountType; use key_wallet::managed_account::transaction_record::{ @@ -7938,7 +7928,6 @@ mod tests { /// predicate considers both sub-changesets. #[test] fn asset_locks_only_batch_reaches_store() { - use dashcore::hashes::Hash as _; use dashcore::OutPoint; use key_wallet::wallet::managed_wallet_info::asset_lock_builder::AssetLockFundingType; @@ -8263,7 +8252,6 @@ mod tests { /// when the missing piece is the host's sweep capability. #[test] fn undeclared_sweep_capability_reports_the_watermark_as_frozen_not_rejected() { - use dashcore::hashes::Hash as _; let wallet_id = [9u8; 32]; let (obs_tx, mut obs_rx) = unbounded_channel(); // No capabilities declared, store() succeeds. @@ -8802,7 +8790,6 @@ mod utxo_credit_verdict_tests { //! post-mutation state, as the event adapter does at runtime. use super::*; - use dashcore::hashes::Hash; use dashcore::{BlockHash, OutPoint, ScriptBuf, Transaction, TxIn, TxOut, Txid, Witness}; use key_wallet::test_utils::TestWalletContext; use key_wallet::transaction_checking::{BlockInfo, WalletTransactionChecker}; diff --git a/packages/rs-platform-wallet/src/error.rs b/packages/rs-platform-wallet/src/error.rs index 2a3c9432751..e99ec559002 100644 --- a/packages/rs-platform-wallet/src/error.rs +++ b/packages/rs-platform-wallet/src/error.rs @@ -626,6 +626,13 @@ pub enum PlatformWalletError { )] AssetLockInsufficientFunds { available: u64, required: u64 }, + /// Only coins that are not final yet would fund the asset lock: `waiting` + /// duffs of them are neither confirmed nor InstantSend-locked. Unlike + /// [`Self::AssetLockInsufficientFunds`], the build can succeed once they + /// become final. Nothing was built for the wire. + #[error("asset lock funds awaiting finality: {waiting} duffs of coins not final yet")] + AssetLockFundsAwaitingFinality { waiting: u64 }, + /// An asset lock, whole-balance or of a fixed amount, needs more inputs /// than an asset lock may carry (`max_asset_lock_transaction_inputs`, 100: /// Dash Core relay policy and Platform consensus alike). Nothing was built diff --git a/packages/rs-platform-wallet/src/events.rs b/packages/rs-platform-wallet/src/events.rs index c329c5a32f5..b72032687ee 100644 --- a/packages/rs-platform-wallet/src/events.rs +++ b/packages/rs-platform-wallet/src/events.rs @@ -13,6 +13,8 @@ use std::sync::Arc; use arc_swap::ArcSwap; +use dash_spv::{SyncEvent, SyncProgress}; + pub use dash_spv::EventHandler; pub use key_wallet_manager::WalletEvent; @@ -196,7 +198,7 @@ impl PlatformEventManager { } impl EventHandler for PlatformEventManager { - fn on_sync_event(&self, event: &dash_spv::sync::SyncEvent) { + fn on_sync_event(&self, event: &SyncEvent) { let handlers = self.handlers.load(); for h in handlers.iter() { h.on_sync_event(event); @@ -210,7 +212,7 @@ impl EventHandler for PlatformEventManager { } } - fn on_progress(&self, progress: &dash_spv::sync::SyncProgress) { + fn on_progress(&self, progress: &SyncProgress) { let handlers = self.handlers.load(); for h in handlers.iter() { h.on_progress(progress); diff --git a/packages/rs-platform-wallet/src/manager/accessors.rs b/packages/rs-platform-wallet/src/manager/accessors.rs index bc939526561..6915cccf86c 100644 --- a/packages/rs-platform-wallet/src/manager/accessors.rs +++ b/packages/rs-platform-wallet/src/manager/accessors.rs @@ -1868,7 +1868,6 @@ mod txo_inventory_tests { use std::collections::BTreeMap; use std::sync::Arc; - use dashcore::hashes::Hash; use dashcore::{BlockHash, OutPoint, ScriptBuf, Transaction, TxIn, TxOut, Txid, Witness}; use key_wallet::account::{AccountType, StandardAccountType}; use key_wallet::test_utils::TestWalletContext; diff --git a/packages/rs-platform-wallet/src/manager/mod.rs b/packages/rs-platform-wallet/src/manager/mod.rs index d0f5e21222a..63de4e4d49b 100644 --- a/packages/rs-platform-wallet/src/manager/mod.rs +++ b/packages/rs-platform-wallet/src/manager/mod.rs @@ -1408,8 +1408,6 @@ mod tests { /// because nothing else on the fan-out calls `observe_spent`. #[tokio::test] async fn constructor_wires_spend_observation_into_the_event_fanout() { - use dashcore::hashes::Hash as _; - let mgr = make_manager(); // A funded wallet registered in the manager's live wallets map — the diff --git a/packages/rs-platform-wallet/src/manager/startup.rs b/packages/rs-platform-wallet/src/manager/startup.rs index 846f48015f0..dbc38ff2c63 100644 --- a/packages/rs-platform-wallet/src/manager/startup.rs +++ b/packages/rs-platform-wallet/src/manager/startup.rs @@ -1031,6 +1031,7 @@ impl PlatformWalletManager #[cfg(test)] mod tests { use super::*; + use zeroize::Zeroizing; fn identity() -> Identifier { Identifier::from([7u8; 32]) @@ -1406,7 +1407,7 @@ mod tests { } } - fn seed_for(phrase: &str) -> [u8; 64] { + fn seed_for(phrase: &str) -> Zeroizing<[u8; 64]> { use key_wallet::mnemonic::Mnemonic; Mnemonic::from_phrase(phrase) .expect("valid test mnemonic") @@ -1515,8 +1516,10 @@ mod tests { assert_eq!(receiving_account_count(&manager, &wallet_id).await, 0); assert_eq!(drainable(&manager, &wallet_id).await, 1); - let foreign = - SeedCryptoProvider::from_seed(seed_for(FOREIGN_MNEMONIC), key_wallet::Network::Testnet); + let foreign = SeedCryptoProvider::from_seed( + *seed_for(FOREIGN_MNEMONIC), + key_wallet::Network::Testnet, + ); let outcome = manager .start_wallet_subsystems( &wallet_id, @@ -1555,7 +1558,7 @@ mod tests { let (manager, wallet_id) = manager_with_queued_contact_crypto().await; let owning = - SeedCryptoProvider::from_seed(seed_for(OWNING_MNEMONIC), key_wallet::Network::Testnet); + SeedCryptoProvider::from_seed(*seed_for(OWNING_MNEMONIC), key_wallet::Network::Testnet); let outcome = manager .start_wallet_subsystems( @@ -1602,7 +1605,7 @@ mod tests { let (manager, wallet_id) = manager_with_queued_contact_crypto().await; establish_queued_contact(&manager, wallet_id).await; let owning = - SeedCryptoProvider::from_seed(seed_for(OWNING_MNEMONIC), key_wallet::Network::Testnet); + SeedCryptoProvider::from_seed(*seed_for(OWNING_MNEMONIC), key_wallet::Network::Testnet); let outcome = manager .start_wallet_subsystems( @@ -1793,7 +1796,7 @@ mod tests { let (manager, wallet_id) = manager_with_queued_contact_crypto_on(backend.clone()).await; establish_queued_contact(&manager, wallet_id).await; let owning = - SeedCryptoProvider::from_seed(seed_for(OWNING_MNEMONIC), key_wallet::Network::Testnet); + SeedCryptoProvider::from_seed(*seed_for(OWNING_MNEMONIC), key_wallet::Network::Testnet); let outcome = manager .start_wallet_subsystems( @@ -1831,7 +1834,7 @@ mod tests { establish_queued_contact(&manager, wallet_id).await; *backend.stall_account_round.lock().unwrap() = Some(budget + Duration::from_millis(500)); let owning = - SeedCryptoProvider::from_seed(seed_for(OWNING_MNEMONIC), key_wallet::Network::Testnet); + SeedCryptoProvider::from_seed(*seed_for(OWNING_MNEMONIC), key_wallet::Network::Testnet); let outcome = manager .start_wallet_subsystems( @@ -1915,8 +1918,10 @@ mod tests { } assert_eq!(drainable(&manager, &wallet_id).await, 0); - let foreign = - SeedCryptoProvider::from_seed(seed_for(FOREIGN_MNEMONIC), key_wallet::Network::Testnet); + let foreign = SeedCryptoProvider::from_seed( + *seed_for(FOREIGN_MNEMONIC), + key_wallet::Network::Testnet, + ); let outcome = manager .start_wallet_subsystems( &wallet_id, @@ -1996,7 +2001,7 @@ mod tests { // And the sequence must not record it as a sync that ran. let owning = - SeedCryptoProvider::from_seed(seed_for(OWNING_MNEMONIC), key_wallet::Network::Testnet); + SeedCryptoProvider::from_seed(*seed_for(OWNING_MNEMONIC), key_wallet::Network::Testnet); let outcome = manager .start_wallet_subsystems( &wallet_id, @@ -2048,7 +2053,7 @@ mod tests { let (manager, wallet_id) = manager_with_queued_contact_crypto().await; let owning = - SeedCryptoProvider::from_seed(seed_for(OWNING_MNEMONIC), key_wallet::Network::Testnet); + SeedCryptoProvider::from_seed(*seed_for(OWNING_MNEMONIC), key_wallet::Network::Testnet); // The wallet arrives with an unanswered index on record — the verdict // an abandoned scan leaves behind (index 0 probed, unanswered), diff --git a/packages/rs-platform-wallet/src/manager/wallet_lifecycle.rs b/packages/rs-platform-wallet/src/manager/wallet_lifecycle.rs index 2fc4e269785..02a91ece586 100644 --- a/packages/rs-platform-wallet/src/manager/wallet_lifecycle.rs +++ b/packages/rs-platform-wallet/src/manager/wallet_lifecycle.rs @@ -1366,15 +1366,18 @@ mod register_wallet_duplicate_tests { let network = Network::Testnet; let mnemonic = Mnemonic::from_phrase(TEST_MNEMONIC).expect("valid test mnemonic"); let seed_bytes = mnemonic.to_seed(""); - let create = |manager: Arc>| async move { - manager - .create_wallet_from_seed_bytes( - network, - &seed_bytes, - WalletAccountCreationOptions::Default, - Some(0), - ) - .await + let create = |manager: Arc>| { + let seed_bytes = seed_bytes.clone(); + async move { + manager + .create_wallet_from_seed_bytes( + network, + &seed_bytes, + WalletAccountCreationOptions::Default, + Some(0), + ) + .await + } }; let wallet_id = create(Arc::clone(&manager)) .await @@ -1431,15 +1434,18 @@ mod register_wallet_duplicate_tests { let network = Network::Testnet; let mnemonic = Mnemonic::from_phrase(TEST_MNEMONIC).expect("valid test mnemonic"); let seed_bytes = mnemonic.to_seed(""); - let create = |manager: Arc>| async move { - manager - .create_wallet_from_seed_bytes( - network, - &seed_bytes, - WalletAccountCreationOptions::Default, - Some(0), - ) - .await + let create = |manager: Arc>| { + let seed_bytes = seed_bytes.clone(); + async move { + manager + .create_wallet_from_seed_bytes( + network, + &seed_bytes, + WalletAccountCreationOptions::Default, + Some(0), + ) + .await + } }; let wallet_id = create(Arc::clone(&manager)) @@ -1522,7 +1528,6 @@ mod register_wallet_duplicate_tests { /// at all. #[tokio::test] async fn a_recreated_wallet_inherits_the_pending_fences_of_the_generation_it_replaces() { - use dashcore::hashes::Hash; use dashcore::{OutPoint, ScriptBuf, Transaction, TxIn, Txid, Witness}; let manager = make_manager(); @@ -1601,7 +1606,6 @@ mod register_wallet_duplicate_tests { /// must never fence another wallet's inputs. #[tokio::test] async fn fences_do_not_leak_between_different_wallets() { - use dashcore::hashes::Hash; use dashcore::{OutPoint, ScriptBuf, Transaction, TxIn, Txid, Witness}; let manager = make_manager(); @@ -1673,6 +1677,7 @@ mod persister_error_tests { use key_wallet::wallet::initialization::WalletAccountCreationOptions; use key_wallet::Network; use tracing::Level; + use zeroize::Zeroizing; use crate::changeset::{ ClientStartState, PersistenceError, PersistenceErrorKind, PlatformWalletChangeSet, @@ -1793,7 +1798,7 @@ mod persister_error_tests { Arc::new(PlatformWalletManager::new(sdk, persister, event_handler)) } - fn seed_bytes() -> [u8; 64] { + fn seed_bytes() -> Zeroizing<[u8; 64]> { Mnemonic::from_phrase(TEST_MNEMONIC) .expect("valid test mnemonic") .to_seed("") diff --git a/packages/rs-platform-wallet/src/masternode/list.rs b/packages/rs-platform-wallet/src/masternode/list.rs index 54556903263..53574859a3b 100644 --- a/packages/rs-platform-wallet/src/masternode/list.rs +++ b/packages/rs-platform-wallet/src/masternode/list.rs @@ -159,7 +159,6 @@ pub(crate) mod test_support { //! locator and update-service tests build lists the same way. use super::{EntryMasternodeType, MasternodeListEntry, MasternodeListSummary}; use dashcore::bls_sig_utils::BLSPublicKey; - use dashcore::hashes::Hash; use dashcore::sml::masternode_list_entry::MasternodeNetInfo; use dashcore::{PlatformNodeId, ProTxHash, PubkeyHash}; use std::net::{IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4}; @@ -234,7 +233,6 @@ mod tests { use super::test_support::{evonode, ip, masternode}; use super::*; use dashcore::bls_sig_utils::BLSPublicKey; - use dashcore::hashes::Hash; use dashcore::sml::masternode_list_entry::MasternodeNetInfo; use dashcore::{BlockHash, PlatformNodeId, ProTxHash, PubkeyHash}; use std::net::{Ipv4Addr, SocketAddrV4}; diff --git a/packages/rs-platform-wallet/src/masternode/locator.rs b/packages/rs-platform-wallet/src/masternode/locator.rs index 380664cf904..935a0fcdf56 100644 --- a/packages/rs-platform-wallet/src/masternode/locator.rs +++ b/packages/rs-platform-wallet/src/masternode/locator.rs @@ -35,7 +35,7 @@ use std::sync::Arc; use dash_sdk::platform::types::identity::NonUniquePublicKeyHashQuery; use dash_sdk::platform::Fetch; -use dashcore::hashes::{hash160, Hash}; +use dashcore::hashes::hash160; use dashcore::{Network, PrivateKey}; use dpp::bls::{PublicKey as BlsPublicKey, SecretKey as BlsSecretKey}; use dpp::ed25519_dalek::SigningKey; diff --git a/packages/rs-platform-wallet/src/masternode/record.rs b/packages/rs-platform-wallet/src/masternode/record.rs index 9829a939593..ce997551f75 100644 --- a/packages/rs-platform-wallet/src/masternode/record.rs +++ b/packages/rs-platform-wallet/src/masternode/record.rs @@ -1370,7 +1370,6 @@ mod tests { /// that pays an empty script. #[test] fn should_never_take_an_empty_script_as_the_owner_payout() { - use dashcore::hashes::Hash; use dashcore::{PubkeyHash, ScriptBuf}; let empty = ScriptBuf::new(); diff --git a/packages/rs-platform-wallet/src/masternode/tracked.rs b/packages/rs-platform-wallet/src/masternode/tracked.rs index 7350000a7f5..c79ebb8c6bf 100644 --- a/packages/rs-platform-wallet/src/masternode/tracked.rs +++ b/packages/rs-platform-wallet/src/masternode/tracked.rs @@ -30,7 +30,6 @@ use std::collections::BTreeMap; use std::time::{SystemTime, UNIX_EPOCH}; use dash_sdk::platform::Fetch; -use dashcore::hashes::Hash; use dashcore::transaction::special_transaction::provider_registration::ProviderMasternodeType; use dashcore::transaction::TransactionPayload; use dashcore::{Address as DashAddress, Network}; diff --git a/packages/rs-platform-wallet/src/masternode/update_service.rs b/packages/rs-platform-wallet/src/masternode/update_service.rs index 286cfdefbeb..828d158e6b5 100644 --- a/packages/rs-platform-wallet/src/masternode/update_service.rs +++ b/packages/rs-platform-wallet/src/masternode/update_service.rs @@ -26,7 +26,7 @@ use dashcore::blockdata::transaction::special_transaction::{ }; use dashcore::bls_sig_utils::BLSSignature; use dashcore::hash_types::{InputsHash, SpecialTransactionPayloadHash}; -use dashcore::hashes::Hash; +use dashcore::hashes::sha256d; use dashcore::sml::masternode_list_entry::net_info::{ Bip155Network, ExtNetInfo, NetInfoEntry, NetInfoPurpose, }; @@ -736,13 +736,14 @@ pub(crate) fn finalize_update_service_payload( // Encoding fails when the payload version and the address form // disagree. `base_payload_hash` panics on that, and across the FFI a // panic aborts the host app, so hash here and return the error. - let mut engine = SpecialTransactionPayloadHash::engine(); + let mut engine = sha256d::Hash::engine(); finalized .base_payload_data_encode(&mut engine) .map_err(|e| { BuilderError::InvalidData(format!("the ProUpServTx payload cannot be encoded: {e}")) })?; - let sign_hash = SpecialTransactionPayloadHash::from_engine(engine); + let sign_hash = + SpecialTransactionPayloadHash::from_raw_hash(sha256d::Hash::from_engine(engine)); let secret = BlsSecretKey::from_be_bytes(operator_secret).ok_or_else(|| { BuilderError::SigningFailed("the operator key is not a valid BLS secret".into()) diff --git a/packages/rs-platform-wallet/src/spv/mod.rs b/packages/rs-platform-wallet/src/spv/mod.rs index 38e1bb05dfa..5160b435ad7 100644 --- a/packages/rs-platform-wallet/src/spv/mod.rs +++ b/packages/rs-platform-wallet/src/spv/mod.rs @@ -6,9 +6,8 @@ pub use runtime::{SpvQuorumPublicKey, SpvRuntime}; // Re-exports so the FFI layer can build sync configs and read progress // without depending on `dash-spv` or `tokio-util` directly. -pub use dash_spv::sync::{ - BlockHeadersProgress, FilterHeadersProgress, FiltersProgress, MasternodesProgress, - ProgressPercentage, SyncProgress, SyncState, +pub use dash_spv::{ + BlockHeadersProgress, ClientConfig, DevnetConfig, FilterHeadersProgress, FiltersProgress, + MasternodesProgress, ProgressPercentage, SyncProgress, SyncState, }; -pub use dash_spv::{ClientConfig, DevnetConfig}; pub use tokio_util::sync::CancellationToken; diff --git a/packages/rs-platform-wallet/src/spv/peers.rs b/packages/rs-platform-wallet/src/spv/peers.rs index 2b8afa4d43c..f2700b806b4 100644 --- a/packages/rs-platform-wallet/src/spv/peers.rs +++ b/packages/rs-platform-wallet/src/spv/peers.rs @@ -145,7 +145,6 @@ mod tests { use std::net::{Ipv4Addr, SocketAddrV4}; use dashcore::bls_sig_utils::BLSPublicKey; - use dashcore::hashes::Hash; use dashcore::sml::masternode_list_entry::{MasternodeListEntry, MasternodeNetInfo}; use dashcore::{BlockHash, PlatformNodeId, ProTxHash, PubkeyHash}; @@ -233,16 +232,14 @@ mod tests { fn peers_updated_replaces_snapshot_and_clear_empties_it() { let tracker = PeerTracker::default(); tracker.on_network_event(&NetworkEvent::PeersUpdated { - connected_count: 1, addresses: vec![socket([1, 1, 1, 1], 9999)], - best_height: Some(100), + best_height: 100, }); assert_eq!(tracker.snapshot(), vec![socket([1, 1, 1, 1], 9999)]); tracker.on_network_event(&NetworkEvent::PeersUpdated { - connected_count: 1, addresses: vec![socket([2, 2, 2, 2], 9999)], - best_height: Some(100), + best_height: 100, }); assert_eq!(tracker.snapshot(), vec![socket([2, 2, 2, 2], 9999)]); @@ -264,9 +261,8 @@ mod tests { assert!(tracker.connected.is_poisoned()); tracker.on_network_event(&NetworkEvent::PeersUpdated { - connected_count: 1, addresses: vec![socket([1, 1, 1, 1], 9999)], - best_height: Some(100), + best_height: 100, }); assert_eq!(tracker.snapshot(), vec![socket([1, 1, 1, 1], 9999)]); diff --git a/packages/rs-platform-wallet/src/spv/runtime.rs b/packages/rs-platform-wallet/src/spv/runtime.rs index 7ee912d6710..2f4cb348f2e 100644 --- a/packages/rs-platform-wallet/src/spv/runtime.rs +++ b/packages/rs-platform-wallet/src/spv/runtime.rs @@ -16,8 +16,7 @@ use dashcore::sml::masternode_list_entry::MasternodeListEntry; use dashcore::{PubkeyHash, QuorumHash, Transaction}; use dash_spv::network::PeerNetworkManager; -use dash_spv::sync::SyncProgress; -use dash_spv::{BroadcastResult, ClientConfig, DashSpvClient, EventHandler, Hash}; +use dash_spv::{BroadcastResult, ClientConfig, DashSpvClient, EventHandler, SyncProgress}; use key_wallet_manager::WalletManager; @@ -244,9 +243,7 @@ impl SpvRuntime { } self.ensure_joined(shutdown)?; - let network_manager = PeerNetworkManager::new(&config) - .await - .map_err(|e| PlatformWalletError::SpvError(e.to_string()))?; + let network_manager = PeerNetworkManager::new(&config).await; // PlatformEventManager implements `EventHandler`; the peer tracker // rides alongside it so `connected_peers` can answer from the latest @@ -849,9 +846,7 @@ impl SpvRuntime { // storage. Clearing removes the whole storage directory, so the client // needs neither filters nor masternodes. let config = config.without_filters().without_masternodes(); - let network_manager = PeerNetworkManager::new(&config) - .await - .map_err(|e| PlatformWalletError::SpvError(e.to_string()))?; + let network_manager = PeerNetworkManager::new(&config).await; let client: SpvClient = DashSpvClient::new( config, network_manager, @@ -920,7 +915,6 @@ fn masternodes_by_voting_key(list: &MasternodeList, voting_key_id: &PubkeyHash) #[cfg(test)] mod masternodes_by_voting_key_tests { use dashcore::bls_sig_utils::BLSPublicKey; - use dashcore::hashes::Hash; use dashcore::sml::masternode_list_entry::{ EntryMasternodeType, MasternodeListEntry, MasternodeNetInfo, }; @@ -1339,7 +1333,6 @@ mod tests { use dashcore::bls_sig_utils::{BLSPublicKey, BLSSignature}; use dashcore::hash_types::QuorumVVecHash; - use dashcore::hashes::Hash; use dashcore::sml::llmq_type::LLMQType; use dashcore::sml::masternode_list::MasternodeList; use dashcore::sml::quorum_entry::qualified_quorum_entry::QualifiedQuorumEntry; @@ -2215,12 +2208,11 @@ mod tests { runtime .peer_tracker .on_network_event(&NetworkEvent::PeersUpdated { - connected_count: 1, addresses: vec![SocketAddr::new( IpAddr::V4(Ipv4Addr::new(1, 2, 3, 4)), 19999, )], - best_height: Some(1_100_000), + best_height: 1_100_000, }); assert!( @@ -2241,12 +2233,11 @@ mod tests { use std::net::{IpAddr, Ipv4Addr, SocketAddr}; dash_spv::network::NetworkEvent::PeersUpdated { - connected_count: 1, addresses: vec![SocketAddr::new( IpAddr::V4(Ipv4Addr::new(1, 2, 3, 4)), 19999, )], - best_height: Some(1_100_000), + best_height: 1_100_000, } } diff --git a/packages/rs-platform-wallet/src/test_support.rs b/packages/rs-platform-wallet/src/test_support.rs index 1cdd2b24fef..25cbd8f5f5b 100644 --- a/packages/rs-platform-wallet/src/test_support.rs +++ b/packages/rs-platform-wallet/src/test_support.rs @@ -13,7 +13,6 @@ use async_trait::async_trait; use dashcore::blockdata::script::Builder; use dashcore::crypto::ecdsa::{EcdsaPublicKey as PublicKey, EcdsaSignature}; use dashcore::ecdsa::EcdsaSecretKey; -use dashcore::hashes::Hash; use dashcore::BlockHash; use dashcore::PublicKey as AddressPublicKey; #[cfg(test)] diff --git a/packages/rs-platform-wallet/src/wallet/asset_lock/build.rs b/packages/rs-platform-wallet/src/wallet/asset_lock/build.rs index e25b9154037..5817fb0e251 100644 --- a/packages/rs-platform-wallet/src/wallet/asset_lock/build.rs +++ b/packages/rs-platform-wallet/src/wallet/asset_lock/build.rs @@ -1677,6 +1677,10 @@ impl AssetLockManager { /// downstream by `broadcast_funded_asset_lock_with_funding` against the built /// payload. /// +/// `BuilderError::FundsAwaitingFinality` is not a shortfall: the coins exist +/// but are not final yet, so it maps to the typed +/// [`PlatformWalletError::AssetLockFundsAwaitingFinality`] instead. +/// /// Every other builder error keeps the pre-existing generic /// `AssetLockTransaction` string form. fn map_builder_error(e: AssetLockError, requested: u64) -> PlatformWalletError { @@ -1703,6 +1707,9 @@ fn map_builder_error(e: AssetLockError, requested: u64) -> PlatformWalletError { AssetLockError::Builder(BuilderError::TooManyInputs { count, max }) => { PlatformWalletError::AssetLockTooManyInputs { count, max } } + AssetLockError::Builder(BuilderError::FundsAwaitingFinality { waiting }) => { + PlatformWalletError::AssetLockFundsAwaitingFinality { waiting } + } other => { PlatformWalletError::AssetLockTransaction(format!("Asset lock builder failed: {other}")) } @@ -1804,6 +1811,17 @@ mod tests { other => panic!("expected typed AssetLockInsufficientFunds, got {other:?}"), } + // Coins that are not final yet -> typed, carrying the waiting amount. + match map_builder_error( + AssetLockError::Builder(BuilderError::FundsAwaitingFinality { waiting: 600 }), + 999, + ) { + PlatformWalletError::AssetLockFundsAwaitingFinality { waiting } => { + assert_eq!(waiting, 600); + } + other => panic!("expected typed AssetLockFundsAwaitingFinality, got {other:?}"), + } + // A non-shortfall builder error keeps the pre-existing generic string // form — the typed promotion must not swallow unrelated failures. match map_builder_error(AssetLockError::WatchOnlyWallet, 42) { diff --git a/packages/rs-platform-wallet/src/wallet/asset_lock/lock_notify_handler.rs b/packages/rs-platform-wallet/src/wallet/asset_lock/lock_notify_handler.rs index 8c159cdda20..2dbe091a64a 100644 --- a/packages/rs-platform-wallet/src/wallet/asset_lock/lock_notify_handler.rs +++ b/packages/rs-platform-wallet/src/wallet/asset_lock/lock_notify_handler.rs @@ -2,7 +2,7 @@ use std::sync::Arc; -use dash_spv::EventHandler; +use dash_spv::{EventHandler, SyncEvent}; use tokio::sync::Notify; use crate::events::PlatformEventHandler; @@ -21,18 +21,18 @@ impl LockNotifyHandler { } impl EventHandler for LockNotifyHandler { - fn on_sync_event(&self, event: &dash_spv::sync::SyncEvent) { + fn on_sync_event(&self, event: &SyncEvent) { // Demoted to `debug!` — these events arrive at network // frequency on a synced node (every 2.5min for CL on // mainnet, plus per-tx IS events). Operator visibility into // *what we did* with each event lives on the consumer side // (`wait_for_proof`); this handler just wakes them. match event { - dash_spv::sync::SyncEvent::InstantLockReceived { .. } => { + SyncEvent::InstantLockReceived { .. } => { tracing::debug!("LockNotifyHandler: InstantLockReceived — waking waiters"); self.notify.notify_waiters(); } - dash_spv::sync::SyncEvent::ChainLockReceived { + SyncEvent::ChainLockReceived { chain_lock, validated, } => { diff --git a/packages/rs-platform-wallet/src/wallet/asset_lock/sync/locate.rs b/packages/rs-platform-wallet/src/wallet/asset_lock/sync/locate.rs index c8a39eb4759..bc01f25c954 100644 --- a/packages/rs-platform-wallet/src/wallet/asset_lock/sync/locate.rs +++ b/packages/rs-platform-wallet/src/wallet/asset_lock/sync/locate.rs @@ -17,7 +17,6 @@ use std::time::Duration; use async_trait::async_trait; use dash_sdk::RequestSettings; -use dashcore::hashes::Hash; use dashcore::{Block, BlockHash, Txid}; /// What a header store answered for one height. diff --git a/packages/rs-platform-wallet/src/wallet/asset_lock/sync/proof.rs b/packages/rs-platform-wallet/src/wallet/asset_lock/sync/proof.rs index 269b1ee0ea1..4ed6033a54f 100644 --- a/packages/rs-platform-wallet/src/wallet/asset_lock/sync/proof.rs +++ b/packages/rs-platform-wallet/src/wallet/asset_lock/sync/proof.rs @@ -1875,7 +1875,6 @@ mod chain_lock_wait_tests { use async_trait::async_trait; use dashcore::bls_sig_utils::BLSSignature; use dashcore::ephemerealdata::chain_lock::ChainLock; - use dashcore::hashes::Hash; use dashcore::{BlockHash, InstantLock, Network, OutPoint, Transaction, TxIn, Txid}; use dpp::identity::state_transition::asset_lock_proof::chain::ChainAssetLockProof; use dpp::identity::state_transition::asset_lock_proof::InstantAssetLockProof; diff --git a/packages/rs-platform-wallet/src/wallet/asset_lock/sync/reconstruction.rs b/packages/rs-platform-wallet/src/wallet/asset_lock/sync/reconstruction.rs index 5cf0b4defc1..b1fa14d4d94 100644 --- a/packages/rs-platform-wallet/src/wallet/asset_lock/sync/reconstruction.rs +++ b/packages/rs-platform-wallet/src/wallet/asset_lock/sync/reconstruction.rs @@ -542,7 +542,6 @@ mod tests { use std::sync::Arc; use std::time::Duration; - use dashcore::hashes::Hash; use dashcore::{BlockHash, Network, OutPoint, Transaction}; use key_wallet::account::account_type::StandardAccountType; use key_wallet::account::AccountType; diff --git a/packages/rs-platform-wallet/src/wallet/asset_lock/sync/recovery.rs b/packages/rs-platform-wallet/src/wallet/asset_lock/sync/recovery.rs index fe7c196382b..ca5b6cdea1f 100644 --- a/packages/rs-platform-wallet/src/wallet/asset_lock/sync/recovery.rs +++ b/packages/rs-platform-wallet/src/wallet/asset_lock/sync/recovery.rs @@ -1932,7 +1932,6 @@ mod tests { use async_trait::async_trait; use dashcore::bls_sig_utils::BLSSignature; use dashcore::ephemerealdata::chain_lock::ChainLock; - use dashcore::hashes::Hash; use dashcore::prelude::CoreBlockHeight; use dashcore::{BlockHash, Network, OutPoint, Transaction, TxIn, Txid}; use key_wallet::account::account_collection::AccountCollection; diff --git a/packages/rs-platform-wallet/src/wallet/core/sign_message.rs b/packages/rs-platform-wallet/src/wallet/core/sign_message.rs index 4c428156b2c..2af91284e32 100644 --- a/packages/rs-platform-wallet/src/wallet/core/sign_message.rs +++ b/packages/rs-platform-wallet/src/wallet/core/sign_message.rs @@ -45,7 +45,6 @@ use std::str::FromStr; use dashcore::address::Payload; use dashcore::crypto::ecdsa::{EcdsaPublicKey, EcdsaRecSignature}; -use dashcore::hashes::Hash; use dashcore::sign_message::{self, signed_msg_hash}; use dashcore::{Address as DashAddress, AddressType, PublicKey as DashPublicKey}; use key_wallet::managed_account::managed_account_trait::ManagedAccountTrait; diff --git a/packages/rs-platform-wallet/src/wallet/core/spend_observer.rs b/packages/rs-platform-wallet/src/wallet/core/spend_observer.rs index db509798de1..e57e57c759b 100644 --- a/packages/rs-platform-wallet/src/wallet/core/spend_observer.rs +++ b/packages/rs-platform-wallet/src/wallet/core/spend_observer.rs @@ -198,7 +198,6 @@ mod tests { //! which outpoints they yield. That decision IS the fence's release //! condition, so it is pinned here rather than only exercised end to end. - use dashcore::hashes::Hash; use dashcore::{ Address as DashAddress, BlockHash, Network, OutPoint, ScriptBuf, Transaction, TxIn, Txid, Witness, diff --git a/packages/rs-platform-wallet/src/wallet/core/transaction.rs b/packages/rs-platform-wallet/src/wallet/core/transaction.rs index ed78899cb44..d282fba6cb1 100644 --- a/packages/rs-platform-wallet/src/wallet/core/transaction.rs +++ b/packages/rs-platform-wallet/src/wallet/core/transaction.rs @@ -103,7 +103,6 @@ fn checked_fee(fee_rate: FeeRate, size_bytes: usize) -> Result ScriptBuf { - use dashcore::hashes::Hash; ScriptBuf::new_p2pkh(&PubkeyHash::from_byte_array([0u8; 20])) } diff --git a/packages/rs-platform-wallet/src/wallet/core/transaction_decode.rs b/packages/rs-platform-wallet/src/wallet/core/transaction_decode.rs index 25078040dba..c695341e467 100644 --- a/packages/rs-platform-wallet/src/wallet/core/transaction_decode.rs +++ b/packages/rs-platform-wallet/src/wallet/core/transaction_decode.rs @@ -1,9 +1,8 @@ //! Consensus-decodes raw transaction bytes into the outpoints they spend and //! the addresses and amounts they pay. -use dashcore::blockdata::script::Instruction; use dashcore::consensus::{deserialize, encode}; -use dashcore::{Address, Network, OutPoint, PublicKey, ScriptBuf, Transaction, Txid}; +use dashcore::{Address, Network, OutPoint, ScriptBuf, Transaction, Txid}; /// A transaction decoded by [`decode_transaction`]. #[derive(Debug, Clone, PartialEq, Eq)] @@ -17,9 +16,8 @@ pub struct DecodedTransaction { #[derive(Debug, Clone, PartialEq, Eq)] pub struct DecodedTxInput { pub previous_output: OutPoint, - /// The sender address a P2PKH-shaped scriptSig claims, or `None` for a - /// coinbase, non-P2PKH or unparsable input. The spender controls every push - /// and nothing verifies the signature against the spent output, so use it + /// The sender a P2PKH-shaped scriptSig claims, from + /// [`dashcore::TxIn::claimed_p2pkh_address`]. Nothing verifies it, so use it /// for display or as a matching hint only, never for authentication. The /// per-output `(address, value)` pair is the attacker-resistant primitive. pub sender_address: Option
, @@ -48,11 +46,7 @@ pub fn decode_transaction( .input .into_iter() .map(|txin| DecodedTxInput { - sender_address: if txin.previous_output.is_null() { - None - } else { - input_address_from_script_sig(&txin.script_sig, network) - }, + sender_address: txin.claimed_p2pkh_address(network), previous_output: txin.previous_output, }) .collect(); @@ -74,38 +68,10 @@ pub fn decode_transaction( }) } -/// Returns the P2PKH sender address claimed by `script_sig`. -/// -/// Only the exact P2PKH spend shape matches: a DER-shaped signature push -/// (`0x30` tag, at most 73 bytes with the sighash byte) followed by a 33 or -/// 65 byte public key push, and nothing else. This keeps a P2SH redeem script -/// whose last push happens to parse as a key from yielding an unrelated address. -fn input_address_from_script_sig(script_sig: &ScriptBuf, network: Network) -> Option
{ - let mut sig: Option<&[u8]> = None; - let mut pubkey_bytes: Option<&[u8]> = None; - for instruction in script_sig.instructions() { - match instruction { - Ok(Instruction::PushBytes(bytes)) => match (sig, pubkey_bytes) { - (None, None) => sig = Some(bytes.as_bytes()), - (Some(_), None) => pubkey_bytes = Some(bytes.as_bytes()), - _ => return None, - }, - _ => return None, - } - } - let (sig, pubkey_bytes) = (sig?, pubkey_bytes?); - if sig.is_empty() || sig[0] != 0x30 || sig.len() > 73 { - return None; - } - let pubkey = PublicKey::from_slice(pubkey_bytes).ok()?; - Some(Address::p2pkh(&pubkey, network)) -} - #[cfg(test)] mod tests { use super::*; - use crate::test_support::{p2pkh_spend_tx, test_pubkey, tx_with_script_sig}; - use dashcore::blockdata::script::Builder; + use crate::test_support::p2pkh_spend_tx; use dashcore::consensus::serialize; fn decode(tx: &Transaction, network: Network) -> DecodedTransaction { @@ -156,39 +122,6 @@ mod tests { assert_eq!(decoded.inputs[0].sender_address, Some(addr)); } - #[test] - fn should_yield_no_input_address_for_a_non_p2pkh_script_sig() { - let addr = Address::dummy(Network::Testnet, 3); - let coinbase = Transaction::dummy_coinbase(&addr, 50_000); - assert!(decode(&coinbase, Network::Testnet).inputs[0] - .sender_address - .is_none()); - - // `Transaction::dummy` puts a lock script into the scriptSig: opcodes - // present and a 20-byte last push. - let lock_script_sig = Transaction::dummy(&addr, 1..2, &[1_000]); - assert!(decode(&lock_script_sig, Network::Testnet).inputs[0] - .sender_address - .is_none()); - - // Three pushes ending in a valid key, the P2SH redeem-script shape. - let redeem = Builder::new() - .push_slice([0x30u8; 71]) - .push_slice([0x01u8; 20]) - .push_key(&test_pubkey()) - .into_script(); - let decoded = decode(&tx_with_script_sig(redeem), Network::Testnet); - assert!(decoded.inputs[0].sender_address.is_none()); - - // Two pushes, but the first has no DER `0x30` tag. - let not_a_signature = Builder::new() - .push_slice([0xAAu8; 10]) - .push_key(&test_pubkey()) - .into_script(); - let decoded = decode(&tx_with_script_sig(not_a_signature), Network::Testnet); - assert!(decoded.inputs[0].sender_address.is_none()); - } - #[test] fn should_reject_bytes_that_are_not_exactly_one_transaction() { let (tx, _) = p2pkh_spend_tx(); diff --git a/packages/rs-platform-wallet/src/wallet/core_address_key.rs b/packages/rs-platform-wallet/src/wallet/core_address_key.rs index 1aaced62f65..e6cb6c6f177 100644 --- a/packages/rs-platform-wallet/src/wallet/core_address_key.rs +++ b/packages/rs-platform-wallet/src/wallet/core_address_key.rs @@ -355,7 +355,7 @@ mod tests { let seed = Mnemonic::from_phrase(TEST_PLATFORM_WALLET_MNEMONIC) .unwrap() .to_seed(""); - let master = ExtendedPrivKey::new_master(Network::Testnet, &seed).unwrap(); + let master = ExtendedPrivKey::new_master(Network::Testnet, &*seed).unwrap(); let account_path = |account_type: AccountType| account_type.derivation_path(Network::Testnet).unwrap(); let bip44 = account_path(AccountType::Standard { @@ -422,7 +422,7 @@ mod tests { // control the address, and both routes refuse it. A failing key // source reaches the caller unchanged. let foreign_seed = Mnemonic::from_phrase(FRENCH).unwrap().to_seed(""); - let foreign_master = ExtendedPrivKey::new_master(Network::Testnet, &foreign_seed).unwrap(); + let foreign_master = ExtendedPrivKey::new_master(Network::Testnet, &*foreign_seed).unwrap(); let tracked_address = address_at(&tracked); for result in [ wallet diff --git a/packages/rs-platform-wallet/src/wallet/identity/crypto/auto_accept.rs b/packages/rs-platform-wallet/src/wallet/identity/crypto/auto_accept.rs index 959afd6ab7e..d6cb2a1ea17 100644 --- a/packages/rs-platform-wallet/src/wallet/identity/crypto/auto_accept.rs +++ b/packages/rs-platform-wallet/src/wallet/identity/crypto/auto_accept.rs @@ -24,7 +24,7 @@ //! //! `m/9'/coin'/16'/timestamp'` (all segments hardened) -use dashcore::hashes::{sha256, Hash, HashEngine}; +use dashcore::hashes::{sha256, HashEngine}; use dpp::prelude::Identifier; use dpp::secp256k1::{ecdsa::Signature, Message, SecretKey}; use key_wallet::bip32::{ChildNumber, DerivationPath}; diff --git a/packages/rs-platform-wallet/src/wallet/identity/network/contact_requests.rs b/packages/rs-platform-wallet/src/wallet/identity/network/contact_requests.rs index 4d9e3e2eafb..9d7c6664101 100644 --- a/packages/rs-platform-wallet/src/wallet/identity/network/contact_requests.rs +++ b/packages/rs-platform-wallet/src/wallet/identity/network/contact_requests.rs @@ -5837,7 +5837,7 @@ mod contact_info_provider_tests { ) .expect("auth path"); - let provider = SeedCryptoProvider::from_seed(seed, network); + let provider = SeedCryptoProvider::from_seed(*seed, network); let sealed = provider .contact_info_seal(&root_path, derivation_index, &contact_id, &plaintext, &iv) .await @@ -5845,7 +5845,7 @@ mod contact_info_provider_tests { // Resident twin at the same real path → byte-identical ciphertext. let wallet = key_wallet::wallet::Wallet::from_seed_bytes( - seed, + *seed, network, key_wallet::wallet::initialization::WalletAccountCreationOptions::None, ) @@ -5913,14 +5913,14 @@ mod contact_info_provider_tests { &SecretKey::from_secret_bytes([0x42u8; 32]).expect("peer secret"), ); - let provider = SeedCryptoProvider::from_seed(seed, network); + let provider = SeedCryptoProvider::from_seed(*seed, network); let shared: zeroize::Zeroizing<[u8; 32]> = provider .ecdh_shared_secret(&path, &peer) .await .expect("ecdh shared secret"); let wallet = key_wallet::wallet::Wallet::from_seed_bytes( - seed, + *seed, network, key_wallet::wallet::initialization::WalletAccountCreationOptions::None, ) @@ -6418,7 +6418,7 @@ mod receiving_restore_tests { friend_identity_id: contact.to_buffer(), }; let account_xpub = ExtendedPubKey::from_priv( - &ExtendedPrivKey::new_master(Network::Testnet, &seed).expect("master key"), + &ExtendedPrivKey::new_master(Network::Testnet, &*seed).expect("master key"), ); core_wallet .add_account(account_type, Some(account_xpub)) @@ -6489,7 +6489,7 @@ mod receiving_restore_tests { PendingContactCryptoOp::RegisterReceiving )); } - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); assert_eq!( iw.dashpay() .drain_pending_contact_crypto_verified(&provider, None) diff --git a/packages/rs-platform-wallet/src/wallet/identity/network/discovery.rs b/packages/rs-platform-wallet/src/wallet/identity/network/discovery.rs index 3bf6ed652cf..0e8596bed0a 100644 --- a/packages/rs-platform-wallet/src/wallet/identity/network/discovery.rs +++ b/packages/rs-platform-wallet/src/wallet/identity/network/discovery.rs @@ -854,7 +854,7 @@ mod tests { fn test_master() -> ExtendedPrivKey { let mnemonic = Mnemonic::from_phrase(TEST_MNEMONIC).expect("mnemonic"); let seed = mnemonic.to_seed(""); - ExtendedPrivKey::new_master(Network::Testnet, &seed).expect("master xpriv") + ExtendedPrivKey::new_master(Network::Testnet, &*seed).expect("master xpriv") } fn ecdsa_auth_key(id: KeyID, data: Vec) -> IdentityPublicKey { diff --git a/packages/rs-platform-wallet/src/wallet/identity/network/identity_handle.rs b/packages/rs-platform-wallet/src/wallet/identity/network/identity_handle.rs index 64d4e91116a..76634be498f 100644 --- a/packages/rs-platform-wallet/src/wallet/identity/network/identity_handle.rs +++ b/packages/rs-platform-wallet/src/wallet/identity/network/identity_handle.rs @@ -28,7 +28,8 @@ use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV use dpp::identity::{IdentityPublicKey, KeyType}; use dpp::prelude::Identifier; use key_wallet::bip32::{ - ApplicationKeyPurpose, ChildNumber, DerivationPath, ExtendedPrivKey, KeyDerivationType, + ApplicationKeyPurpose, ChildNumber, DerivationPath, Error as Bip32Error, ExtendedPrivKey, + KeyDerivationType, }; use key_wallet::dip9::{ FEATURE_PURPOSE_IDENTITIES_SUBFEATURE_APPLICATION_ENCRYPTION, @@ -237,35 +238,26 @@ impl ConnectKey { contract_id, purpose, rotation, - } => { - let rotation = hardened_rotation(rotation)?; - // Temporary: the pinned rust-dashcore builds only the - // pre-rotation path, so the rotation level is appended here. - // dashpay/rust-dashcore#1250 adds the level to key-wallet; - // once platform bumps to a rev with it, replace this arm with - // `DerivationPath::application_encryption_path(network, - // identity_id, contract_id, purpose, rotation)` and the - // legacy arm with `application_encryption_path_without_rotation`. - // `connect_keypairs_match_the_pinned_vectors` keeps that swap - // a no-op. - Ok(DerivationPath::application_encryption_path( - network, - identity_id.to_buffer(), - contract_id, - purpose, - ) - .extend([rotation])) - } - ConnectKey::AppEncryptionLegacy { - identity_id, - contract_id, - purpose, - } => Ok(DerivationPath::application_encryption_path( + } => DerivationPath::application_encryption_path( network, identity_id.to_buffer(), contract_id, purpose, - )), + rotation, + ) + .map_err(|e| invalid_rotation(rotation, e)), + ConnectKey::AppEncryptionLegacy { + identity_id, + contract_id, + purpose, + } => Ok( + DerivationPath::application_encryption_path_without_rotation( + network, + identity_id.to_buffer(), + contract_id, + purpose, + ), + ), } } } @@ -284,11 +276,13 @@ fn app_encryption_purpose(purpose: u32) -> Result Result { - ChildNumber::from_hardened_idx(rotation).map_err(|e| { - PlatformWalletError::InvalidParameter(format!( - "Invalid app encryption rotation {rotation}: {e}" - )) - }) + ChildNumber::from_hardened_idx(rotation).map_err(|e| invalid_rotation(rotation, e)) +} + +fn invalid_rotation(rotation: u32, e: Bip32Error) -> PlatformWalletError { + PlatformWalletError::InvalidParameter(format!( + "Invalid app encryption rotation {rotation}: {e}" + )) } /// Derive the ECDSA secp256k1 keypair of `key` from a master xpriv. Pure, @@ -713,7 +707,7 @@ mod tests { fn master_for(network: Network) -> ExtendedPrivKey { let mnemonic = Mnemonic::from_phrase(TEST_MNEMONIC).expect("valid English test mnemonic"); let seed = mnemonic.to_seed(""); - ExtendedPrivKey::new_master(network, &seed).expect("master xpriv from test seed") + ExtendedPrivKey::new_master(network, &*seed).expect("master xpriv from test seed") } /// (a) The master-based key-hash helper must produce the SAME 20-byte diff --git a/packages/rs-platform-wallet/src/wallet/identity/network/invitation.rs b/packages/rs-platform-wallet/src/wallet/identity/network/invitation.rs index 009a4245ca6..1cca521cce3 100644 --- a/packages/rs-platform-wallet/src/wallet/identity/network/invitation.rs +++ b/packages/rs-platform-wallet/src/wallet/identity/network/invitation.rs @@ -535,7 +535,7 @@ mod tests { .expect("wallet creation"); let iw = wallet.identity(); - let crypto_provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); + let crypto_provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); let err = iw .create_invitation( 1_000_000, diff --git a/packages/rs-platform-wallet/src/wallet/identity/network/loading.rs b/packages/rs-platform-wallet/src/wallet/identity/network/loading.rs index 1e032ed2690..19e591bbe2e 100644 --- a/packages/rs-platform-wallet/src/wallet/identity/network/loading.rs +++ b/packages/rs-platform-wallet/src/wallet/identity/network/loading.rs @@ -578,7 +578,7 @@ mod tests { fn master_for(network: Network) -> ExtendedPrivKey { let mnemonic = Mnemonic::from_phrase(TEST_MNEMONIC).expect("valid English test mnemonic"); let seed = mnemonic.to_seed(""); - ExtendedPrivKey::new_master(network, &seed).expect("master xpriv from test seed") + ExtendedPrivKey::new_master(network, &*seed).expect("master xpriv from test seed") } /// The loading probe's resident-wallet and master derive sources diff --git a/packages/rs-platform-wallet/src/wallet/identity/network/payments.rs b/packages/rs-platform-wallet/src/wallet/identity/network/payments.rs index 0f396096316..757b71290a6 100644 --- a/packages/rs-platform-wallet/src/wallet/identity/network/payments.rs +++ b/packages/rs-platform-wallet/src/wallet/identity/network/payments.rs @@ -1250,7 +1250,7 @@ pub(super) fn contact_address_paid_on_chain( /// sweep without adding or removing a txid, and must re-trigger it. /// In-memory only, never persisted — no cross-version stability required. fn wallet_tx_table_digest(listed: &[crate::changeset::traits::ListedCoreTxid]) -> [u8; 32] { - use dashcore::hashes::{sha256, Hash, HashEngine}; + use dashcore::hashes::{sha256, HashEngine}; let mut rows: Vec<([u8; 32], bool)> = listed .iter() @@ -2609,7 +2609,7 @@ mod tests { .expect("valid mnemonic") .to_seed(""); let wallet = key_wallet::wallet::Wallet::from_seed_bytes( - seed, + *seed, Network::Testnet, WalletAccountCreationOptions::None, ) @@ -2682,7 +2682,6 @@ mod tests { txid_byte: u8, value_duffs: u64, ) -> String { - use dashcore::hashes::Hash; let wallet = manager .get_wallet(&wallet_id) .await @@ -4997,7 +4996,7 @@ mod tests { .expect("mnemonic") .to_seed(""); let w = key_wallet::wallet::Wallet::from_seed_bytes( - seed, + *seed, Network::Testnet, WalletAccountCreationOptions::None, ) @@ -8699,7 +8698,6 @@ mod tests { #[tokio::test] async fn block_processed_confirms_sent_payment() { use dashcore::blockdata::transaction::Transaction; - use dashcore::hashes::Hash; use dashcore::{BlockHash, TxIn}; use key_wallet::account::account_type::StandardAccountType; use key_wallet::account::AccountType; @@ -9088,7 +9086,6 @@ mod tests { #[tokio::test] async fn reconcile_sent_payments_confirms_from_persisted_record() { use dashcore::blockdata::transaction::Transaction; - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::account::account_type::StandardAccountType; use key_wallet::account::AccountType; @@ -9251,7 +9248,6 @@ mod tests { #[tokio::test] async fn reconcile_sent_payments_from_tx_history_rebuilds_and_is_idempotent() { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::transaction_record::OutputRole; use key_wallet::transaction_checking::{BlockInfo, TransactionContext}; @@ -9332,7 +9328,6 @@ mod tests { /// re-running the whole sweep on every dashpay sync. #[tokio::test] async fn reconcile_sent_payments_from_tx_history_surfaces_permanent_read_failures() { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::transaction_record::OutputRole; use key_wallet::transaction_checking::{BlockInfo, TransactionContext}; @@ -9400,7 +9395,6 @@ mod tests { /// suppressed the wallet's entire `Sent` history — on every sweep, forever. #[tokio::test] async fn reconcile_sent_payments_from_tx_history_reconstructs_around_an_unreadable_record() { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::transaction_record::OutputRole; use key_wallet::transaction_checking::{BlockInfo, TransactionContext}; @@ -9485,7 +9479,6 @@ mod tests { #[tokio::test] async fn reconcile_sent_payments_from_tx_history_does_not_overwrite_existing_entry() { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::transaction_record::OutputRole; use key_wallet::transaction_checking::{BlockInfo, TransactionContext}; @@ -9568,7 +9561,6 @@ mod tests { /// (`outputs_scanned=0`, `matched_txids=0` against 49 records read). #[tokio::test] async fn reconcile_sent_payments_from_tx_history_matches_without_output_details() { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::transaction_record::OutputRole; use key_wallet::transaction_checking::{BlockInfo, TransactionContext}; @@ -9639,7 +9631,6 @@ mod tests { #[tokio::test] async fn reconcile_sent_payments_from_tx_history_reconstructs_for_contact_with_received_history( ) { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::transaction_record::OutputRole; use key_wallet::transaction_checking::{BlockInfo, TransactionContext}; @@ -9836,7 +9827,6 @@ mod tests { /// has to be wider than one gap limit. #[tokio::test] async fn reconcile_sent_payments_from_tx_history_crosses_a_full_unused_gap() { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::transaction_record::OutputRole; use key_wallet::transaction_checking::{BlockInfo, TransactionContext}; @@ -9936,7 +9926,6 @@ mod tests { /// keep arriving with every new block. #[tokio::test] async fn reconcile_sent_payments_from_tx_history_resweeps_when_the_table_changes() { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::transaction_record::OutputRole; use key_wallet::transaction_checking::{BlockInfo, TransactionContext}; @@ -10041,7 +10030,6 @@ mod tests { #[tokio::test] async fn reconcile_sent_payments_from_tx_history_skips_repeat_sweeps_after_a_real_scan() { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::transaction_record::OutputRole; use key_wallet::transaction_checking::{BlockInfo, TransactionContext}; @@ -10112,7 +10100,6 @@ mod tests { /// has a `Sent` entry" is not a completion marker. #[tokio::test] async fn reconcile_sent_payments_from_tx_history_retries_failed_write_after_sibling_success() { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::transaction_record::OutputRole; use key_wallet::transaction_checking::{BlockInfo, TransactionContext}; @@ -10209,7 +10196,6 @@ mod tests { /// contact as complete until every listed wallet-funded record was read. #[tokio::test] async fn reconcile_sent_payments_from_tx_history_retries_when_listed_record_is_unavailable() { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::transaction_record::OutputRole; use key_wallet::transaction_checking::{BlockInfo, TransactionContext}; @@ -10307,7 +10293,6 @@ mod tests { /// of matching only what the pool already holds. #[tokio::test] async fn reconcile_sent_payments_from_tx_history_finds_payments_past_initial_gap_window() { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::address_pool::KeySource; use key_wallet::managed_account::transaction_record::OutputRole; @@ -10410,7 +10395,6 @@ mod tests { /// skipping it is conclusive (the guard still stamps). #[tokio::test] async fn reconcile_sent_payments_from_tx_history_skips_transactions_wallet_did_not_fund() { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::transaction_record::OutputRole; use key_wallet::transaction_checking::{BlockInfo, TransactionContext}; @@ -10491,7 +10475,6 @@ mod tests { /// every recurring sync pass. #[tokio::test] async fn reconcile_sent_payments_from_tx_history_skips_backends_without_enumeration() { - use dashcore::hashes::Hash; use dashcore::BlockHash; use key_wallet::managed_account::transaction_record::OutputRole; use key_wallet::transaction_checking::{BlockInfo, TransactionContext}; @@ -11064,7 +11047,7 @@ mod tests { }); } - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); let drained = iw .dashpay() .drain_pending_contact_crypto_until(&provider, None) @@ -11204,7 +11187,7 @@ mod tests { }); } - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); let drained = iw .dashpay() .drain_pending_contact_crypto_until(&provider, None) @@ -11348,7 +11331,7 @@ mod tests { }); } - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); for pass in 1..=2 { let drained = iw .dashpay() @@ -11448,7 +11431,7 @@ mod tests { } let provider = SeedCryptoProvider::from_seed( - Mnemonic::from_phrase(TEST_MNEMONIC) + *Mnemonic::from_phrase(TEST_MNEMONIC) .expect("valid mnemonic") .to_seed(""), Network::Testnet, @@ -11527,7 +11510,7 @@ mod tests { let seed = Mnemonic::from_phrase(TEST_MNEMONIC) .expect("valid mnemonic") .to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); // The contact's encryption keypair (the "sender" of the request). let contact_secret = dpp::secp256k1::SecretKey::from_secret_bytes([0x42u8; 32]) @@ -11558,7 +11541,7 @@ mod tests { // The sender encrypts a real compact xpub to that secret. let compact = { let w = key_wallet::wallet::Wallet::from_seed_bytes( - seed, + *seed, Network::Testnet, WalletAccountCreationOptions::None, ) @@ -11713,7 +11696,7 @@ mod tests { }); } - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); let drained = iw .dashpay() .drain_pending_contact_crypto_until(&provider, None) @@ -11899,7 +11882,7 @@ mod tests { let seed = Mnemonic::from_phrase(TEST_MNEMONIC) .expect("mnemonic") .to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); let not_ours = Identifier::from([0x99; 32]); let err = iw .dashpay() @@ -11988,7 +11971,7 @@ mod tests { let wallet = manager.get_wallet(&wallet_id).await.unwrap(); let iw = wallet.identity(); let seed = Mnemonic::from_phrase(TEST_MNEMONIC).unwrap().to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); persister.stores.lock().unwrap().clear(); let first = iw .dashpay() @@ -12014,7 +11997,7 @@ mod tests { // A subsequent transparent send must draw a third address, not reuse // either durably exposed withdrawal destination. fund_bip44_account_0(&manager, wallet_id, 0xC5, 120_000).await; - let signer = SeedSigner::new(seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); with_accepting_broadcaster(iw) .dashpay() .send_payment(&owner, &contact, 50_000, None, &signer, &provider) @@ -12042,8 +12025,8 @@ mod tests { let iw = wallet.identity(); fund_bip44_account_0(&manager, wallet_id, 0xC6, 120_000).await; let seed = Mnemonic::from_phrase(TEST_MNEMONIC).unwrap().to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); - let signer = SeedSigner::new(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); let entered = Arc::new(tokio::sync::Barrier::new(2)); let release = Arc::new(tokio::sync::Barrier::new(2)); let gated = @@ -12100,7 +12083,7 @@ mod tests { let addresses = install_external_account(&manager, wallet_id, owner, contact).await; let wallet = manager.get_wallet(&wallet_id).await.unwrap(); let seed = Mnemonic::from_phrase(TEST_MNEMONIC).unwrap().to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); *persister.allow_stores_then_fail.lock().unwrap() = Some(0); assert!(matches!( wallet @@ -12253,8 +12236,9 @@ mod tests { let wallet = manager.get_wallet(&wallet_id).await.unwrap(); let seed = Mnemonic::from_phrase(TEST_MNEMONIC).unwrap().to_seed(""); let reserve = |wallet: Arc| { + let seed = seed.clone(); tokio::spawn(async move { - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); wallet .identity() .dashpay() @@ -12378,8 +12362,8 @@ mod tests { // A signer + provider derived from the same test seed — the production // posture (Keychain signer present on the send path). - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); - let signer = SeedSigner::new(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); // The send fails (no external account for `pay_contact`), but the drain // it runs first must have completed the queued RegisterReceiving op. @@ -12471,7 +12455,7 @@ mod tests { .expect("mnemonic") .to_seed(""); let w = key_wallet::wallet::Wallet::from_seed_bytes( - seed, + *seed, Network::Testnet, WalletAccountCreationOptions::None, ) @@ -12503,8 +12487,8 @@ mod tests { let seed = Mnemonic::from_phrase(TEST_MNEMONIC) .expect("valid mnemonic") .to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); - let signer = SeedSigner::new(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); let err = iw .dashpay() @@ -12581,7 +12565,7 @@ mod tests { .to_seed(""); let compact = { let w = key_wallet::wallet::Wallet::from_seed_bytes( - seed, + *seed, Network::Testnet, WalletAccountCreationOptions::None, ) @@ -12609,8 +12593,8 @@ mod tests { .await .expect("register external account"); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); - let signer = SeedSigner::new(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); let result = iw .dashpay() .send_payment(&owner_id, &contact_id, 100_000, None, &signer, &provider) @@ -12665,7 +12649,7 @@ mod tests { .expect("mnemonic") .to_seed(""); let w = key_wallet::wallet::Wallet::from_seed_bytes( - seed, + *seed, Network::Testnet, WalletAccountCreationOptions::None, ) @@ -12697,8 +12681,8 @@ mod tests { let seed = Mnemonic::from_phrase(TEST_MNEMONIC) .expect("valid mnemonic") .to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); - let signer = SeedSigner::new(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); // Two failed builds in a row: without rollback each one consumes an // index and the pool's used range marches forward off-chain. @@ -12778,8 +12762,8 @@ mod tests { let seed = Mnemonic::from_phrase(TEST_MNEMONIC) .expect("valid mnemonic") .to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); - let signer = SeedSigner::new(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); let rejecting = with_rejecting_broadcaster(iw); let err = rejecting @@ -12826,8 +12810,8 @@ mod tests { let seed = Mnemonic::from_phrase(TEST_MNEMONIC) .expect("valid mnemonic") .to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); - let signer = SeedSigner::new(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); // Clear the store log so the assertions below see only the send's // own writes. @@ -13004,7 +12988,7 @@ mod tests { .expect("mnemonic") .to_seed(""); let w = key_wallet::wallet::Wallet::from_seed_bytes( - seed, + *seed, Network::Testnet, WalletAccountCreationOptions::None, ) @@ -13047,8 +13031,8 @@ mod tests { let seed = Mnemonic::from_phrase(TEST_MNEMONIC) .expect("valid mnemonic") .to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); - let signer = SeedSigner::new(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); let iw_send = with_accepting_broadcaster(iw); iw_send @@ -13123,16 +13107,15 @@ mod tests { // outpoint the parked transaction already spends. fund_bip44_account_0(&manager, wallet_id, 0xD1, 1_000_000).await; let funded = dashcore::OutPoint { - txid: ::from_slice(&[0xD1; 32]) - .expect("txid"), + txid: dashcore::Txid::from_slice(&[0xD1; 32]).expect("txid"), vout: 0, }; let seed = Mnemonic::from_phrase(TEST_MNEMONIC) .expect("valid mnemonic") .to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); - let signer = SeedSigner::new(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); let stamped = synced_height(&manager, wallet_id).await; let entered = Arc::new(tokio::sync::Barrier::new(2)); @@ -13222,16 +13205,15 @@ mod tests { fund_bip44_account_0(&manager, wallet_id, 0xD2, 1_000_000).await; let funded = dashcore::OutPoint { - txid: ::from_slice(&[0xD2; 32]) - .expect("txid"), + txid: dashcore::Txid::from_slice(&[0xD2; 32]).expect("txid"), vout: 0, }; let seed = Mnemonic::from_phrase(TEST_MNEMONIC) .expect("valid mnemonic") .to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); - let signer = SeedSigner::new(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); let entered = Arc::new(tokio::sync::Barrier::new(2)); let release = Arc::new(tokio::sync::Barrier::new(2)); @@ -13334,16 +13316,15 @@ mod tests { fund_bip44_account_0(&manager, wallet_id, 0xD3, 1_000_000).await; let funded = dashcore::OutPoint { - txid: ::from_slice(&[0xD3; 32]) - .expect("txid"), + txid: dashcore::Txid::from_slice(&[0xD3; 32]).expect("txid"), vout: 0, }; let seed = Mnemonic::from_phrase(TEST_MNEMONIC) .expect("valid mnemonic") .to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); - let signer = SeedSigner::new(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); let entered = Arc::new(tokio::sync::Barrier::new(2)); let release = Arc::new(tokio::sync::Barrier::new(2)); @@ -13560,7 +13541,6 @@ mod tests { txid_byte: u8, value_duffs: u64, ) { - use dashcore::hashes::Hash; use key_wallet::managed_account::managed_account_trait::ManagedAccountTrait; let wallet = manager .get_wallet(&wallet_id) @@ -13644,7 +13624,7 @@ mod tests { .expect("mnemonic") .to_seed(""); let w = key_wallet::wallet::Wallet::from_seed_bytes( - seed, + *seed, Network::Testnet, WalletAccountCreationOptions::None, ) @@ -13703,8 +13683,8 @@ mod tests { let seed = Mnemonic::from_phrase(TEST_MNEMONIC) .expect("valid mnemonic") .to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); - let signer = SeedSigner::new(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); let wallet = manager.get_wallet(&wallet_id).await.expect("wallet"); let iw = with_accepting_broadcaster(wallet.identity()); @@ -13758,8 +13738,8 @@ mod tests { let seed = Mnemonic::from_phrase(TEST_MNEMONIC) .expect("valid mnemonic") .to_seed(""); - let provider = SeedCryptoProvider::from_seed(seed, Network::Testnet); - let signer = SeedSigner::new(seed, Network::Testnet); + let provider = SeedCryptoProvider::from_seed(*seed, Network::Testnet); + let signer = SeedSigner::new(*seed, Network::Testnet); let wallet = manager.get_wallet(&wallet_id).await.expect("wallet"); let iw = with_accepting_broadcaster(wallet.identity()); @@ -13813,9 +13793,9 @@ mod tests { .expect("valid mnemonic") .to_seed(""); ( - SeedSigner::new(seed, Network::Testnet), + SeedSigner::new(*seed, Network::Testnet), crate::wallet::identity::network::contact_requests::SeedCryptoProvider::from_seed( - seed, + *seed, Network::Testnet, ), ) @@ -13910,7 +13890,6 @@ mod tests { address: &dashcore::Address, txid_byte: u8, ) { - use dashcore::hashes::Hash; use key_wallet::transaction_checking::{ BlockInfo, TransactionContext, WalletTransactionChecker, }; @@ -15056,7 +15035,7 @@ mod tests { let reserving = Arc::clone(&wallet); let mut reserve = tokio::spawn(async move { let provider = SeedCryptoProvider::from_seed( - Mnemonic::from_phrase(TEST_MNEMONIC).unwrap().to_seed(""), + *Mnemonic::from_phrase(TEST_MNEMONIC).unwrap().to_seed(""), Network::Testnet, ); reserving diff --git a/packages/rs-platform-wallet/src/wallet/identity/network/seed_binding.rs b/packages/rs-platform-wallet/src/wallet/identity/network/seed_binding.rs index 212b901a022..9be09b6156c 100644 --- a/packages/rs-platform-wallet/src/wallet/identity/network/seed_binding.rs +++ b/packages/rs-platform-wallet/src/wallet/identity/network/seed_binding.rs @@ -616,6 +616,7 @@ mod tests { use key_wallet::mnemonic::Mnemonic; use key_wallet::wallet::initialization::WalletAccountCreationOptions; use key_wallet::Network; + use zeroize::Zeroizing; use crate::changeset::{ ClientStartState, PersistenceError, PlatformWalletChangeSet, PlatformWalletPersistence, @@ -658,7 +659,7 @@ mod tests { Arc::new(PlatformWalletManager::new(sdk, persister, event_handler)) } - fn seed_for(phrase: &str) -> [u8; 64] { + fn seed_for(phrase: &str) -> Zeroizing<[u8; 64]> { Mnemonic::from_phrase(phrase) .expect("valid test mnemonic") .to_seed("") @@ -688,7 +689,7 @@ mod tests { "precondition: wallet must be seedless / external-signable" ); - let crypto = SeedCryptoProvider::from_seed(seed, network); + let crypto = SeedCryptoProvider::from_seed(*seed, network); wallet .verify_seed_binds(&crypto) .await @@ -717,7 +718,7 @@ mod tests { // A different mnemonic → a signer for the wrong wallet. let wrong_seed = seed_for("legal winner thank year wave sausage worth useful legal winner thank yellow"); - let wrong_crypto = SeedCryptoProvider::from_seed(wrong_seed, network); + let wrong_crypto = SeedCryptoProvider::from_seed(*wrong_seed, network); let err = wallet .verify_seed_binds(&wrong_crypto) @@ -748,7 +749,7 @@ mod tests { .await .expect("wallet creation"); - let crypto = SeedCryptoProvider::from_seed(seed, network); + let crypto = SeedCryptoProvider::from_seed(*seed, network); let (outcome, marker) = wallet .verify_seed_binds_with_marker(&crypto, None, Some("stamp-1")) .await @@ -801,7 +802,7 @@ mod tests { let wrong_seed = seed_for("legal winner thank year wave sausage worth useful legal winner thank yellow"); - let wrong_crypto = SeedCryptoProvider::from_seed(wrong_seed, network); + let wrong_crypto = SeedCryptoProvider::from_seed(*wrong_seed, network); let (outcome, returned) = wallet .verify_seed_binds_with_marker(&wrong_crypto, Some(&marker), Some("stamp-1")) @@ -847,7 +848,7 @@ mod tests { // The rewrite put a DIFFERENT mnemonic in the slot → must be caught. let wrong_seed = seed_for("legal winner thank year wave sausage worth useful legal winner thank yellow"); - let wrong_crypto = SeedCryptoProvider::from_seed(wrong_seed, network); + let wrong_crypto = SeedCryptoProvider::from_seed(*wrong_seed, network); let err = wallet .verify_seed_binds_with_marker(&wrong_crypto, Some(&marker), Some("stamp-2")) .await @@ -859,7 +860,7 @@ mod tests { // The rewrite re-stored the SAME mnemonic → re-verifies, and the new // marker carries the new stamp. - let crypto = SeedCryptoProvider::from_seed(seed, network); + let crypto = SeedCryptoProvider::from_seed(*seed, network); let (outcome, returned) = wallet .verify_seed_binds_with_marker(&crypto, Some(&marker), Some("stamp-2")) .await @@ -896,7 +897,7 @@ mod tests { .account_xpub .to_string(); - let crypto = SeedCryptoProvider::from_seed(seed, network); + let crypto = SeedCryptoProvider::from_seed(*seed, network); let (outcome, returned) = wallet .verify_seed_binds_with_marker(&crypto, Some(&format!("{xpub}|stamp-1")), None) .await @@ -936,7 +937,7 @@ mod tests { .account_xpub .to_string(); - let crypto = SeedCryptoProvider::from_seed(seed, network); + let crypto = SeedCryptoProvider::from_seed(*seed, network); let (outcome, marker) = wallet .verify_seed_binds_with_marker( &crypto, @@ -950,7 +951,7 @@ mod tests { let wrong_seed = seed_for("legal winner thank year wave sausage worth useful legal winner thank yellow"); - let wrong_crypto = SeedCryptoProvider::from_seed(wrong_seed, network); + let wrong_crypto = SeedCryptoProvider::from_seed(*wrong_seed, network); let err = wallet .verify_seed_binds_with_marker( &wrong_crypto, @@ -988,7 +989,7 @@ mod tests { "precondition: wallet has no BIP44 account 0" ); - let crypto = SeedCryptoProvider::from_seed(seed, network); + let crypto = SeedCryptoProvider::from_seed(*seed, network); let err = wallet .verify_seed_binds(&crypto) .await @@ -1146,7 +1147,7 @@ mod tests { assert_eq!(receiving_account_count(&manager, &wallet_id).await, 0); assert_eq!(drainable(&wallet).await, 1); - let foreign = SeedCryptoProvider::from_seed(seed_for(FOREIGN_MNEMONIC), Network::Testnet); + let foreign = SeedCryptoProvider::from_seed(*seed_for(FOREIGN_MNEMONIC), Network::Testnet); let err = wallet .drain_pending_contact_crypto_verified(&foreign, None::<&UnusedSigner>, None) .await @@ -1175,7 +1176,7 @@ mod tests { async fn the_owning_seed_passes_the_gate_and_the_drain_runs() { let (manager, wallet, wallet_id) = wallet_with_queued_contact_crypto().await; - let owning = SeedCryptoProvider::from_seed(seed_for(TEST_MNEMONIC), Network::Testnet); + let owning = SeedCryptoProvider::from_seed(*seed_for(TEST_MNEMONIC), Network::Testnet); let drained = wallet .drain_pending_contact_crypto_verified(&owning, None::<&UnusedSigner>, None) .await @@ -1207,7 +1208,7 @@ mod tests { .expect("wallet creation"); assert_eq!(drainable(&wallet).await, 0); - let foreign = SeedCryptoProvider::from_seed(seed_for(FOREIGN_MNEMONIC), Network::Testnet); + let foreign = SeedCryptoProvider::from_seed(*seed_for(FOREIGN_MNEMONIC), Network::Testnet); let drained = wallet .drain_pending_contact_crypto_verified(&foreign, None::<&UnusedSigner>, None) .await @@ -1276,7 +1277,7 @@ mod tests { assert_eq!(receiving_account_count(&manager, &wallet_id).await, 0); assert_eq!(drainable(&wallet).await, 1); - let foreign = SeedCryptoProvider::from_seed(seed_for(FOREIGN_MNEMONIC), Network::Testnet); + let foreign = SeedCryptoProvider::from_seed(*seed_for(FOREIGN_MNEMONIC), Network::Testnet); let err = wallet .identity() .dashpay() @@ -1321,7 +1322,7 @@ mod tests { let (manager, wallet, wallet_id) = wallet_with_queued_contact_crypto().await; - let owning = SeedCryptoProvider::from_seed(seed_for(TEST_MNEMONIC), Network::Testnet); + let owning = SeedCryptoProvider::from_seed(*seed_for(TEST_MNEMONIC), Network::Testnet); let err = wallet .identity() .dashpay() @@ -1449,7 +1450,7 @@ mod tests { #[tokio::test] async fn the_gated_drain_reports_whether_it_verified_the_provider() { let (manager, wallet, wallet_id) = wallet_with_queued_contact_crypto().await; - let owning = SeedCryptoProvider::from_seed(seed_for(TEST_MNEMONIC), Network::Testnet); + let owning = SeedCryptoProvider::from_seed(*seed_for(TEST_MNEMONIC), Network::Testnet); // Work queued → the check runs and the binding is reported. let (drained, binding) = wallet @@ -1491,7 +1492,7 @@ mod tests { enqueue_auto_accept(&manager, &wallet_id, 3).await; let queued_before = drainable(&wallet).await; - let foreign = SeedCryptoProvider::from_seed(seed_for(FOREIGN_MNEMONIC), Network::Testnet); + let foreign = SeedCryptoProvider::from_seed(*seed_for(FOREIGN_MNEMONIC), Network::Testnet); let err = wallet .identity() .dashpay() @@ -1535,7 +1536,7 @@ mod tests { #[tokio::test] async fn a_queue_emptied_between_the_probes_does_not_let_an_auto_accept_through() { let (manager, wallet, wallet_id) = wallet_with_queued_contact_crypto().await; - let foreign = SeedCryptoProvider::from_seed(seed_for(FOREIGN_MNEMONIC), Network::Testnet); + let foreign = SeedCryptoProvider::from_seed(*seed_for(FOREIGN_MNEMONIC), Network::Testnet); // 1. The wrapper's probe: nonempty, so it does not early-out. assert_eq!( @@ -1614,7 +1615,7 @@ mod tests { async fn a_binding_earned_elsewhere_cannot_authorize_this_wallets_auto_accepts() { let (_manager_a, wallet_a, _id_a) = wallet_with_queued_contact_crypto_from(TEST_MNEMONIC).await; - let provider_a = SeedCryptoProvider::from_seed(seed_for(TEST_MNEMONIC), Network::Testnet); + let provider_a = SeedCryptoProvider::from_seed(*seed_for(TEST_MNEMONIC), Network::Testnet); let (manager_b, wallet_b, id_b) = wallet_with_queued_contact_crypto_from(FOREIGN_MNEMONIC).await; @@ -1652,7 +1653,7 @@ mod tests { #[tokio::test] async fn a_verified_binding_carries_into_the_auto_accept_pass() { let (manager, wallet, wallet_id) = wallet_with_queued_contact_crypto().await; - let owning = SeedCryptoProvider::from_seed(seed_for(TEST_MNEMONIC), Network::Testnet); + let owning = SeedCryptoProvider::from_seed(*seed_for(TEST_MNEMONIC), Network::Testnet); let (_, binding) = wallet .identity() @@ -1726,7 +1727,7 @@ mod tests { Self { consulted: consulted.clone(), answers_from: Some(SeedCryptoProvider::from_seed( - seed_for(FOREIGN_MNEMONIC), + *seed_for(FOREIGN_MNEMONIC), Network::Testnet, )), }, @@ -1984,7 +1985,7 @@ mod tests { #[tokio::test] async fn a_deadline_with_room_left_still_lets_the_owning_seed_through() { let (manager, wallet, wallet_id) = wallet_with_queued_contact_crypto().await; - let owning = SeedCryptoProvider::from_seed(seed_for(TEST_MNEMONIC), Network::Testnet); + let owning = SeedCryptoProvider::from_seed(*seed_for(TEST_MNEMONIC), Network::Testnet); let drained = wallet .drain_pending_contact_crypto_verified( diff --git a/packages/rs-platform-wallet/src/wallet/identity/state/managed_identity/contact_requests.rs b/packages/rs-platform-wallet/src/wallet/identity/state/managed_identity/contact_requests.rs index 5027f41eef6..b16b60ca532 100644 --- a/packages/rs-platform-wallet/src/wallet/identity/state/managed_identity/contact_requests.rs +++ b/packages/rs-platform-wallet/src/wallet/identity/state/managed_identity/contact_requests.rs @@ -277,7 +277,7 @@ impl ManagedIdentity { /// sender alone) means a DIFFERENT proof from the same sender is not /// suppressed by a prior bad one. pub fn auto_accept_verify_failed_key(sender_id: &Identifier, proof: &[u8]) -> [u8; 32] { - use dashcore::hashes::{sha256, Hash, HashEngine}; + use dashcore::hashes::{sha256, HashEngine}; let mut engine = sha256::Hash::engine(); engine.input(&sender_id.to_buffer()); engine.input(proof); diff --git a/packages/rs-platform-wallet/src/wallet/masternode_withdrawal.rs b/packages/rs-platform-wallet/src/wallet/masternode_withdrawal.rs index e90851b9fb5..32bf9206254 100644 --- a/packages/rs-platform-wallet/src/wallet/masternode_withdrawal.rs +++ b/packages/rs-platform-wallet/src/wallet/masternode_withdrawal.rs @@ -29,7 +29,7 @@ use std::fmt; use async_trait::async_trait; use dashcore::crypto::ecdsa::{EcdsaPublicKey, EcdsaRecSignature, EcdsaSecretKey, EcdsaSignature}; -use dashcore::hashes::{hash160, sha256d, Hash}; +use dashcore::hashes::{hash160, sha256d}; use dashcore::{Address as DashAddress, AddressType, Network, ScriptBuf}; use dpp::address_funds::AddressWitness; use dpp::identity::accessors::IdentityGettersV0; diff --git a/packages/rs-platform-wallet/src/wallet/mnemonic.rs b/packages/rs-platform-wallet/src/wallet/mnemonic.rs index 57982468017..ecc15b58c71 100644 --- a/packages/rs-platform-wallet/src/wallet/mnemonic.rs +++ b/packages/rs-platform-wallet/src/wallet/mnemonic.rs @@ -73,7 +73,7 @@ pub fn parse_mnemonic_any_language(phrase: &str) -> Result Result, PlatformWalletError> { let mnemonic = parse_mnemonic_any_language(mnemonic) .map_err(|e| PlatformWalletError::InvalidParameter(e.to_string()))?; - Ok(Zeroizing::new(mnemonic.to_seed(""))) + Ok(mnemonic.to_seed("")) } /// Returns the BIP-32 master key of `mnemonic` on `network`, wiped when 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 a8414df417c..afed10a617f 100644 --- a/packages/rs-platform-wallet/src/wallet/platform_wallet_traits.rs +++ b/packages/rs-platform-wallet/src/wallet/platform_wallet_traits.rs @@ -437,7 +437,6 @@ impl std::fmt::Debug for PlatformWalletInfo { #[cfg(test)] mod tests { use super::*; - use dashcore::hashes::Hash; use dashcore::{Block, BlockHash, OutPoint, TxIn, TxOut, Witness}; use key_wallet::test_utils::TestWalletContext; use key_wallet::transaction_checking::BlockInfo; diff --git a/packages/rs-platform-wallet/src/wallet/provider_ecdsa_key_tests.rs b/packages/rs-platform-wallet/src/wallet/provider_ecdsa_key_tests.rs index a23c59ebe5a..8b1f5f58677 100644 --- a/packages/rs-platform-wallet/src/wallet/provider_ecdsa_key_tests.rs +++ b/packages/rs-platform-wallet/src/wallet/provider_ecdsa_key_tests.rs @@ -219,7 +219,7 @@ async fn explicitly_supplied_seed_matches_the_resident_one() { }; let supplied = block_in_place(|| { - wallet.derive_provider_key_at_index(ProviderKeyKind::Voting, 3, Some(&seed), true) + wallet.derive_provider_key_at_index(ProviderKeyKind::Voting, 3, Some(&*seed), true) }) .expect("supplied-seed derivation"); diff --git a/packages/rs-platform-wallet/src/wallet/provider_key_at_index.rs b/packages/rs-platform-wallet/src/wallet/provider_key_at_index.rs index 382a54961df..88303615f68 100644 --- a/packages/rs-platform-wallet/src/wallet/provider_key_at_index.rs +++ b/packages/rs-platform-wallet/src/wallet/provider_key_at_index.rs @@ -140,12 +140,11 @@ pub fn derive_platform_node_public_keys( // to `EdDSAAccount::from_seed`. `None` once the wallet has been // downgraded to external-signable, but registration snapshots this // while the wallet is still seed-bearing. - let seed: Zeroizing<[u8; 64]> = - Zeroizing::new(wallet.wallet_seed_bytes().ok_or_else(|| { - PlatformWalletError::KeyDerivation( - "wallet has no resident seed to pre-derive platform-node keys".to_string(), - ) - })?); + let seed: Zeroizing<[u8; 64]> = wallet.wallet_seed_bytes().ok_or_else(|| { + PlatformWalletError::KeyDerivation( + "wallet has no resident seed to pre-derive platform-node keys".to_string(), + ) + })?; let mut out = Vec::with_capacity(count as usize); for index in 0..count { @@ -207,7 +206,6 @@ pub fn populate_platform_node_pool( keys: &[ProviderPlatformNodePubKey], network: key_wallet::Network, ) -> Result<(), PlatformWalletError> { - use dashcore::hashes::Hash; use key_wallet::managed_account::address_pool::{AddressPoolType, AddressState, PublicKeyType}; use key_wallet::managed_account::managed_account_trait::ManagedAccountTrait; use key_wallet::AddressInfo; @@ -777,7 +775,7 @@ mod tests { // the #881 seed entry point at that index — the same routine // `derive_provider_key_at_index` uses for the per-index reveal, // so the persisted batch and the reveal can't diverge. - let via_api = EdDSAAccount::platform_node_key_at(&seed, Network::Mainnet, i as u32) + let via_api = EdDSAAccount::platform_node_key_at(&*seed, Network::Mainnet, i as u32) .expect("platform_node_key_at"); assert_eq!( k.public_key, @@ -796,7 +794,7 @@ mod tests { // (`m/9'/5'/3'/4'/0'`), pinned to the SLIP-10 reference in // key-wallet `provider_key_derivation_tests.rs`. This is the value // DashSync/dashwallet-ios produce. - let sk0 = EdDSAAccount::platform_node_key_at(&seed, Network::Mainnet, 0) + let sk0 = EdDSAAccount::platform_node_key_at(&*seed, Network::Mainnet, 0) .expect("platform_node_key_at"); assert_eq!( hex::encode(sk0.to_bytes()), @@ -856,7 +854,7 @@ mod tests { ); // Private: the gate-free #881 seed entry point (no account state). - let sk0 = BLSAccount::operator_private_key_at(&seed, Network::Mainnet, 0) + let sk0 = BLSAccount::operator_private_key_at(&*seed, Network::Mainnet, 0) .expect("operator private"); assert_eq!( hex::encode(sk0.to_bytes()), @@ -889,7 +887,7 @@ mod tests { "09d8beabae708de1638487f1aff44b38e8c07d9b09f22d76329d6c8ec01e2ad4d030b660bca40ddbd222373a72c5bcef", "testnet operator key0 legacy pubkey golden (dashbls reference)" ); - let sk0_t = BLSAccount::operator_private_key_at(&seed_t, Network::Testnet, 0) + let sk0_t = BLSAccount::operator_private_key_at(&*seed_t, Network::Testnet, 0) .expect("operator private"); assert_eq!( hex::encode(sk0_t.to_bytes()), @@ -936,7 +934,7 @@ mod tests { // Mismatch: A's xpub, B's seed → the guard must reject. let err = - checked_operator_private_bytes_at(&xpub_a_modern, &seed_b, Network::Mainnet, 0, true) + checked_operator_private_bytes_at(&xpub_a_modern, &*seed_b, Network::Mainnet, 0, true) .expect_err("a seed not matching the account xpub must be rejected"); assert!( matches!(err, PlatformWalletError::KeyDerivation(_)), @@ -945,7 +943,7 @@ mod tests { // Control: A's own seed passes and yields the golden secret. let ok = - checked_operator_private_bytes_at(&xpub_a_modern, &seed_a, Network::Mainnet, 0, true) + checked_operator_private_bytes_at(&xpub_a_modern, &*seed_a, Network::Mainnet, 0, true) .expect("the matching seed must pass the cross-check"); assert_eq!( hex::encode(&*ok.expect("private scalar returned when include_private")), @@ -1107,7 +1105,7 @@ mod tests { for (network, coin) in [(Network::Mainnet, "5'"), (Network::Testnet, "1'")] { let wallet = seed_bearing_wallet(network); let seed = wallet.wallet_seed_bytes().expect("resident seed"); - let master = ExtendedPrivKey::new_master(network, &seed).expect("master xpriv"); + let master = ExtendedPrivKey::new_master(network, &*seed).expect("master xpriv"); for (kind, family) in [ (ProviderKeyKind::Owner, "2'"), @@ -1120,7 +1118,7 @@ mod tests { for index in [0u32, 1, 19] { let derived = account - .derive_from_seed_private_key_at(&seed, index) + .derive_from_seed_private_key_at(&*seed, index) .expect("account-based derivation"); let path = @@ -1155,10 +1153,10 @@ mod tests { .expect("voting account"); let derived = account - .derive_from_seed_private_key_at(&seed, 19) + .derive_from_seed_private_key_at(&*seed, 19) .expect("account-based derivation"); - let master = ExtendedPrivKey::new_master(Network::Mainnet, &seed).expect("master"); + let master = ExtendedPrivKey::new_master(Network::Mainnet, &*seed).expect("master"); let doubled = master .derive_priv( &DerivationPath::from_str("m/9'/5'/3'/1'/9'/5'/3'/1'/19").expect("doubled path"), @@ -1191,7 +1189,7 @@ mod tests { let wallet = seed_bearing_wallet(Network::Mainnet); let seed = wallet.wallet_seed_bytes().expect("resident seed"); - let master = ExtendedPrivKey::new_master(Network::Mainnet, &seed).expect("master"); + let master = ExtendedPrivKey::new_master(Network::Mainnet, &*seed).expect("master"); for (kind, family) in [ (ProviderKeyKind::Owner, "2'"), @@ -1212,7 +1210,7 @@ mod tests { // change back to it fails here rather than on a device. assert!( watch_only - .derive_from_seed_private_key_at(&seed, 19) + .derive_from_seed_private_key_at(&*seed, 19) .is_err(), "the gated wrapper is expected to refuse a watch-only account" ); diff --git a/packages/rs-platform-wallet/src/wallet/shielded/activity.rs b/packages/rs-platform-wallet/src/wallet/shielded/activity.rs index 7fb79b2b365..e0e8f3438c2 100644 --- a/packages/rs-platform-wallet/src/wallet/shielded/activity.rs +++ b/packages/rs-platform-wallet/src/wallet/shielded/activity.rs @@ -237,7 +237,7 @@ impl ShieldedActivityEntry { /// callers that could produce an empty visible set (a fully-dummy /// bundle) should not record an entry at all. pub fn compute_activity_id(cmxs: &[[u8; 32]]) -> [u8; 32] { - use dpp::dashcore::hashes::{sha256, Hash, HashEngine}; + use dpp::dashcore::hashes::{sha256, HashEngine}; let mut sorted: Vec<[u8; 32]> = cmxs.to_vec(); sorted.sort_unstable(); diff --git a/packages/rs-platform-wallet/src/wallet/shielded/wallet_drain.rs b/packages/rs-platform-wallet/src/wallet/shielded/wallet_drain.rs index 8c4f4f38a65..642ad4a12cf 100644 --- a/packages/rs-platform-wallet/src/wallet/shielded/wallet_drain.rs +++ b/packages/rs-platform-wallet/src/wallet/shielded/wallet_drain.rs @@ -5,7 +5,6 @@ use std::sync::Arc; use dashcore::blockdata::transaction::special_transaction::asset_lock::AssetLockPayload; use dashcore::blockdata::transaction::special_transaction::TransactionPayload; -use dashcore::hashes::Hash; use dashcore::{PubkeyHash, ScriptBuf, TxOut}; use dpp::balances::credits::CREDITS_PER_DUFF; use key_wallet::wallet::managed_wallet_info::coin_selection::{SelectionError, SelectionStrategy}; diff --git a/packages/rs-sdk-ffi/src/mnemonic_resolver_core_signer.rs b/packages/rs-sdk-ffi/src/mnemonic_resolver_core_signer.rs index 038a089f814..5418123ad43 100644 --- a/packages/rs-sdk-ffi/src/mnemonic_resolver_core_signer.rs +++ b/packages/rs-sdk-ffi/src/mnemonic_resolver_core_signer.rs @@ -326,7 +326,7 @@ impl MnemonicResolverCoreSigner { .map_err(|e| MnemonicResolverSignerError::InvalidMnemonic(e.to_string()))?; // ---- Derive seed and BIP-32 key at `path` --------------------------- - let seed: Zeroizing<[u8; 64]> = Zeroizing::new(mnemonic.to_seed("")); + let seed: Zeroizing<[u8; 64]> = mnemonic.to_seed(""); drop(mnemonic); let master = ExtendedPrivKey::new_master(self.network, seed.as_ref()) @@ -888,7 +888,7 @@ mod tests { // Independently derive the expected xpub straight from the known // BIP-39 vector — same network + path, no resolver in the loop. let mnemonic = parse_mnemonic_any_language(ENGLISH_PHRASE).expect("valid phrase"); - let master = ExtendedPrivKey::new_master(Network::Testnet, &mnemonic.to_seed("")) + let master = ExtendedPrivKey::new_master(Network::Testnet, &*mnemonic.to_seed("")) .expect("master derivation"); let derived = master.derive_priv(&path).expect("path derivation"); let expected = ExtendedPubKey::from_priv(&derived); @@ -950,7 +950,7 @@ mod tests { let mnemonic = Mnemonic::from_phrase(ENGLISH_PHRASE).expect("valid mnemonic"); let seed = mnemonic.to_seed(""); let wallet = - Wallet::from_seed_bytes(seed, Network::Testnet, WalletAccountCreationOptions::None) + Wallet::from_seed_bytes(*seed, Network::Testnet, WalletAccountCreationOptions::None) .expect("seeded wallet"); let expected = wallet .derive_extended_public_key(&path) @@ -1001,7 +1001,7 @@ mod tests { let mnemonic = Mnemonic::from_phrase(ENGLISH_PHRASE).expect("valid mnemonic"); let seed = mnemonic.to_seed(""); let wallet = - Wallet::from_seed_bytes(seed, Network::Testnet, WalletAccountCreationOptions::None) + Wallet::from_seed_bytes(*seed, Network::Testnet, WalletAccountCreationOptions::None) .expect("seeded wallet"); let xprv = wallet .derive_extended_private_key(&path) @@ -1057,7 +1057,7 @@ mod tests { let mnemonic = Mnemonic::from_phrase(ENGLISH_PHRASE).expect("valid mnemonic"); let seed = mnemonic.to_seed(""); let wallet = - Wallet::from_seed_bytes(seed, Network::Testnet, WalletAccountCreationOptions::None) + Wallet::from_seed_bytes(*seed, Network::Testnet, WalletAccountCreationOptions::None) .expect("seeded wallet"); let secret = wallet .derive_extended_private_key(&path) @@ -1144,7 +1144,7 @@ mod tests { let mnemonic = Mnemonic::from_phrase(ENGLISH_PHRASE).expect("valid mnemonic"); let seed = mnemonic.to_seed(""); let wallet = - Wallet::from_seed_bytes(seed, Network::Testnet, WalletAccountCreationOptions::None) + Wallet::from_seed_bytes(*seed, Network::Testnet, WalletAccountCreationOptions::None) .expect("seeded wallet"); let enc_key: Zeroizing<[u8; 32]> = { let path = root_path.clone().extend([ diff --git a/packages/rs-sdk-ffi/src/signer_simple.rs b/packages/rs-sdk-ffi/src/signer_simple.rs index 69538a103fb..f22b4266162 100644 --- a/packages/rs-sdk-ffi/src/signer_simple.rs +++ b/packages/rs-sdk-ffi/src/signer_simple.rs @@ -377,10 +377,9 @@ pub unsafe extern "C" fn dash_sdk_sign_with_mnemonic_and_path( Ok(m) => m, Err(_) => return fail(SIGN_WITH_MNEMONIC_ERR_INVALID_MNEMONIC), }; - // `to_seed` returns `[u8; 64]` by value; wrap immediately so the - // 64 bytes get zeroed when this function returns (success or fail). - let seed: zeroize::Zeroizing<[u8; 64]> = - zeroize::Zeroizing::new(mnemonic.to_seed(passphrase_str)); + // `to_seed` returns a `Zeroizing` buffer, so the 64 bytes get zeroed + // when this function returns (success or fail). + let seed: zeroize::Zeroizing<[u8; 64]> = mnemonic.to_seed(passphrase_str); // ---- Derivation path ----------------------------------------------------- let path = match DerivationPath::from_str(path_str) { diff --git a/packages/rs-sdk-ffi/src/voting/masternode_vote.rs b/packages/rs-sdk-ffi/src/voting/masternode_vote.rs index 47e6af72ecf..e20805c5134 100644 --- a/packages/rs-sdk-ffi/src/voting/masternode_vote.rs +++ b/packages/rs-sdk-ffi/src/voting/masternode_vote.rs @@ -52,7 +52,7 @@ use crate::types::{FFINetwork, Network}; use crate::FFIError; -use dash_sdk::dpp::dashcore::hashes::{hash160, Hash}; +use dash_sdk::dpp::dashcore::hashes::hash160; use dash_sdk::dpp::dashcore::ProTxHash; use dash_sdk::dpp::platform_value::Identifier; use dash_sdk::dpp::secp256k1::{PublicKey, SecretKey}; diff --git a/packages/rs-sdk-trusted-context-provider/examples/refresh_checkpoints.rs b/packages/rs-sdk-trusted-context-provider/examples/refresh_checkpoints.rs index d03aad137ff..6ac21d83fa4 100644 --- a/packages/rs-sdk-trusted-context-provider/examples/refresh_checkpoints.rs +++ b/packages/rs-sdk-trusted-context-provider/examples/refresh_checkpoints.rs @@ -420,10 +420,10 @@ async fn refresh( let name = network.to_string(); let quorum_type = network.platform_type(); let params = quorum_type.params(); - let interval = params.dkg_params.interval; + let interval = u32::from(params.dkg_interval); // Half a quorum lifetime: Platform's Core height trails the tip by a few // blocks unless it halts. - let depth = interval * params.signing_active_quorum_count / 2; + let depth = interval * u32::from(params.signing_active_quorum_count) / 2; let url = format!("{relay}/quorums"); let response = client diff --git a/packages/rs-sdk-trusted-context-provider/src/verified_provider.rs b/packages/rs-sdk-trusted-context-provider/src/verified_provider.rs index 6970c68f056..278eb5a11ad 100644 --- a/packages/rs-sdk-trusted-context-provider/src/verified_provider.rs +++ b/packages/rs-sdk-trusted-context-provider/src/verified_provider.rs @@ -465,10 +465,8 @@ impl VerifiedHttpContextProvider { // `signing_active_quorum_count` quorums, one is formed every DKG // interval, and one more interval covers a quorum mined late in it. // This bounds requests; it never decides which key is served. - let window = params - .dkg_params - .interval - .saturating_mul(params.signing_active_quorum_count.saturating_add(1)); + let window = u32::from(params.dkg_interval) + .saturating_mul(u32::from(params.signing_active_quorum_count).saturating_add(1)); let fetches = ProofFetches::new( u32::from(u8::from(platform_type)), window, @@ -2806,7 +2804,7 @@ mod tests { #[test] fn should_ask_lower_by_one_dkg_interval_of_the_platform_quorums() { for network in [Network::Mainnet, Network::Testnet] { - let interval = network.platform_type().params().dkg_params.interval; + let interval = u32::from(network.platform_type().params().dkg_interval); assert_eq!(interval, DKG_INTERVAL_BLOCKS, "{network:?}"); } } diff --git a/packages/rs-sdk/src/core/dash_core_client.rs b/packages/rs-sdk/src/core/dash_core_client.rs index 0a869615353..8e91f967c96 100644 --- a/packages/rs-sdk/src/core/dash_core_client.rs +++ b/packages/rs-sdk/src/core/dash_core_client.rs @@ -6,7 +6,7 @@ use crate::error::Error; use dash_context_provider::ContextProviderError; use dashcore_rpc::{ - dashcore::{hashes::Hash, Amount, QuorumHash}, + dashcore::{Amount, QuorumHash}, dashcore_rpc_json as json, json::{ProTxList, ProTxListType}, jsonrpc::error::{Error as JsonRpcError, RpcError}, diff --git a/packages/rs-sdk/src/core/transaction.rs b/packages/rs-sdk/src/core/transaction.rs index 99f9862aa5d..e0f09f7e31e 100644 --- a/packages/rs-sdk/src/core/transaction.rs +++ b/packages/rs-sdk/src/core/transaction.rs @@ -8,7 +8,6 @@ use dapi_grpc::core::v0::{ TransactionsWithProofsResponse, }; use dpp::dashcore::consensus::Decodable; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::{ Address, Block, BlockHash, InstantLock, MerkleBlock, OutPoint, Transaction, Txid, }; diff --git a/packages/rs-sdk/src/error.rs b/packages/rs-sdk/src/error.rs index d8e8e91ad57..899bccfa103 100644 --- a/packages/rs-sdk/src/error.rs +++ b/packages/rs-sdk/src/error.rs @@ -816,7 +816,6 @@ mod tests { use dapi_grpc::tonic::metadata::{MetadataMap, MetadataValue}; use dpp::consensus::basic::identity::IdentityAssetLockProofLockedTransactionMismatchError; use dpp::consensus::basic::BasicError; - use dpp::dashcore::hashes::Hash; use dpp::dashcore::Txid; use dpp::serialization::PlatformSerializableWithPlatformVersion; use dpp::version::PlatformVersion; diff --git a/packages/rs-sdk/src/platform/dashpay/invitation.rs b/packages/rs-sdk/src/platform/dashpay/invitation.rs index 1c880a8f74d..38b4d61a6ea 100644 --- a/packages/rs-sdk/src/platform/dashpay/invitation.rs +++ b/packages/rs-sdk/src/platform/dashpay/invitation.rs @@ -2092,7 +2092,6 @@ mod tests { use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutPointAlreadyConsumedError; use dpp::consensus::basic::BasicError; use dpp::consensus::ConsensusError; - use dpp::dashcore::hashes::Hash; use dpp::dashcore::{OutPoint, Txid}; use dpp::identity::{Identity, IdentityPublicKey, KeyID}; use std::collections::BTreeMap; diff --git a/packages/rs-sdk/src/platform/dpns_usernames/mod.rs b/packages/rs-sdk/src/platform/dpns_usernames/mod.rs index 0f498dc80e7..e8cfb64a811 100644 --- a/packages/rs-sdk/src/platform/dpns_usernames/mod.rs +++ b/packages/rs-sdk/src/platform/dpns_usernames/mod.rs @@ -95,7 +95,7 @@ fn preorder_revealable(preorder: &Document, ttl_seconds: Option, now_ms: u6 /// Hash a buffer twice using SHA256 (double SHA256) fn hash_double(data: Vec) -> [u8; 32] { - use dpp::dashcore::hashes::{sha256d, Hash}; + use dpp::dashcore::hashes::sha256d; // sha256d already does double SHA256 let hash = sha256d::Hash::hash(&data); hash.to_byte_array() @@ -924,7 +924,7 @@ mod tests { } fn sha256d(parts: &[&[u8]]) -> [u8; 32] { - use dpp::dashcore::hashes::{sha256d, Hash}; + use dpp::dashcore::hashes::sha256d; sha256d::Hash::hash(&parts.concat()).to_byte_array() } diff --git a/packages/rs-sdk/src/platform/query.rs b/packages/rs-sdk/src/platform/query.rs index 1622f701a95..3434ec94a3b 100644 --- a/packages/rs-sdk/src/platform/query.rs +++ b/packages/rs-sdk/src/platform/query.rs @@ -39,7 +39,7 @@ use dapi_grpc::platform::v0::{ GetTokenPerpetualDistributionLastClaimRequest, GetVotePollsByEndDateRequest, SpecificKeys, }; use dpp::address_funds::PlatformAddress; -use dpp::dashcore_rpc::dashcore::{hashes::Hash, ProTxHash}; +use dpp::dashcore_rpc::dashcore::ProTxHash; use dpp::identity::KeyID; use dpp::version::PlatformVersionError; use dpp::{block::epoch::EpochIndex, prelude::Identifier}; diff --git a/packages/rs-sdk/src/platform/transition/asset_lock_submission.rs b/packages/rs-sdk/src/platform/transition/asset_lock_submission.rs index 5cece93410a..e7e3b2651de 100644 --- a/packages/rs-sdk/src/platform/transition/asset_lock_submission.rs +++ b/packages/rs-sdk/src/platform/transition/asset_lock_submission.rs @@ -508,7 +508,6 @@ mod asset_lock_already_consumed_tests { use crate::error::StateTransitionBroadcastError; use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutPointAlreadyConsumedError; use dpp::consensus::basic::UnsupportedProtocolVersionError; - use dpp::dashcore::hashes::Hash; use dpp::dashcore::Txid; use dpp::ProtocolError; diff --git a/packages/rs-sdk/src/platform/transition/masternode_vote_keys.rs b/packages/rs-sdk/src/platform/transition/masternode_vote_keys.rs index 13d5a0a82c5..12c4d4212d1 100644 --- a/packages/rs-sdk/src/platform/transition/masternode_vote_keys.rs +++ b/packages/rs-sdk/src/platform/transition/masternode_vote_keys.rs @@ -17,7 +17,6 @@ //! [`PutVote`]: super::vote::PutVote //! [`Signer`]: dpp::identity::signer::Signer -use dpp::dashcore::hashes::Hash; use dpp::dashcore::ProTxHash; use dpp::identifier::MasternodeIdentifiers; use dpp::identity::accessors::IdentityGettersV0; diff --git a/packages/rs-sdk/tests/fetch/config.rs b/packages/rs-sdk/tests/fetch/config.rs index 611e3911835..b6b27196d18 100644 --- a/packages/rs-sdk/tests/fetch/config.rs +++ b/packages/rs-sdk/tests/fetch/config.rs @@ -5,9 +5,7 @@ use crate::fetch::generated_data::*; use dpp::{ - dashcore::{hashes::Hash, ProTxHash}, - data_contracts::dpns_contract, - prelude::Identifier, + dashcore::ProTxHash, data_contracts::dpns_contract, prelude::Identifier, version::PlatformVersion, }; use rs_dapi_client::{Address, AddressList}; diff --git a/packages/rs-sdk/tests/fetch/contested_resource_identity_votes.rs b/packages/rs-sdk/tests/fetch/contested_resource_identity_votes.rs index 82848f8e16b..196f8cf0fd7 100644 --- a/packages/rs-sdk/tests/fetch/contested_resource_identity_votes.rs +++ b/packages/rs-sdk/tests/fetch/contested_resource_identity_votes.rs @@ -5,7 +5,7 @@ use dash_sdk::platform::FetchMany; use dash_sdk::query_types::{ResourceVoteWithCount, ResourceVotesByIdentity}; use dash_sdk::Sdk; use dpp::{ - dashcore::{hashes::Hash, ProTxHash}, + dashcore::ProTxHash, identifier::Identifier, platform_value::Value, voting::{ diff --git a/packages/rs-sdk/tests/fetch/protocol_version_votes.rs b/packages/rs-sdk/tests/fetch/protocol_version_votes.rs index b2142134b4e..dac6cb79e18 100644 --- a/packages/rs-sdk/tests/fetch/protocol_version_votes.rs +++ b/packages/rs-sdk/tests/fetch/protocol_version_votes.rs @@ -1,6 +1,6 @@ use super::{common::setup_logs, config::Config}; use dash_sdk::platform::{types::version_votes::MasternodeProtocolVoteEx, FetchMany}; -use dpp::dashcore_rpc::dashcore::{hashes::Hash, ProTxHash}; +use dpp::dashcore_rpc::dashcore::ProTxHash; use drive_proof_verifier::types::MasternodeProtocolVote; /// Given protxhash with only zeros, when I fetch protocol version votes for nodes, I can retrieve them. diff --git a/packages/rs-sdk/tests/fetch/vote_poll_default_limit.rs b/packages/rs-sdk/tests/fetch/vote_poll_default_limit.rs index 0f371f69b4b..930464d2980 100644 --- a/packages/rs-sdk/tests/fetch/vote_poll_default_limit.rs +++ b/packages/rs-sdk/tests/fetch/vote_poll_default_limit.rs @@ -13,7 +13,7 @@ use dash_sdk::platform::QuerySettings; use dash_sdk::platform::{FetchMany, Query}; use dash_sdk::query_types::ResourceVoteWithCount; use dash_sdk::{Sdk, SdkBuilder}; -use dpp::dashcore::{hashes::Hash, ProTxHash}; +use dpp::dashcore::ProTxHash; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::TokenConfiguration; use dpp::prelude::{DataContract, Identifier}; diff --git a/packages/rs-sdk/tests/proof_options.rs b/packages/rs-sdk/tests/proof_options.rs index 0de5d492b7a..1c26470d769 100644 --- a/packages/rs-sdk/tests/proof_options.rs +++ b/packages/rs-sdk/tests/proof_options.rs @@ -16,7 +16,7 @@ use dash_sdk::platform::{ }; use dash_sdk::Error; use dpp::address_funds::PlatformAddress; -use dpp::dashcore::{hashes::Hash, ProTxHash}; +use dpp::dashcore::ProTxHash; use dpp::data_contract::DataContractFactory; use dpp::platform_value::platform_value; use dpp::version::PlatformVersion; diff --git a/packages/rs-unified-sdk-jni/src/persistence.rs b/packages/rs-unified-sdk-jni/src/persistence.rs index d9d79713b43..b3b3b55d40d 100644 --- a/packages/rs-unified-sdk-jni/src/persistence.rs +++ b/packages/rs-unified-sdk-jni/src/persistence.rs @@ -5023,7 +5023,6 @@ pub extern "system" fn Java_org_dashfoundation_dashsdk_ffi_WalletManagerNative_n mod tests { use dashcore::blockdata::transaction::special_transaction::provider_update_service::ProviderUpdateServicePayload; use dashcore::consensus::{deserialize, serialize}; - use dashcore::hashes::Hash; use dashcore::transaction::TransactionPayload; use dashcore::{ScriptBuf, Transaction, Txid}; diff --git a/packages/rs-unified-sdk-jni/src/tx_decode.rs b/packages/rs-unified-sdk-jni/src/tx_decode.rs index 74775dce0f1..e04f766dd2c 100644 --- a/packages/rs-unified-sdk-jni/src/tx_decode.rs +++ b/packages/rs-unified-sdk-jni/src/tx_decode.rs @@ -202,7 +202,6 @@ mod tests { use super::*; use dashcore::consensus::serialize; use dashcore::ecdsa::EcdsaSecretKey; - use dashcore::hashes::Hash; use dashcore::{ Address, Network, OutPoint, PublicKey, ScriptBuf, Transaction, TxIn, TxOut, Txid, Witness, }; diff --git a/packages/simple-signer/src/single_key_signer.rs b/packages/simple-signer/src/single_key_signer.rs index 2b5d039387f..7f14f7c5bf6 100644 --- a/packages/simple-signer/src/single_key_signer.rs +++ b/packages/simple-signer/src/single_key_signer.rs @@ -145,7 +145,7 @@ impl Signer for SingleKeySigner { } KeyType::ECDSA_HASH160 => { // Compare hash160 of public key - use dpp::dashcore::hashes::{hash160, Hash}; + use dpp::dashcore::hashes::hash160; let public_key = self.private_key.inner.public_key(); let public_key_bytes = public_key.to_compressed(); @@ -225,7 +225,7 @@ mod tests { #[test] fn test_can_sign_with_ecdsa_key_types() -> Result<(), String> { - use dpp::dashcore::hashes::{hash160, Hash}; + use dpp::dashcore::hashes::hash160; let signer = SingleKeySigner::new_from_slice(&[0x03; 32], Network::Testnet)?; let public_key = signer.private_key.inner.public_key().to_compressed(); diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs index 565392603e6..d7f559a7cc0 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs @@ -1,7 +1,6 @@ use dpp::consensus::basic::identity::IdentityAssetLockProofLockedTransactionMismatchError; use dpp::consensus::codes::ErrorWithCode; use dpp::consensus::ConsensusError; -use dpp::dashcore::hashes::Hash; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_state_transition_replay_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_state_transition_replay_error.rs index 997414b434a..6a91a906012 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_state_transition_replay_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_state_transition_replay_error.rs @@ -2,7 +2,6 @@ use dpp::consensus::basic::identity::IdentityAssetLockStateTransitionReplayError use dpp::consensus::codes::ErrorWithCode; use dpp::consensus::ConsensusError; -use dpp::dashcore::hashes::Hash; use wasm_bindgen::prelude::*; use crate::buffer::Buffer; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_exists_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_exists_error.rs index 39a5262f92d..cee46153e72 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_exists_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_exists_error.rs @@ -1,7 +1,6 @@ use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutPointAlreadyConsumedError; use dpp::consensus::codes::ErrorWithCode; use dpp::consensus::ConsensusError; -use dpp::dashcore::hashes::Hash; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_transaction_out_point_not_enough_balance_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_transaction_out_point_not_enough_balance_error.rs index 61728ed533e..f384561ea3a 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_transaction_out_point_not_enough_balance_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_transaction_out_point_not_enough_balance_error.rs @@ -3,7 +3,6 @@ use dpp::consensus::ConsensusError; use crate::buffer::Buffer; use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutPointNotEnoughBalanceError; -use dpp::dashcore::hashes::Hash; use wasm_bindgen::prelude::*; #[wasm_bindgen(js_name=IdentityAssetLockTransactionOutPointNotEnoughBalanceError)] diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs index 34d182a93ae..7889e7a315b 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs @@ -2,7 +2,6 @@ use dpp::consensus::basic::identity::InvalidIdentityAssetLockProofChainLockValid use crate::buffer::Buffer; -use dpp::dashcore::hashes::Hash; use wasm_bindgen::prelude::*; #[wasm_bindgen(js_name=InvalidIdentityAssetLockProofChainLockValidationErrorWasm)] diff --git a/packages/wasm-dpp2/src/core/pro_tx_hash.rs b/packages/wasm-dpp2/src/core/pro_tx_hash.rs index 447d1c83254..d561a0dfe02 100644 --- a/packages/wasm-dpp2/src/core/pro_tx_hash.rs +++ b/packages/wasm-dpp2/src/core/pro_tx_hash.rs @@ -2,7 +2,7 @@ use crate::error::{WasmDppError, WasmDppResult}; use crate::impl_wasm_type_info; use crate::utils::{IntoWasm, try_to_fixed_bytes}; use dpp::dashcore::ProTxHash; -use dpp::dashcore::hashes::{Hash, sha256d}; +use dpp::dashcore::hashes::sha256d; use std::str::FromStr; use wasm_bindgen::JsValue; use wasm_bindgen::prelude::wasm_bindgen; diff --git a/packages/wasm-dpp2/src/identity/signer.rs b/packages/wasm-dpp2/src/identity/signer.rs index 8c5956d610c..e4d23837398 100644 --- a/packages/wasm-dpp2/src/identity/signer.rs +++ b/packages/wasm-dpp2/src/identity/signer.rs @@ -10,7 +10,6 @@ use crate::impl_try_from_options; use crate::impl_wasm_type_info; use dpp::ProtocolError; use dpp::address_funds::{AddressWitness, PlatformAddress}; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::signer; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use dpp::identity::signer::Signer; diff --git a/packages/wasm-sdk/src/queries/epoch.rs b/packages/wasm-sdk/src/queries/epoch.rs index 3ff91426aed..3b54452039a 100644 --- a/packages/wasm-sdk/src/queries/epoch.rs +++ b/packages/wasm-sdk/src/queries/epoch.rs @@ -3,7 +3,6 @@ use crate::queries::utils::deserialize_required_query; use crate::queries::ProofMetadataResponseWasm; use crate::sdk::WasmSdk; use dash_sdk::dpp::block::extended_epoch_info::ExtendedEpochInfo; -use dash_sdk::dpp::dashcore::hashes::Hash; use dash_sdk::dpp::dashcore::ProTxHash; use dash_sdk::platform::fetch_current_no_parameters::FetchCurrent; use dash_sdk::platform::types::proposed_blocks::ProposedBlockCountEx; diff --git a/packages/wasm-sdk/src/wallet/dip14.rs b/packages/wasm-sdk/src/wallet/dip14.rs index d898e7c2acb..6c7cb730773 100644 --- a/packages/wasm-sdk/src/wallet/dip14.rs +++ b/packages/wasm-sdk/src/wallet/dip14.rs @@ -4,7 +4,7 @@ //! instead of the standard 31-bit limitation. use dash_sdk::dpp::dashcore::ecdsa::{EcdsaPublicKey, EcdsaSecretKey}; -use dash_sdk::dpp::dashcore::hashes::{sha256, Hash}; +use dash_sdk::dpp::dashcore::hashes::sha256; use dash_sdk::dpp::dashcore::Network; use dash_sdk::dpp::key_wallet; use dash_sdk::dpp::key_wallet::bip32::{ExtendedPrivKey, ExtendedPubKey}; @@ -152,9 +152,9 @@ impl Dip14ExtendedPrivKey { // Use sha256 then ripemd160 to create hash160 let sha256_hash = sha256::Hash::hash(&parent_pubkey.to_compressed()); let parent_pubkey_hash = - dash_sdk::dpp::dashcore::hashes::ripemd160::Hash::hash(&sha256_hash[..]); + dash_sdk::dpp::dashcore::hashes::ripemd160::Hash::hash(sha256_hash.as_byte_array()); let mut parent_fingerprint = [0u8; 4]; - parent_fingerprint.copy_from_slice(&parent_pubkey_hash[0..4]); + parent_fingerprint.copy_from_slice(&parent_pubkey_hash.as_byte_array()[0..4]); Ok(Self { network: self.network, diff --git a/packages/wasm-sdk/src/wallet/key_generation.rs b/packages/wasm-sdk/src/wallet/key_generation.rs index 82a366c81ca..f4197c5937d 100644 --- a/packages/wasm-sdk/src/wallet/key_generation.rs +++ b/packages/wasm-sdk/src/wallet/key_generation.rs @@ -5,7 +5,7 @@ use crate::error::WasmSdkError; use crate::impl_wasm_serde_conversions; use crate::sdk::WasmSdk; -use dash_sdk::dpp::dashcore::hashes::{sha256, Hash}; +use dash_sdk::dpp::dashcore::hashes::sha256; use dash_sdk::dpp::dashcore::{Address, Network, PrivateKey, PublicKey}; use dash_sdk::dpp::secp256k1::SecretKey; use serde::{Deserialize, Serialize};