diff --git a/Cargo.lock b/Cargo.lock index d82395f5f..b3ce87a90 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1876,8 +1876,8 @@ dependencies = [ [[package]] name = "dapi-grpc" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "dash-platform-macros", "futures-core", @@ -1978,8 +1978,8 @@ dependencies = [ [[package]] name = "dash-async" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "thiserror 2.0.18", "tokio", @@ -1988,8 +1988,8 @@ dependencies = [ [[package]] name = "dash-context-provider" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "dash-async", "dpp", @@ -2099,8 +2099,8 @@ dependencies = [ [[package]] name = "dash-platform-macros" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "heck", "quote", @@ -2109,8 +2109,8 @@ dependencies = [ [[package]] name = "dash-sdk" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "arc-swap", "async-trait", @@ -2246,8 +2246,8 @@ dependencies = [ [[package]] name = "dashpay-contract" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "platform-value", "platform-version", @@ -2257,8 +2257,8 @@ dependencies = [ [[package]] name = "data-contracts" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "dashpay-contract", "document-history-contract", @@ -2526,8 +2526,8 @@ dependencies = [ [[package]] name = "document-history-contract" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "platform-value", "platform-version", @@ -2555,8 +2555,8 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" [[package]] name = "dpns-contract" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "platform-value", "platform-version", @@ -2566,8 +2566,8 @@ dependencies = [ [[package]] name = "dpp" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "anyhow", "async-trait", @@ -2616,8 +2616,8 @@ dependencies = [ [[package]] name = "dpp-json-convertible-derive" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "proc-macro2", "quote", @@ -2626,8 +2626,8 @@ dependencies = [ [[package]] name = "drive" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "bincode 2.0.1", "byteorder", @@ -2651,8 +2651,8 @@ dependencies = [ [[package]] name = "drive-proof-verifier" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "bincode 2.0.1", "dapi-grpc", @@ -5045,8 +5045,8 @@ dependencies = [ [[package]] name = "keyword-search-contract" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "platform-value", "platform-version", @@ -5258,8 +5258,8 @@ dependencies = [ [[package]] name = "masternode-reward-shares-contract" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "platform-value", "platform-version", @@ -6470,8 +6470,8 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "platform-encryption" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "aes", "cbc", @@ -6483,8 +6483,8 @@ dependencies = [ [[package]] name = "platform-serialization" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "bincode 2.0.1", "platform-version", @@ -6492,8 +6492,8 @@ dependencies = [ [[package]] name = "platform-serialization-derive" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "proc-macro2", "quote", @@ -6503,8 +6503,8 @@ dependencies = [ [[package]] name = "platform-value" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "base64 0.22.1", "bincode 2.0.1", @@ -6523,8 +6523,8 @@ dependencies = [ [[package]] name = "platform-version" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "bincode 2.0.1", "grovedb-version 5.0.1", @@ -6534,8 +6534,8 @@ dependencies = [ [[package]] name = "platform-versioning" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "proc-macro2", "quote", @@ -6544,8 +6544,8 @@ dependencies = [ [[package]] name = "platform-wallet" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "arc-swap", "async-trait", @@ -6576,8 +6576,8 @@ dependencies = [ [[package]] name = "platform-wallet-storage" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "apple-native-keyring-store", "argon2", @@ -7573,8 +7573,8 @@ dependencies = [ [[package]] name = "rs-dapi-client" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "backon", "chrono", @@ -7599,8 +7599,8 @@ dependencies = [ [[package]] name = "rs-sdk-trusted-context-provider" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "arc-swap", "dash-async", @@ -8841,8 +8841,8 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token-history-contract" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "platform-value", "platform-version", @@ -9686,8 +9686,8 @@ dependencies = [ [[package]] name = "wallet-utils-contract" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "platform-value", "platform-version", @@ -10942,8 +10942,8 @@ dependencies = [ [[package]] name = "withdrawals-contract" -version = "4.1.0-rc.1" -source = "git+https://github.com/dashpay/platform?rev=288a6cae4f9653d6085d2b3d6c7410210a0c95ba#288a6cae4f9653d6085d2b3d6c7410210a0c95ba" +version = "4.1.0" +source = "git+https://github.com/dashpay/platform?branch=feat%2Fplatform-wallet-storage-rehydration#debf67bdae8d72ae76aba362c43daafba8a5c21d" dependencies = [ "num_enum 0.5.11", "platform-value", diff --git a/Cargo.toml b/Cargo.toml index c9140a835..618668f26 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ eframe = { version = "0.35.0", features = ["persistence", "wgpu"] } base64 = "0.22.1" # TODO: GHSA-7gcf-g7xr-8hxj (serde_with <3.21.0) is unfixable from here — the 2.x pin lives in # dashcore-rpc-json (dashpay/rust-dashcore, rpc-json/Cargo.toml). Re-check when these pins move. -dash-sdk = { git = "https://github.com/dashpay/platform", rev = "288a6cae4f9653d6085d2b3d6c7410210a0c95ba", features = [ +dash-sdk = { git = "https://github.com/dashpay/platform", branch = "feat/platform-wallet-storage-rehydration", features = [ "core_key_wallet", "core_key_wallet_manager", "core_bincode", @@ -30,12 +30,12 @@ dash-sdk = { git = "https://github.com/dashpay/platform", rev = "288a6cae4f9653d "core_spv", "shielded", ] } -rs-sdk-trusted-context-provider = { git = "https://github.com/dashpay/platform", rev = "288a6cae4f9653d6085d2b3d6c7410210a0c95ba" } -platform-wallet = { git = "https://github.com/dashpay/platform", rev = "288a6cae4f9653d6085d2b3d6c7410210a0c95ba", features = [ +rs-sdk-trusted-context-provider = { git = "https://github.com/dashpay/platform", branch = "feat/platform-wallet-storage-rehydration" } +platform-wallet = { git = "https://github.com/dashpay/platform", branch = "feat/platform-wallet-storage-rehydration", features = [ "serde", "shielded", ] } -platform-wallet-storage = { git = "https://github.com/dashpay/platform", rev = "288a6cae4f9653d6085d2b3d6c7410210a0c95ba", features = [ +platform-wallet-storage = { git = "https://github.com/dashpay/platform", branch = "feat/platform-wallet-storage-rehydration", features = [ "shielded", ] } zip32 = "0.2.0"