diff --git a/bin/printversion.ps1 b/bin/printversion.ps1 index 95a53191..bce33395 100644 --- a/bin/printversion.ps1 +++ b/bin/printversion.ps1 @@ -1 +1 @@ -echo "VERSION=1.0.2" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append +echo "VERSION=1.0.3" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append diff --git a/bin/printversion.sh b/bin/printversion.sh index 0ea097bd..78812652 100755 --- a/bin/printversion.sh +++ b/bin/printversion.sh @@ -1,3 +1,3 @@ #!/bin/bash -VERSION="1.0.2" +VERSION="1.0.3" echo "VERSION=$VERSION" >> $GITHUB_ENV diff --git a/native/Cargo.lock b/native/Cargo.lock index a39d8fc1..c33ed82e 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -360,7 +360,7 @@ dependencies = [ [[package]] name = "build_utils" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#63863fd12040dd6818a10670d2741d7d627b972e" +source = "git+https://github.com/zingolabs/zingolib?branch=dev#89e4a1c24604597538d8b5638353b77590dbb795" [[package]] name = "bumpalo" @@ -1001,9 +1001,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" [[package]] name = "hdwallet" @@ -1225,12 +1225,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] @@ -1833,7 +1833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.1", + "indexmap 2.0.2", ] [[package]] @@ -2972,9 +2972,9 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d37bb15da06ae9bb945963066baca6561b505af93a52e949a85d28558459a2" +checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease 0.2.15", "proc-macro2", @@ -3571,7 +3571,7 @@ dependencies = [ "shardtree", "subtle", "time", - "tonic-build 0.10.1", + "tonic-build 0.10.2", "tracing", "which", "zcash_address", @@ -3680,7 +3680,7 @@ dependencies = [ [[package]] name = "zingo-memo" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#63863fd12040dd6818a10670d2741d7d627b972e" +source = "git+https://github.com/zingolabs/zingolib?branch=dev#89e4a1c24604597538d8b5638353b77590dbb795" dependencies = [ "zcash_address", "zcash_client_backend", @@ -3692,7 +3692,7 @@ dependencies = [ [[package]] name = "zingoconfig" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#63863fd12040dd6818a10670d2741d7d627b972e" +source = "git+https://github.com/zingolabs/zingolib?branch=dev#89e4a1c24604597538d8b5638353b77590dbb795" dependencies = [ "dirs", "http", @@ -3705,7 +3705,7 @@ dependencies = [ [[package]] name = "zingolib" version = "0.2.0" -source = "git+https://github.com/zingolabs/zingolib?branch=dev#63863fd12040dd6818a10670d2741d7d627b972e" +source = "git+https://github.com/zingolabs/zingolib?branch=dev#89e4a1c24604597538d8b5638353b77590dbb795" dependencies = [ "append-only-vec", "base58", diff --git a/native/src/lib.rs b/native/src/lib.rs index f766f8f1..2d9a9895 100644 --- a/native/src/lib.rs +++ b/native/src/lib.rs @@ -108,20 +108,12 @@ fn zingolib_initialize_new(mut cx: FunctionContext) -> JsResult { // Initialize logging let _ = LightClient::init_logging(); - let seed = match lightclient.do_seed_phrase_sync() { - Ok(s) => s.dump(), - Err(e) => { - return format!("Error: {}", e); - } - }; - let lc = Arc::new(lightclient); LightClient::start_mempool_monitor(lc.clone()); *LIGHTCLIENT.write().unwrap() = Some(lc); - // Return the wallet's seed - seed + format!("OK") }; Ok(cx.string(resp())) } diff --git a/package.json b/package.json index 8592e0c1..756b977a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zingo-pc", "productName": "Zingo PC", - "version": "1.0.2", + "version": "1.0.3", "private": true, "description": "Zingo PC", "license": "MIT", diff --git a/src/App.tsx b/src/App.tsx index fdf3135e..ca324814 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -13,7 +13,7 @@ function App() {

Built using CRA electron-builder-typescript Template.

{/*

{addon.zingolib_say_hello("Me")}

*/} logo -

Zingo PC v1.0.2

+

Zingo PC v1.0.3

Edit public/electron.js or src/App.js and save to reload.

diff --git a/src/components/loadingscreen/LoadingScreen.tsx b/src/components/loadingscreen/LoadingScreen.tsx index 2120290c..bab9a6f2 100644 --- a/src/components/loadingscreen/LoadingScreen.tsx +++ b/src/components/loadingscreen/LoadingScreen.tsx @@ -372,7 +372,7 @@ class LoadingScreen extends Component

- Please wait... + Please wait...
This could take several minutes or hours @@ -384,16 +384,16 @@ class LoadingScreen extends Component { - const { url, chain } = this.state; + createNewWallet = async () => { + const { url, chain } = this.state; const result: string = native.zingolib_initialize_new(url, chain); if (result.toLowerCase().startsWith("error")) { console.log(result); this.setState({ walletScreen: 2, newWalletError: result }); } else { - const r = JSON.parse(result); - this.setState({ walletScreen: 2, seed: r.seed }); + const seed: string = await RPC.fetchSeed(); + this.setState({ walletScreen: 2, seed }); } }; @@ -465,7 +465,7 @@ class LoadingScreen extends Component
-
Zingo PC v1.0.2
+
Zingo PC v1.0.3
Logo
{currentStatus}
@@ -542,7 +542,7 @@ class LoadingScreen extends Component
-
Zingo PC v1.0.2
+
Zingo PC v1.0.3
Logo
@@ -603,7 +603,7 @@ class LoadingScreen extends Component
-
Zingo PC v1.0.2
+
Zingo PC v1.0.3
Logo
@@ -651,7 +651,7 @@ class LoadingScreen extends Component
-
Zingo PC v1.0.2
+
Zingo PC v1.0.3
Logo
diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx index 5ce808e9..00f64ae1 100644 --- a/src/components/sidebar/Sidebar.tsx +++ b/src/components/sidebar/Sidebar.tsx @@ -77,7 +77,7 @@ class Sidebar extends PureComponent -
Zingo PC v1.0.2
+
Zingo PC v1.0.3
Built with Electron. Copyright (c) 2023, ZingoLabs.
The MIT License (MIT) Copyright (c) 2023 ZingoLabs @@ -557,7 +557,7 @@ class Sidebar extends PureComponent
-
Zingo PC v1.0.2
+
Zingo PC v1.0.3
logo