Skip to content

Commit 8100139

Browse files
authored
Merge pull request #227 from xch-dev/hardened-keys
Hardened keys
2 parents c37183b + e39ec6f commit 8100139

30 files changed

+747
-263
lines changed

.sqlx/query-0e221ba6a44bdd687317f09e1003803d8c3e38cb0101e01af1ed59bd7f64e078.json

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.sqlx/query-211edf13476a2c9e6bfb5d3b026c03ce433aa3e425e0ca136766591d10497281.json

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.sqlx/query-72c9608d6e6a3deefc13e74e367861d96ec5e166b3375a365f6938a43aff5c11.json

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.sqlx/query-8bc14ce79ff1a599fa6cb5bda7f22d2f31b05b3980015fd6f885ba585af8524e.json renamed to .sqlx/query-9a831561a6da3332d62751a0e0657ea986ab761fe442df4e343fe8dc55ac7ad2.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.sqlx/query-cf4af3005a8ec67a1245a2f789f0af9fa06480ce6c0b2821713c762c02b54af9.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

Cargo.lock

Lines changed: 0 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ itertools = "0.13.0"
9999
anyhow = "1.0.86"
100100
thiserror = "1.0.63"
101101
hex-literal = "0.4.1"
102-
rayon = "1.10.0"
103102
once_cell = "1.19.0"
104103
num-traits = "0.2.19"
105104
paste = "1.0.15"

crates/sage-api/src/requests/actions.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,12 @@ pub struct UpdateNft {
3737

3838
#[derive(Debug, Clone, Copy, Serialize, Deserialize, Type)]
3939
pub struct UpdateNftResponse {}
40+
41+
#[derive(Debug, Clone, Copy, Serialize, Deserialize, Type)]
42+
pub struct IncreaseDerivationIndex {
43+
pub hardened: bool,
44+
pub index: u32,
45+
}
46+
47+
#[derive(Debug, Clone, Copy, Serialize, Deserialize, Type)]
48+
pub struct IncreaseDerivationIndexResponse {}

crates/sage-api/src/requests/data.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ use crate::{
88

99
#[derive(Debug, Clone, Copy, Serialize, Deserialize, Type)]
1010
pub struct GetDerivations {
11+
#[serde(default)]
12+
pub hardened: bool,
1113
pub offset: u32,
1214
pub limit: u32,
1315
}

crates/sage-api/src/requests/keys.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ pub struct Resync {
2222
pub fingerprint: u32,
2323
#[serde(default)]
2424
pub delete_offer_files: bool,
25+
#[serde(default)]
26+
pub delete_unhardened_derivations: bool,
27+
#[serde(default)]
28+
pub delete_hardened_derivations: bool,
2529
}
2630

2731
#[derive(Debug, Clone, Copy, Serialize, Deserialize, Type)]
@@ -41,6 +45,8 @@ pub struct GenerateMnemonicResponse {
4145
pub struct ImportKey {
4246
pub name: String,
4347
pub key: String,
48+
#[serde(default)]
49+
pub derivation_index: u32,
4450
#[serde(default = "yes")]
4551
pub save_secrets: bool,
4652
#[serde(default = "yes")]

0 commit comments

Comments
 (0)