4nk/sdk_client
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to latest sdk_common version

Browse Source
This commit is contained in:
Sosthene 2024-06-17 14:06:13 +02:00
parent 733d65b99b
commit 980bd390c6
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/sp_client/src/api.rs
View File

@ -169,17 +169,17 @@ pub fn setup() {
pub fn generate_sp_wallet(
label: Option<String>,
birthday: u32,
is_testnet: bool,
network: Network,
) -> ApiResult<SpWallet> {
let mut seed = [0u8; 64];
rand::thread_rng().fill(&mut seed);
let (scan_sk, spend_sk) = derive_keys_from_seed(&seed, is_testnet)?;
let (scan_sk, spend_sk) = derive_keys_from_seed(&seed, network)?;
let sp_client = SpClient::new(
label.unwrap_or("default".into()),
scan_sk,
SpendKey::Secret(spend_sk),
None,
IS_TESTNET,
network,
)?;
let our_address: SilentPaymentAddress = sp_client.get_receiving_address().try_into()?;
log::info!(
@ -229,11 +229,11 @@ pub fn create_user(
process: String,
) -> ApiResult<createUserReturn> {
//recover
let sp_wallet_recover = generate_sp_wallet(label.clone(), birthday_signet, true)?;
let sp_wallet_recover = generate_sp_wallet(label.clone(), birthday_signet, Network::Signet)?;
//revoke
let sp_wallet_revoke = generate_sp_wallet(label.clone(), birthday_signet, true)?;
let sp_wallet_revoke = generate_sp_wallet(label.clone(), birthday_signet, Network::Signet)?;
//mainet
let sp_wallet_main = generate_sp_wallet(label, birthday_main, false)?;
let sp_wallet_main = generate_sp_wallet(label, birthday_main, Network::Bitcoin)?;
let user_wallets = UserWallets::new(
Some(sp_wallet_main),

9
crates/sp_client/src/user.rs
View File

@ -5,6 +5,7 @@ use sdk_common::sp_client::bitcoin::hashes::HashEngine;
use sdk_common::sp_client::bitcoin::hex::{DisplayHex, FromHex};
use sdk_common::sp_client::bitcoin::secp256k1::SecretKey;
use sdk_common::sp_client::bitcoin::secp256k1::ThirtyTwoByteHash;
use sdk_common::sp_client::bitcoin::Network;
use sdk_common::sp_client::spclient::SpClient;
use serde::{Deserialize, Serialize};
use serde_json::{json, Value};
@ -336,7 +337,7 @@ impl User {
SecretKey::from_slice(&retrieved_scan_key)?,
SpendKey::Secret(SecretKey::from_slice(&retrieved_spend_key)?),
None,
true,
Network::Signet,
)?;
let recover_outputs = outputs
@ -463,7 +464,7 @@ mod tests {
SecretKey::from_str(MAIN_SCAN).unwrap(),
SpendKey::Secret(SecretKey::from_str(MAIN_SPEND).unwrap()),
None,
true,
Network::Bitcoin,
)
.unwrap();
let sp_recover = SpClient::new(
@ -471,7 +472,7 @@ mod tests {
SecretKey::from_str(RECOVER_SCAN).unwrap(),
SpendKey::Secret(SecretKey::from_str(RECOVER_SPEND).unwrap()),
None,
true,
Network::Signet,
)
.unwrap();
let sp_revoke = SpClient::new(
@ -479,7 +480,7 @@ mod tests {
SecretKey::from_str(REVOKE_SCAN).unwrap(),
SpendKey::Secret(SecretKey::from_str(REVOKE_SPEND).unwrap()),
None,
true,
Network::Signet,
)
.unwrap();
let user_wallets = UserWallets::new(