github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

wallet/walletdb: moved logic to top of key_gen() to prevent key re-generation

Browse Source
This commit is contained in:
lunar-mining
2021-09-25 12:12:45 +02:00
parent 1a2b82a67a
commit cc4cb9d774
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/wallet/walletdb.rs
View File

@@ -71,32 +71,32 @@ impl WalletDb {
Ok(())
}
pub fn key_gen(&self) -> Result<(Vec<u8>, Vec<u8>)> {
pub fn key_gen(&self) -> Result<()> {
debug!(target: "WALLETDB", "Attempting to generate keys...");
// check here whether the field exists. if no, return error
let secret: jubjub::Fr = jubjub::Fr::random(&mut OsRng);
let public = zcash_primitives::constants::SPENDING_KEY_GENERATOR * secret;
let pubkey = serial::serialize(&public);
let privkey = serial::serialize(&secret);
self.put_keypair(pubkey.clone(), privkey.clone())?;
Ok((pubkey, privkey))
}
pub fn put_keypair(&self, key_public: Vec<u8>, key_private: Vec<u8>) -> Result<()> {
let conn = Connection::open(&self.path)?;
conn.pragma_update(None, "key", &self.password)?;
let mut stmt = conn.prepare("SELECT * FROM keys WHERE key_id > :id")?;
let key_check = stmt.exists(&[(":id", &"0")])?;
if key_check == false {
conn.execute(
"INSERT INTO keys(key_public, key_private) VALUES (?1, ?2)",
params![key_public, key_private],
)?;
let secret: jubjub::Fr = jubjub::Fr::random(&mut OsRng);
let public = zcash_primitives::constants::SPENDING_KEY_GENERATOR * secret;
let pubkey = serial::serialize(&public);
let privkey = serial::serialize(&secret);
self.put_keypair(pubkey.clone(), privkey.clone())?;
} else {
debug!(target: "WALLETDB", "Keys already exist.");
return Err(Error::from(ClientFailed::KeyExists));
}
Ok(())
}
pub fn put_keypair(&self, key_public: Vec<u8>, key_private: Vec<u8>) -> Result<()> {
let conn = Connection::open(&self.path)?;
conn.pragma_update(None, "key", &self.password)?;
conn.execute(
"INSERT INTO keys(key_public, key_private) VALUES (?1, ?2)",
params![key_public, key_private],
)?;
Ok(())
}
pub fn get_keypairs(&self) -> Result<Vec<Keypair>> {