From 0fb45a25cd485506077811e5a7c6bde7cb4e3ca9 Mon Sep 17 00:00:00 2001 From: Hanh Date: Wed, 3 May 2023 15:24:56 +1000 Subject: [PATCH] Update sysinfo/ntapi --- Cargo.toml | 2 +- src/ledger/transport.rs | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4965206..cd8db9c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,7 +91,7 @@ chacha20poly1305 = "0.9.0" base64 = "^0.13" base58check = "0.1.0" raptorq = "1.7.0" -sysinfo = "0.25" +sysinfo = "0.28" ledger-transport-hid = { version = "0.10", optional = true } ledger-apdu = { version = "0.10", optional = true } diff --git a/src/ledger/transport.rs b/src/ledger/transport.rs index ecbecfb..1c82188 100644 --- a/src/ledger/transport.rs +++ b/src/ledger/transport.rs @@ -96,6 +96,17 @@ pub async fn ledger_get_o_fvk() -> Result> { Ok(pk) } +pub async fn ledger_get_proofgen_key() -> Result { + let mut bb: Vec = vec![]; + bb.write_all(&hex!("E009000000"))?; + let proofgen_key = apdu(&bb).await?; + let proofgen_key = ProofGenerationKey { + ak: SubgroupPoint::from_bytes(proofgen_key[0..32].try_into().unwrap()).unwrap(), + nsk: Fr::from_bytes(proofgen_key[32..64].try_into().unwrap()).unwrap(), + }; + Ok(proofgen_key) +} + pub async fn ledger_init_tx() -> Result> { let mut bb: Vec = vec![]; bb.write_all(&hex!("E010000000"))?; @@ -238,17 +249,6 @@ pub async fn ledger_confirm_fee() -> Result<()> { Ok(()) } -pub async fn ledger_get_proofgen_key() -> Result { - let mut bb: Vec = vec![]; - bb.write_all(&hex!("E020000000"))?; - let proofgen_key = apdu(&bb).await?; - let proofgen_key = ProofGenerationKey { - ak: SubgroupPoint::from_bytes(proofgen_key[0..32].try_into().unwrap()).unwrap(), - nsk: Fr::from_bytes(proofgen_key[32..64].try_into().unwrap()).unwrap(), - }; - Ok(proofgen_key) -} - pub async fn ledger_sign_transparent(txin_digest: &[u8]) -> Result> { let mut bb: Vec = vec![]; bb.write_all(&hex!("E021000020"))?;