v1.7.14

adityapk00 · Jul 12, 2022 · 059be62 · 059be62
1 parent b1880fd
commit 059be62
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zecwallet-cli"
-version = "1.7.13"
+version = "1.7.14"
 edition = "2018"
 
 [dependencies]

diff --git a/cli/src/version.rs b/cli/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "1.7.13";
+pub const VERSION: &str = "1.7.14";
diff --git a/lib/src/blaze/block_witness_data.rs b/lib/src/blaze/block_witness_data.rs
@@ -60,7 +60,7 @@ impl BlockAndWitnessData {
             blocks: Arc::new(RwLock::new(vec![])),
             existing_blocks: Arc::new(RwLock::new(vec![])),
             verification_list: Arc::new(RwLock::new(vec![])),
-            batch_size: 25_000,
+            batch_size: 5_000,
             verified_tree: None,
             sync_status,
             sapling_activation_height: config.sapling_activation_height,
@@ -444,7 +444,7 @@ impl BlockAndWitnessData {
             } else {
                 let tree_state = GrpcConnector::get_sapling_tree(uri, prev_height).await?;
                 let sapling_tree = hex::decode(&tree_state.tree).unwrap();
-                self.verification_list.write().await.push(tree_state);
+                // self.verification_list.write().await.push(tree_state);
                 CommitmentTree::read(&sapling_tree[..]).map_err(|e| format!("{}", e))?
             };
 

diff --git a/lib/src/blaze/trial_decryptions.rs b/lib/src/blaze/trial_decryptions.rs
@@ -61,7 +61,7 @@ impl<P: consensus::Parameters + Send + Sync + 'static> TrialDecryptions<P> {
             while let Some(cb) = rx.recv().await {
                 cbs.push(cb);
 
-                if cbs.len() >= 1_000 {
+                if cbs.len() >= 100 {
                     let keys = keys.clone();
                     let ivks = ivks.clone();
                     let wallet_txns = wallet_txns.clone();

diff --git a/lib/src/lightclient.rs b/lib/src/lightclient.rs
@@ -1274,7 +1274,7 @@ impl<P: consensus::Parameters + Send + Sync + 'static> LightClient<P> {
 
         // Re-read the last scanned height
         let last_scanned_height = self.wallet.last_scanned_height().await;
-        let batch_size = 300_000;
+        let batch_size = 50_000;
 
         let mut latest_block_batches = vec![];
         let mut prev = last_scanned_height;

diff --git a/mkrelease.sh b/mkrelease.sh
@@ -57,7 +57,7 @@ zip -r macOS-zecwallet-cli-v$APP_VERSION.zip macOS-zecwallet-cli-v$APP_VERSION
 cd ..
 
 # For Windows and Linux, build via docker
-docker run --rm -v $(pwd)/:/opt/zecwallet-light-cli rustbuild:latest bash -c "cd /opt/zecwallet-light-cli && cargo build --release && cargo build --release --target armv7-unknown-linux-gnueabihf && cargo build --release --target aarch64-unknown-linux-gnu && SODIUM_LIB_DIR='/opt/libsodium-win64/lib/' cargo build --release --target x86_64-pc-windows-gnu"
+docker run --rm -v $(pwd)/:/opt/zecwallet-light-cli rustbuild:latest bash -c "cd /opt/zecwallet-light-cli && cargo build --release && SODIUM_LIB_DIR='/opt/libsodium-win64/lib/' cargo build --release --target x86_64-pc-windows-gnu"
 
 #Linux
 rm -rf target/linux-zecwallet-cli-v$APP_VERSION
@@ -85,27 +85,27 @@ zip -r Windows-zecwallet-cli-v$APP_VERSION.zip Windows-zecwallet-cli-v$APP_VERSI
 cd ..
 
 
-#Armv7
-rm -rf target/Armv7-zecwallet-cli-v$APP_VERSION
-mkdir -p target/Armv7-zecwallet-cli-v$APP_VERSION
-cp target/armv7-unknown-linux-gnueabihf/release/zecwallet-cli target/Armv7-zecwallet-cli-v$APP_VERSION/
-gpg --batch --output target/Armv7-zecwallet-cli-v$APP_VERSION/zecwallet-cli.sig --detach-sig target/Armv7-zecwallet-cli-v$APP_VERSION/zecwallet-cli
-cd target
-cd Armv7-zecwallet-cli-v$APP_VERSION
-gsha256sum zecwallet-cli > sha256sum.txt
-cd ..
-zip -r Armv7-zecwallet-cli-v$APP_VERSION.zip Armv7-zecwallet-cli-v$APP_VERSION 
-cd ..
-
-
-#AARCH64
-rm -rf target/aarch64-zecwallet-cli-v$APP_VERSION
-mkdir -p target/aarch64-zecwallet-cli-v$APP_VERSION
-cp target/aarch64-unknown-linux-gnu/release/zecwallet-cli target/aarch64-zecwallet-cli-v$APP_VERSION/
-gpg --batch --output target/aarch64-zecwallet-cli-v$APP_VERSION/zecwallet-cli.sig --detach-sig target/aarch64-zecwallet-cli-v$APP_VERSION/zecwallet-cli
-cd target
-cd aarch64-zecwallet-cli-v$APP_VERSION
-gsha256sum zecwallet-cli > sha256sum.txt
-cd ..
-zip -r aarch64-zecwallet-cli-v$APP_VERSION.zip aarch64-zecwallet-cli-v$APP_VERSION 
-cd ..
+# #Armv7
+# rm -rf target/Armv7-zecwallet-cli-v$APP_VERSION
+# mkdir -p target/Armv7-zecwallet-cli-v$APP_VERSION
+# cp target/armv7-unknown-linux-gnueabihf/release/zecwallet-cli target/Armv7-zecwallet-cli-v$APP_VERSION/
+# gpg --batch --output target/Armv7-zecwallet-cli-v$APP_VERSION/zecwallet-cli.sig --detach-sig target/Armv7-zecwallet-cli-v$APP_VERSION/zecwallet-cli
+# cd target
+# cd Armv7-zecwallet-cli-v$APP_VERSION
+# gsha256sum zecwallet-cli > sha256sum.txt
+# cd ..
+# zip -r Armv7-zecwallet-cli-v$APP_VERSION.zip Armv7-zecwallet-cli-v$APP_VERSION 
+# cd ..
+
+
+# #AARCH64
+# rm -rf target/aarch64-zecwallet-cli-v$APP_VERSION
+# mkdir -p target/aarch64-zecwallet-cli-v$APP_VERSION
+# cp target/aarch64-unknown-linux-gnu/release/zecwallet-cli target/aarch64-zecwallet-cli-v$APP_VERSION/
+# gpg --batch --output target/aarch64-zecwallet-cli-v$APP_VERSION/zecwallet-cli.sig --detach-sig target/aarch64-zecwallet-cli-v$APP_VERSION/zecwallet-cli
+# cd target
+# cd aarch64-zecwallet-cli-v$APP_VERSION
+# gsha256sum zecwallet-cli > sha256sum.txt
+# cd ..
+# zip -r aarch64-zecwallet-cli-v$APP_VERSION.zip aarch64-zecwallet-cli-v$APP_VERSION 
+# cd ..
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pub const VERSION: &str = "1.7.13";
		pub const VERSION: &str = "1.7.14";