Merge pull request #302 from zingolabs/dev_new_release_2.0.11

New release 2.0.11 - zingolib stable 3.0.1

Author: juanky201271

bin/printversion.ps1

@@ -1 +1 @@
-echo "VERSION=2.0.10" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+echo "VERSION=2.0.11" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append

bin/printversion.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-VERSION="2.0.10"
+VERSION="2.0.11"
 echo "VERSION=$VERSION" >> $GITHUB_ENV

native/Cargo.lock

@@ -12,8 +12,8 @@ crate-type = ["cdylib"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-zingolib = { git="https://github.com/zingolabs/zingolib", rev = "zingolib_v3.0.0" }
-pepper-sync = "0.2.0"
+zingolib = { git="https://github.com/zingolabs/zingolib", rev = "zingolib_v3.0.1" }
+pepper-sync = { git="https://github.com/zingolabs/zingolib", rev = "zingolib_v3.0.1" }
 
 zcash_address = { version = "0.10" }
 zcash_client_backend = { version = "0.21", features = [
@@ -33,11 +33,9 @@ zcash_proofs = { version = "0.26" }
 zcash_protocol = { version = "0.7" }
 zcash_transparent = { version = "0.6" }
 
-zebra-chain = "5.0.0"
-
 rusqlite = { version = "0.37.0", features = ["bundled"] }
 
-zingo_common_components = { version = "0.2", features = ["for_test"] }
+zingo_common_components = { version = "0.2.0", features = ["for_test"] }
 
 bip0039 = { version = "0.13", features = [ "rand" ] }
 zip32 = "0.2.0"

native/Cargo.toml

@@ -25,8 +25,9 @@ use zcash_protocol::consensus::BlockHeight;
 use zip32::AccountId;
 use zcash_protocol::consensus::NetworkType;
 
+use zingolib::config::SyncConfig;
+use pepper_sync::config::{PerformanceLevel, TransparentAddressDiscovery};
 use pepper_sync::keys::transparent;
-use pepper_sync::config::{PerformanceLevel, SyncConfig, TransparentAddressDiscovery};
 use pepper_sync::wallet::{KeyIdInterface, SyncMode};
 use zingolib::config::{ChainType, ZingoConfig, construct_lightwalletd_uri};
 use zingolib::data::PollReport;
@@ -800,7 +801,7 @@ fn get_latest_block_wallet(mut cx: FunctionContext) -> JsResult<JsPromise> {
                 let mut guard = LIGHTCLIENT.write().map_err(|_| ZingolibError::LightclientLockPoisoned)?;
                 if let Some(lightclient) = &mut *guard {
                     Ok(RT.block_on(async move {
-                        let wallet = lightclient.wallet.write().await;
+                        let wallet = lightclient.wallet.read().await;
                         object! { "height" => json::JsonValue::from(wallet.sync_state.last_known_chain_height().map_or(0, u32::from))}.pretty(2)
                     }))
                 } else {
@@ -1545,7 +1546,7 @@ fn get_spendable_balance_total(mut cx: FunctionContext) -> JsResult<JsPromise> {
                 let mut guard = LIGHTCLIENT.write().map_err(|_| ZingolibError::LightclientLockPoisoned)?;
                 if let Some(lightclient) = &mut *guard {
                     Ok(RT.block_on(async move {
-                        let wallet = lightclient.wallet.write().await;
+                        let wallet = lightclient.wallet.read().await;
                         let spendable_balance =
                             match wallet.shielded_spendable_balance(AccountId::ZERO, false) {
                                 Ok(bal) => bal,

native/src/lib.rs

@@ -1,7 +1,7 @@
 {
   "name": "zingo-pc",
   "productName": "Zingo PC",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "private": true,
   "description": "Zingo PC",
   "license": "MIT",

package.json

@@ -8,7 +8,7 @@ function App() {
       <header className="App-header">
         <p>Built using CRA electron-builder-typescript Template.</p>
         <img src={logo} className="App-logo" alt="logo" />
-        <p>Zingo PC v2.0.10</p>
+        <p>Zingo PC v2.0.11</p>
         <p>
           Edit <code>public/electron.js</code> or <code>src/App.js</code> and save to reload.
         </p>

src/App.tsx

@@ -12,7 +12,7 @@ const Logo = ({ readOnly, onlyVersion }: LogoProps) => {
 
   return (
     <>
-      <div style={{ color: Utils.getCssVariable('--color-zingo'), fontWeight: "bold", marginBottom: 10 }}>Zingo PC v2.0.10</div>
+      <div style={{ color: Utils.getCssVariable('--color-zingo'), fontWeight: "bold", marginBottom: 10 }}>Zingo PC v2.0.11</div>
       {!onlyVersion && (
         <div>
           <img src={logo} width="70" alt="logo" style={{ borderRadius: 5, marginRight: 10 }} />

src/components/logo/Logo.tsx

@@ -4,7 +4,6 @@ import cstyles from "../common/Common.module.css";
 import {
   ToAddrClass,
   SendPageStateClass,
-  AddressBookEntryClass,
   ValueTransferClass,
   ServerChainNameEnum,
 } from "../appstate";
@@ -36,7 +35,6 @@ const Send: React.FC<SendProps> = ({
     info,
     totalBalance,
     readOnly,
-    addressBook,
     fetchError,
     valueTransfers,
     currentWallet,
@@ -56,7 +54,7 @@ const Send: React.FC<SendProps> = ({
   const [shieldFee, setShieldFee] = useState<number>(0);
 
   useEffect(() => {
-    // set somePending as well here when I know there is something new in ValueTransfers
+    // set somePending as well here when I know there is something new in ValueTransfers 
     const pending: number =
       valueTransfers.length > 0 ? valueTransfers.filter((vt: ValueTransferClass) => vt.confirmations >= 0 && vt.confirmations < 3).length : 0;
     setAnyPending(pending > 0);
@@ -194,14 +192,6 @@ const Send: React.FC<SendProps> = ({
     setModalIsOpen(false);
   };
 
-  const getLabelAddressBook = (addr: string) => {
-    // Find the addr in addresses
-    const label: AddressBookEntryClass | undefined = addressBook.find((ab: AddressBookEntryClass) => ab.address === addr);
-    const labelStr: string = label ? ` [ ${label.label} ]` : "";
-
-    return labelStr; 
-  };
-
   const calculateSendFee = async (): Promise<{fee: number, error: string, spendable: number}> => {
     let _fee: number = 0;
     let _error: string = '';
@@ -323,30 +313,24 @@ const Send: React.FC<SendProps> = ({
       <div className={[styles.horizontalcontainer].join(" ")}>
         <div className={cstyles.containermarginleft}>
           <ScrollPaneTop offsetHeight={260}>
-            {[sendPageState.toaddr].map((toaddr: ToAddrClass, index: number) => {
-              return (
-                <ToAddrBox
-                  key={index}
-                  toaddr={toaddr}
-                  zecPrice={info.zecPrice}
-                  updateToField={updateToField}
-                  fromAmount={totalAmountAvailable}
-                  fromAmountDefault={totalBalance.totalSpendableBalance}
-                  setMaxAmount={setMaxAmount}
-                  setSendButtonEnabled={setSendButtonEnabled}
-                  sendFee={sendFee}
-                  sendFeeError={sendFeeError}
-                  fetchSendFeeAndErrorAndSpendable={fetchSendFeeAndErrorAndSpendable}
-                  setSendFee={setSendFee}
-                  setSendFeeError={setSendFeeError}
-                  setTotalAmountAvailable={setTotalAmountAvailable}
-                  label={getLabelAddressBook(toaddr.to)}
-                  serverChainName={currentWallet ? currentWallet.chain_name : ServerChainNameEnum.mainChainName}
-                  block={info.latestBlock >= info.walletHeight ? info.latestBlock : info.walletHeight}
-                  currencyName={info.currencyName}
-                />
-              );
-            })}
+            <ToAddrBox
+              toaddr={sendPageState.toaddr}
+              zecPrice={info.zecPrice}
+              updateToField={updateToField}
+              fromAmount={totalAmountAvailable}
+              fromAmountDefault={totalBalance.totalSpendableBalance}
+              setMaxAmount={setMaxAmount}
+              setSendButtonEnabled={setSendButtonEnabled}
+              sendFee={sendFee}
+              sendFeeError={sendFeeError}
+              fetchSendFeeAndErrorAndSpendable={fetchSendFeeAndErrorAndSpendable}
+              setSendFee={setSendFee}
+              setSendFeeError={setSendFeeError}
+              setTotalAmountAvailable={setTotalAmountAvailable}
+              serverChainName={currentWallet ? currentWallet.chain_name : ServerChainNameEnum.mainChainName}
+              block={info.latestBlock >= info.walletHeight ? info.latestBlock : info.walletHeight}
+              currencyName={info.currencyName}
+            />
           </ScrollPaneTop>
         </div>