DragonX/silentdragonlite-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6 from adityapk00/master

Browse Source 
updates
This commit is contained in:
Denio
2019-10-21 23:26:09 +02:00
committed by GitHub
parent 467ed0544e 7767caaf3f
commit 51e78817dd
3 changed files with 66 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/src/lightwallet.rs
View File

@@ -594,8 +594,8 @@ impl LightWallet {
pub fn encrypt(&mut self, passwd: String) -> io::Result<()> {
use sodiumoxide::crypto::secretbox;
if self.encrypted && !self.unlocked {
return Err(io::Error::new(ErrorKind::AlreadyExists, "Wallet is already encrypted and locked"));
if self.encrypted {
return Err(io::Error::new(ErrorKind::AlreadyExists, "Wallet is already encrypted"));
}
// Get the doublesha256 of the password, which is the right length
@@ -615,6 +615,14 @@ impl LightWallet {
}
pub fn lock(&mut self) -> io::Result<()> {
if !self.encrypted {
return Err(io::Error::new(ErrorKind::AlreadyExists, "Wallet is not encrypted"));
}
if !self.unlocked {
return Err(io::Error::new(ErrorKind::AlreadyExists, "Wallet is already locked"));
}
// Empty the seed and the secret keys
self.seed.copy_from_slice(&[0u8; 32]);
self.tkeys = Arc::new(RwLock::new(vec![]));
@@ -842,15 +850,11 @@ impl LightWallet {
}
}
// Scan the full Tx and update memos for incoming shielded transactions
// Scan the full Tx and update memos for incoming shielded transactions.
pub fn scan_full_tx(&self, tx: &Transaction, height: i32, datetime: u64) {
// Scan all the inputs to see if we spent any transparent funds in this tx
// TODO: Save this object
let secp = secp256k1::Secp256k1::new();
let mut total_transparent_spend: u64 = 0;
// Scan all the inputs to see if we spent any transparent funds in this tx
for vin in tx.vin.iter() {
// Find the txid in the list of utxos that we have.
let txid = TxId {0: vin.prevout.hash};
@@ -890,19 +894,15 @@ impl LightWallet {
.total_transparent_value_spent = total_transparent_spend;
}
// TODO: Iterate over all transparent addresses. This is currently looking only at
// the first one.
// Scan for t outputs
let all_pubkeys = self.tkeys.read().unwrap().iter()
.map(|sk|
secp256k1::PublicKey::from_secret_key(&secp, sk).serialize()
)
.collect::<Vec<[u8; secp256k1::constants::PUBLIC_KEY_SIZE]>>();
for pubkey in all_pubkeys {
let all_taddresses = self.taddresses.read().unwrap().iter()
.map(|a| a.clone())
.collect::<Vec<_>>();
for address in all_taddresses {
for (n, vout) in tx.vout.iter().enumerate() {
match vout.script_pubkey.address() {
Some(TransparentAddress::PublicKey(hash)) => {
if hash[..] == ripemd160::Ripemd160::digest(&Sha256::digest(&pubkey))[..] {
if address == hash.to_base58check(&self.config.base58_pubkey_address(), &[]) {
// This is our address. Add this as an output to the txid
self.add_toutput_to_wtx(height, datetime, &tx.txid(), &vout, n as u64);
}
@@ -1316,6 +1316,8 @@ impl LightWallet {
let total_value = tos.iter().map(|to| to.1).sum::<u64>();
// TODO: Check for duplicates in destination addresses
println!(
"0: Creating transaction sending {} ztoshis to {} addresses",
total_value, tos.len()
@@ -3150,6 +3152,10 @@ pub mod tests {
let seed = wallet.seed;
// Trying to lock a wallet that's not encrpyted is an error
assert!(wallet.lock().is_err());
// Encrypt the wallet
wallet.encrypt("somepassword".to_string()).unwrap();
// Encrypting an already encrypted wallet should fail
@@ -3194,6 +3200,9 @@ pub mod tests {
wallet.lock().unwrap();
wallet.write(&mut vec![]).expect("Serialize wallet");
// Locking an already locked wallet is an error
assert!(wallet.lock().is_err());
// Try from a deserialized, locked wallet
let mut wallet2 = LightWallet::read(&serialized_data[..], &config).unwrap();
wallet2.unlock("somepassword".to_string()).unwrap();