Merge branch 'dev'

This commit is contained in:
Duke Leto
2022-02-22 09:49:55 -05:00
7 changed files with 20 additions and 5 deletions

View File

@@ -69,6 +69,9 @@ Here are some CLI arguments you can pass to `silentdragonlite-cli`. Please run `
For support or other questions, join us on [Telegram](https://hush.is/telegram), or tweet at [@MyHushTeam](https://twitter.com/MyHushTeam), or toot at our [Mastodon](https://fosstodon.org/@myhushteam) or join [Telegram Support](https://hush.is/telegram_support) or [file an issue](https://git.hush.is/hush/silentdragonlite-cli/issues). For support or other questions, join us on [Telegram](https://hush.is/telegram), or tweet at [@MyHushTeam](https://twitter.com/MyHushTeam), or toot at our [Mastodon](https://fosstodon.org/@myhushteam) or join [Telegram Support](https://hush.is/telegram_support) or [file an issue](https://git.hush.is/hush/silentdragonlite-cli/issues).
## Copyright
Copyright The Hush Developers 2019-2022
## License ## License

View File

@@ -1,3 +1,5 @@
// Copyright The Hush Developers 2019-2022
// Released under the GPLv3
fn main() -> Result<(), Box<dyn std::error::Error>> { fn main() -> Result<(), Box<dyn std::error::Error>> {
tonic_build::configure() tonic_build::configure()
.build_server(false) .build_server(false)
@@ -8,4 +10,4 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
println!("cargo:rerun-if-changed=proto/service.proto"); println!("cargo:rerun-if-changed=proto/service.proto");
Ok(()) Ok(())
} }

View File

@@ -1,3 +1,5 @@
// Copyright The Hush Developers 2019-2022
// Released under the GPLv3
use std::collections::HashMap; use std::collections::HashMap;
use json::{object}; use json::{object};

View File

@@ -1,3 +1,5 @@
// Copyright The Hush Developers 2019-2022
// Released under the GPLv3
use log::{error}; use log::{error};
use std::sync::Arc; use std::sync::Arc;
use zcash_primitives::transaction::{TxId}; use zcash_primitives::transaction::{TxId};

View File

@@ -1,3 +1,5 @@
// Copyright The Hush Developers 2019-2022
// Released under the GPLv3
#[macro_use] #[macro_use]
extern crate rust_embed; extern crate rust_embed;

View File

@@ -1,3 +1,5 @@
// Copyright The Hush Developers 2019-2022
// Released under the GPLv3
use crate::lightwallet::LightWallet; use crate::lightwallet::LightWallet;
use std::sync::{Arc, RwLock, Mutex, mpsc::channel}; use std::sync::{Arc, RwLock, Mutex, mpsc::channel};
@@ -1473,7 +1475,7 @@ impl LightClient {
let no_cert = self.config.no_cert_verification; let no_cert = self.config.no_cert_verification;
pool.execute(move || { pool.execute(move || {
info!("Fetching full Tx: {}", txid); //info!("Fetching full Tx: {}", txid);
match fetch_full_tx(&server_uri, txid, no_cert) { match fetch_full_tx(&server_uri, txid, no_cert) {
Ok(tx_bytes) => { Ok(tx_bytes) => {

View File

@@ -1,3 +1,5 @@
// Copyright The Hush Developers 2019-2022
// Released under the GPLv3
use std::time::{SystemTime, Duration}; use std::time::{SystemTime, Duration};
use std::io::{self, Read, Write}; use std::io::{self, Read, Write};
use std::cmp; use std::cmp;
@@ -1399,7 +1401,7 @@ impl LightWallet {
}; };
if memo.to_utf8().is_some() { if memo.to_utf8().is_some() {
info!("A sapling note was sent to wallet in {} that had a memo", tx.txid()); // info!("A sapling note was sent to wallet in {} that had a memo", tx.txid());
// Do it in a short scope because of the write lock. // Do it in a short scope because of the write lock.
let mut txs = self.txs.write().unwrap(); let mut txs = self.txs.write().unwrap();
@@ -1911,7 +1913,7 @@ impl LightWallet {
// Mark notes as spent. // Mark notes as spent.
let mut total_shielded_value_spent: u64 = 0; let mut total_shielded_value_spent: u64 = 0;
info!("Txid {} belongs to wallet", tx.txid); //info!("Txid {} belongs to wallet", tx.txid);
for spend in &tx.shielded_spends { for spend in &tx.shielded_spends {
let txid = nfs let txid = nfs
@@ -1949,7 +1951,7 @@ impl LightWallet {
let new_note = SaplingNoteData::new(&self.zkeys.read().unwrap()[output.account].extfvk, output); let new_note = SaplingNoteData::new(&self.zkeys.read().unwrap()[output.account].extfvk, output);
match LightWallet::note_address(self.config.hrp_sapling_address(), &new_note) { match LightWallet::note_address(self.config.hrp_sapling_address(), &new_note) {
Some(a) => { Some(a) => {
info!("Received sapling output to {}", a); // info!("Received sapling output to {}", a);
self.ensure_hd_zaddresses(&a); self.ensure_hd_zaddresses(&a);
}, },
None => {} None => {}