v1.8.0-beta3

.github/workflows/electron.yml

@@ -23,7 +23,7 @@ jobs:
           fetch-depth: 1
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.1
+          toolchain: 1.62
           override: true
           components: rustfmt
       - name: Use Node.js 14.x

.vscode/settings.json

@@ -13,7 +13,7 @@
 
   "javascript.validate.enable": false,
   "javascript.format.enable": false,
-  "typescript.validate.enable": false,
+  "typescript.validate.enable": true,
   "typescript.format.enable": false,
 
   "flow.useNPMPackagedFlow": true,

bin/printversion.ps1

@@ -1 +1 @@
-echo "VERSION=1.7.20" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+echo "VERSION=1.8.0-beta3" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append

bin/printversion.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-VERSION="1.7.20"
+VERSION="1.8.0-beta3"
 echo "VERSION=$VERSION" >> $GITHUB_ENV

native/Cargo.toml

@@ -15,6 +15,16 @@ default-features = false
 features = ["napi-6"]
 
 [dependencies]
-zecwalletlitelib = { git = "https://github.com/adityapk00/zecwallet-light-cli", rev = "4276057e9fcdc15f3dd5b4aacd12951d3fec3c48" }
+zecwalletlitelib = { git = "https://github.com/adityapk00/zecwallet-light-cli", rev = "8d9faccafe0056ad9b5f4e2a64dbba10ba6aeb17" }
 #zecwalletlitelib = { path = "../../zecwallet-light-cli/lib" }
 lazy_static = "1.4.0"
+
+
+[patch.crates-io]
+zcash_address = { git = "https://github.com/adityapk00/librustzcash", rev = "adf49f8b848a5ac85e1476354614eeae9880206a"}
+zcash_primitives = { git = "https://github.com/adityapk00/librustzcash", rev = "adf49f8b848a5ac85e1476354614eeae9880206a"}
+zcash_client_backend = { git = "https://github.com/adityapk00/librustzcash", rev = "adf49f8b848a5ac85e1476354614eeae9880206a"}
+zcash_note_encryption = { git = "https://github.com/adityapk00/librustzcash", rev = "adf49f8b848a5ac85e1476354614eeae9880206a"}
+zcash_encoding = { git = "https://github.com/adityapk00/librustzcash", rev = "adf49f8b848a5ac85e1476354614eeae9880206a"}
+zcash_proofs = { git = "https://github.com/adityapk00/librustzcash", rev = "adf49f8b848a5ac85e1476354614eeae9880206a"}
+orchard = { git = "https://github.com/adityapk00/orchard", rev = "0a960a380f4e9c3472c9260f3df61cd5e50d51b0" }

native/rust-toolchain

@@ -1 +1 @@
-1.56.1
+1.62

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zecwallet-lite",
   "productName": "Zecwallet Lite",
-  "version": "1.7.20",
+  "version": "1.8.0-beta3",
   "private": true,
   "description": "Zecwallet Lite",
   "license": "MIT",

public/electron.js

@@ -151,19 +151,7 @@ class MenuBuilder {
             this.mainWindow.webContents.send("zcashd");
           },
         },
-        {
-          label: "Connect Mobile App",
-          click: () => {
-            this.mainWindow.webContents.send("connectmobile");
-          },
-        },
         { type: "separator" },
-        {
-          label: "Encrypt Wallet",
-          click: () => {
-            this.mainWindow.webContents.send("encrypt");
-          },
-        },
         {
           label: "Remove Wallet Encryption",
           click: () => {
@@ -233,19 +221,7 @@ class MenuBuilder {
             this.mainWindow.webContents.send("zcashd");
           },
         },
-        {
-          label: "Connect Mobile App",
-          click: () => {
-            this.mainWindow.webContents.send("connectmobile");
-          },
-        },
         { type: "separator" },
-        {
-          label: "Encrypt Wallet",
-          click: () => {
-            this.mainWindow.webContents.send("encrypt");
-          },
-        },
         {
           label: "Remove Wallet Encryption",
           click: () => {
@@ -365,25 +341,13 @@ class MenuBuilder {
               this.mainWindow.webContents.send("zcashd");
             },
           },
-          {
-            label: "Connect Mobile App",
-            click: () => {
-              this.mainWindow.webContents.send("connectmobile");
-            },
-          },
           // {
           //   label: 'Devtools',
           //   click: () => {
           //     mainWindow.webContents.openDevTools();
           //   }
           // },
           { type: "separator" },
-          {
-            label: "Encrypt Wallet",
-            click: () => {
-              this.mainWindow.webContents.send("encrypt");
-            },
-          },
           {
             label: "Remove Wallet Encryption",
             click: () => {

rust-toolchain

@@ -1 +1 @@
-1.56.1
+1.62

src/Routes.tsx

@@ -25,6 +25,8 @@ import AppState, {
   PasswordState,
   ServerSelectState,
   SendProgress,
+  AddressType,
+  AddressDetail,
 } from "./components/AppState";
 import RPC from "./rpc";
 import Utils from "./utils/utils";
@@ -234,7 +236,7 @@ export default class RouteApp extends React.Component<Props, AppState> {
     this.setState({ transactions });
   };
 
-  setAllAddresses = (addresses: string[]) => {
+  setAllAddresses = (addresses: AddressDetail[]) => {
     this.setState({ addresses });
   };
 
@@ -408,10 +410,10 @@ export default class RouteApp extends React.Component<Props, AppState> {
     this.setState({ addressBook: newAddressBook });
   };
 
-  createNewAddress = async (zaddress: boolean) => {
+  createNewAddress = async (type: AddressType) => {
     this.openPasswordAndUnlockIfNeeded(async () => {
       // Create a new address
-      const newaddress = RPC.createNewAddress(zaddress);
+      const newaddress = RPC.createNewAddress(type);
       console.log(`Created new Address ${newaddress}`);
 
       // And then fetch the list of addresses again to refresh (totalBalance gets all addresses)