From dead02137eb9099a947fa80b3786f550c5b3478c Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Mon, 28 Oct 2019 10:28:16 -0700 Subject: [PATCH 1/7] Switch default chain name. Fixes #2 --- src/settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.h b/src/settings.h index e9b14dd..2fad7e0 100644 --- a/src/settings.h +++ b/src/settings.h @@ -93,7 +93,7 @@ public: static bool isValidAddress(QString addr); - static QString getChainName() { return QString("test"); } + static QString getChainName() { return QString("main"); } static const QString labelRegExp; From cf7643f67093acb63415f22e89857761fc6aee5f Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Mon, 28 Oct 2019 10:33:01 -0700 Subject: [PATCH 2/7] Switch explorer to zcha.in - Fixes #5 --- src/settings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings.cpp b/src/settings.cpp index 68ddcaf..a96b7af 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -162,7 +162,7 @@ void Settings::openAddressInExplorer(QString address) { if (Settings::getInstance()->isTestnet()) { url = "https://chain.so/address/ZECTEST/" + address; } else { - url = "https://chain.so/address/ZEC/" + address; + url = "https://zcha.in/accounts/" + address; } QDesktopServices::openUrl(QUrl(url)); } @@ -173,7 +173,7 @@ void Settings::openTxInExplorer(QString txid) { url = "https://chain.so/tx/ZECTEST/" + txid; } else { - url = "https://chain.so/tx/ZEC/" + txid; + url = "https://zcha.in/transactions/" + txid; } QDesktopServices::openUrl(QUrl(url)); } From fe3540111856c0098e9a59f2cc655b8dbfb66abd Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Mon, 28 Oct 2019 10:57:41 -0700 Subject: [PATCH 3/7] Remove pending from zbalance. Fixes #7 --- lib/Cargo.lock | 6 +++--- lib/Cargo.toml | 2 +- src/sendtab.cpp | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/Cargo.lock b/lib/Cargo.lock index f885015..a325abe 100644 --- a/lib/Cargo.lock +++ b/lib/Cargo.lock @@ -1051,7 +1051,7 @@ version = "0.1.0" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "zecwalletlitelib 0.1.0 (git+https://github.com/adityapk00/zecwallet-light-cli?rev=01cd0269d558f8755ddc720dc26b81767a773cde)", + "zecwalletlitelib 0.1.0 (git+https://github.com/adityapk00/zecwallet-light-cli?rev=b928d5f09646cc94023ea25f99951fcf1b43e90d)", ] [[package]] @@ -2266,7 +2266,7 @@ dependencies = [ [[package]] name = "zecwalletlitelib" version = "0.1.0" -source = "git+https://github.com/adityapk00/zecwallet-light-cli?rev=01cd0269d558f8755ddc720dc26b81767a773cde#01cd0269d558f8755ddc720dc26b81767a773cde" +source = "git+https://github.com/adityapk00/zecwallet-light-cli?rev=b928d5f09646cc94023ea25f99951fcf1b43e90d#b928d5f09646cc94023ea25f99951fcf1b43e90d" dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bellman 0.1.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)", @@ -2562,4 +2562,4 @@ dependencies = [ "checksum zcash_client_backend 0.0.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)" = "" "checksum zcash_primitives 0.0.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)" = "" "checksum zcash_proofs 0.0.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)" = "" -"checksum zecwalletlitelib 0.1.0 (git+https://github.com/adityapk00/zecwallet-light-cli?rev=01cd0269d558f8755ddc720dc26b81767a773cde)" = "" +"checksum zecwalletlitelib 0.1.0 (git+https://github.com/adityapk00/zecwallet-light-cli?rev=b928d5f09646cc94023ea25f99951fcf1b43e90d)" = "" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index b205001..fc18947 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -11,4 +11,4 @@ crate-type = ["staticlib"] [dependencies] libc = "0.2.58" lazy_static = "1.4.0" -zecwalletlitelib = { git = "https://github.com/adityapk00/zecwallet-light-cli", rev = "01cd0269d558f8755ddc720dc26b81767a773cde" } +zecwalletlitelib = { git = "https://github.com/adityapk00/zecwallet-light-cli", rev = "b928d5f09646cc94023ea25f99951fcf1b43e90d" } diff --git a/src/sendtab.cpp b/src/sendtab.cpp index a3196c4..7a2e458 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -666,6 +666,9 @@ void MainWindow::sendButton() { d->close(); delete connD; delete d; + + // And switch to the balances tab + ui->tabWidget->setCurrentIndex(0); }); // Force a UI update so we get the unconfirmed Tx From 764f1e315db7288c98abeeedfe7e30acb941cf34 Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Mon, 28 Oct 2019 11:54:52 -0700 Subject: [PATCH 4/7] Build scripts --- .gitignore | 2 +- res/Info.plist | 2 +- res/{zecwallet.xpm => zecwallet-lite.xpm} | 0 src/scripts/control | 8 +- src/scripts/desktopentry | 10 +-- src/scripts/dotranslations.sh | 2 +- src/scripts/mkmacdmg.sh | 32 ++----- src/scripts/mkrelease.sh | 103 ++++++---------------- zecwallet-lite.pro | 2 +- 9 files changed, 45 insertions(+), 116 deletions(-) rename res/{zecwallet.xpm => zecwallet-lite.xpm} (100%) diff --git a/.gitignore b/.gitignore index ce6a2fc..b2608b6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ src/ui_*.h src/precompiled.h.cpp .qmake.stash zecwallet -ZecWallet.app +Zecwallet-Lite.app zecwallet-lite-mingw* zecwallet-lite.vcxproj* zecwallet.vcxproj* diff --git a/res/Info.plist b/res/Info.plist index e348bc6..6fb916a 100644 --- a/res/Info.plist +++ b/res/Info.plist @@ -3,7 +3,7 @@ CFBundleExecutable - zecwallet + zecwallet-lite CFBundleGetInfoString Created by Qt/QMake CFBundleIconFile diff --git a/res/zecwallet.xpm b/res/zecwallet-lite.xpm similarity index 100% rename from res/zecwallet.xpm rename to res/zecwallet-lite.xpm diff --git a/src/scripts/control b/src/scripts/control index ffa444d..fe30d50 100644 --- a/src/scripts/control +++ b/src/scripts/control @@ -1,9 +1,9 @@ -Package: zec-qt-wallet +Package: zecwallet-lite Version: RELEASE_VERSION Section: base Priority: optional Architecture: amd64 Maintainer: Aditya Kulkarni -Description: ZecWallet is a full node and UI wallet for Zcash. - ZecWallet is a full node and UI wallet for Zcash. It comes with - full support for shielded addresses and many apps for Zcash. +Description: Zecwallet-Lite is a lightclient UI wallet for Zcash. + Zecwallet-Lite is a lightclient UI wallet for Zcash. It comes with + full support for shielded addresses, transparent addresses and memos for Zcash. diff --git a/src/scripts/desktopentry b/src/scripts/desktopentry index b79c813..828b96b 100644 --- a/src/scripts/desktopentry +++ b/src/scripts/desktopentry @@ -1,12 +1,12 @@ [Desktop Entry] -Name=ZecWallet -Comment=Full node and wallet for Zcash +Name=Zecwallet-Lite +Comment=Lightclient UI wallet for Zcash GenericName=Wallet -Exec=/usr/local/bin/zecwallet %u -Icon=zecwallet.xpm +Exec=/usr/local/bin/zecwallet-lite %u +Icon=zecwallet-lite.xpm Type=Application StartupNotify=true -StartupWMClass=zecwallet +StartupWMClass=zecwallet-lite Categories=Utility; MimeType=x-scheme-handler/zcash; Keywords=zecwallet; diff --git a/src/scripts/dotranslations.sh b/src/scripts/dotranslations.sh index 933a407..e354480 100755 --- a/src/scripts/dotranslations.sh +++ b/src/scripts/dotranslations.sh @@ -6,7 +6,7 @@ if [ -z $QT_STATIC ]; then fi rm -f res/*.qm -$QT_STATIC/bin/lrelease zec-qt-wallet.pro +$QT_STATIC/bin/lrelease zecwallet-lite.pro # Then update the qt base translations. First, get all languages ls res/*.qm | awk -F '[_.]' '{print $4}' | while read -r language ; do diff --git a/src/scripts/mkmacdmg.sh b/src/scripts/mkmacdmg.sh index e239c4e..3592266 100755 --- a/src/scripts/mkmacdmg.sh +++ b/src/scripts/mkmacdmg.sh @@ -35,21 +35,11 @@ if [ -z $QT_PATH ]; then exit 1; fi -if [ -z $ZCASH_DIR ]; then - echo "ZCASH_DIR is not set. Please set it to the base directory of a compiled zcashd"; - exit 1; -fi - if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set. Please set it to the current release version of the app"; exit 1; fi -if [ ! -f $ZCASH_DIR/src/zcashd ]; then - echo "Could not find compiled zcashd in $ZCASH_DIR/src/."; - exit 1; -fi - if ! cat src/version.h | grep -q "$APP_VERSION"; then echo "Version mismatch in src/version.h" exit 1 @@ -67,7 +57,7 @@ echo "[OK]" echo -n "Configuring............" # Build QT_STATIC=$QT_PATH src/scripts/dotranslations.sh >/dev/null -$QT_PATH/bin/qmake zec-qt-wallet.pro CONFIG+=release >/dev/null +$QT_PATH/bin/qmake zecwallet-lite.pro CONFIG+=release >/dev/null echo "[OK]" @@ -78,27 +68,17 @@ echo "[OK]" #Qt deploy echo -n "Deploying.............." mkdir artifacts >/dev/null 2>&1 -rm -f artifcats/zecwallet.dmg >/dev/null 2>&1 +rm -f artifcats/zecwallet-lite.dmg >/dev/null 2>&1 rm -f artifacts/rw* >/dev/null 2>&1 -cp $ZCASH_DIR/src/zcashd zecwallet.app/Contents/MacOS/ -cp $ZCASH_DIR/src/zcash-cli zecwallet.app/Contents/MacOS/ -$QT_PATH/bin/macdeployqt zecwallet.app +$QT_PATH/bin/macdeployqt zecwallet-lite.app echo "[OK]" echo -n "Building dmg..........." -mv zecwallet.app ZecWallet.app -create-dmg --volname "ZecWallet-v$APP_VERSION" --volicon "res/logo.icns" --window-pos 200 120 --icon "ZecWallet.app" 200 190 --app-drop-link 600 185 --hide-extension "ZecWallet.app" --window-size 800 400 --hdiutil-quiet --background res/dmgbg.png artifacts/macOS-zecwallet-v$APP_VERSION.dmg ZecWallet.app >/dev/null 2>&1 - -#mkdir bin/dmgbuild >/dev/null 2>&1 -#sed "s/RELEASE_VERSION/${APP_VERSION}/g" res/appdmg.json > bin/dmgbuild/appdmg.json -#cp res/logo.icns bin/dmgbuild/ -#cp res/dmgbg.png bin/dmgbuild/ - -#cp -r zecwallet.app bin/dmgbuild/ +mv zecwallet-lite.app Zecwallet-Lite.app +create-dmg --volname "Zecwallet-Lite-v$APP_VERSION" --volicon "res/logo.icns" --window-pos 200 120 --icon "Zecwallet-Lite.app" 200 190 --app-drop-link 600 185 --hide-extension "Zecwallet-Lite.app" --window-size 800 400 --hdiutil-quiet --background res/dmgbg.png artifacts/macOS-zecwallet-lite-v$APP_VERSION.dmg Zecwallet-Lite.app >/dev/null 2>&1 -#appdmg --quiet bin/dmgbuild/appdmg.json artifacts/macOS-zecwallet-v$APP_VERSION.dmg >/dev/null -if [ ! -f artifacts/macOS-zecwallet-v$APP_VERSION.dmg ]; then +if [ ! -f artifacts/macOS-zecwallet-lite-v$APP_VERSION.dmg ]; then echo "[ERROR]" exit 1 fi diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh index 5dcc6eb..596c448 100755 --- a/src/scripts/mkrelease.sh +++ b/src/scripts/mkrelease.sh @@ -7,40 +7,6 @@ fi if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi if [ -z $PREV_VERSION ]; then echo "PREV_VERSION is not set"; exit 1; fi -if [ -z $ZCASH_DIR ]; then - echo "ZCASH_DIR is not set. Please set it to the base directory of a Zcash project with built Zcash binaries." - exit 1; -fi - -if [ ! -f $ZCASH_DIR/artifacts/zcashd ]; then - echo "Couldn't find zcashd in $ZCASH_DIR/artifacts/. Please build zcashd." - exit 1; -fi - -if [ ! -f $ZCASH_DIR/artifacts/zcash-cli ]; then - echo "Couldn't find zcash-cli in $ZCASH_DIR/artifacts/. Please build zcashd." - exit 1; -fi - -# Ensure that zcashd is the right build -echo -n "zcashd version........." -if grep -q "zqwMagicBean" $ZCASH_DIR/artifacts/zcashd && ! readelf -s $ZCASH_DIR/artifacts/zcashd | grep -q "GLIBC_2\.25"; then - echo "[OK]" -else - echo "[ERROR]" - echo "zcashd doesn't seem to be a zqwMagicBean build or zcashd is built with libc 2.25" - exit 1 -fi - -echo -n "zcashd.exe version....." -if grep -q "zqwMagicBean" $ZCASH_DIR/artifacts/zcashd.exe; then - echo "[OK]" -else - echo "[ERROR]" - echo "zcashd doesn't seem to be a zqwMagicBean build" - exit 1 -fi - echo -n "Version files.........." # Replace the version number in the .pro file so it gets picked up everywhere sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" zec-qt-wallet.pro > /dev/null @@ -60,12 +26,11 @@ echo "[Building on" `lsb_release -r`"]" echo -n "Configuring............" QT_STATIC=$QT_STATIC bash src/scripts/dotranslations.sh >/dev/null -$QT_STATIC/bin/qmake zec-qt-wallet.pro -spec linux-clang CONFIG+=release > /dev/null +$QT_STATIC/bin/qmake zecwallet-lite.pro -spec linux-clang CONFIG+=release > /dev/null echo "[OK]" echo -n "Building..............." -rm -rf bin/zec-qt-wallet* > /dev/null rm -rf bin/zecwallet* > /dev/null make clean > /dev/null make -j$(nproc) > /dev/null @@ -74,7 +39,7 @@ echo "[OK]" # Test for Qt echo -n "Static link............" -if [[ $(ldd zecwallet | grep -i "Qt") ]]; then +if [[ $(ldd zecwallet-lite | grep -i "Qt") ]]; then echo "FOUND QT; ABORT"; exit 1 fi @@ -82,27 +47,25 @@ echo "[OK]" echo -n "Packaging.............." -mkdir bin/zecwallet-v$APP_VERSION > /dev/null -strip zecwallet +mkdir bin/zecwallet-lite-v$APP_VERSION > /dev/null +strip zecwallet-lite -cp zecwallet bin/zecwallet-v$APP_VERSION > /dev/null -cp $ZCASH_DIR/artifacts/zcashd bin/zecwallet-v$APP_VERSION > /dev/null -cp $ZCASH_DIR/artifacts/zcash-cli bin/zecwallet-v$APP_VERSION > /dev/null -cp README.md bin/zecwallet-v$APP_VERSION > /dev/null -cp LICENSE bin/zecwallet-v$APP_VERSION > /dev/null +cp zecwallet-lite bin/zecwallet-lite-v$APP_VERSION > /dev/null +cp README.md bin/zecwallet-lite-v$APP_VERSION > /dev/null +cp LICENSE bin/zecwallet-lite-v$APP_VERSION > /dev/null -cd bin && tar czf linux-zecwallet-v$APP_VERSION.tar.gz zecwallet-v$APP_VERSION/ > /dev/null +cd bin && tar czf linux-zecwallet-lite-v$APP_VERSION.tar.gz zecwallet-lite-v$APP_VERSION/ > /dev/null cd .. mkdir artifacts >/dev/null 2>&1 -cp bin/linux-zecwallet-v$APP_VERSION.tar.gz ./artifacts/linux-binaries-zecwallet-v$APP_VERSION.tar.gz +cp bin/linux-zecwallet-lite-v$APP_VERSION.tar.gz ./artifacts/linux-binaries-zecwallet-lite-v$APP_VERSION.tar.gz echo "[OK]" -if [ -f artifacts/linux-binaries-zecwallet-v$APP_VERSION.tar.gz ] ; then +if [ -f artifacts/linux-binaries-zecwallet-lite-v$APP_VERSION.tar.gz ] ; then echo -n "Package contents......." # Test if the package is built OK - if tar tf "artifacts/linux-binaries-zecwallet-v$APP_VERSION.tar.gz" | wc -l | grep -q "6"; then + if tar tf "artifacts/linux-binaries-zecwallet-lite-v$APP_VERSION.tar.gz" | wc -l | grep -q "4"; then echo "[OK]" else echo "[ERROR]" @@ -114,7 +77,7 @@ else fi echo -n "Building deb..........." -debdir=bin/deb/zecwallet-v$APP_VERSION +debdir=bin/deb/zecwallet-lite-v$APP_VERSION mkdir -p $debdir > /dev/null mkdir $debdir/DEBIAN mkdir -p $debdir/usr/local/bin @@ -122,16 +85,15 @@ mkdir -p $debdir/usr/local/bin cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control cp zecwallet $debdir/usr/local/bin/ -cp $ZCASH_DIR/artifacts/zcashd $debdir/usr/local/bin/zqw-zcashd mkdir -p $debdir/usr/share/pixmaps/ -cp res/zecwallet.xpm $debdir/usr/share/pixmaps/ +cp res/zecwallet-lite.xpm $debdir/usr/share/pixmaps/ mkdir -p $debdir/usr/share/applications -cp src/scripts/desktopentry $debdir/usr/share/applications/zec-qt-wallet.desktop +cp src/scripts/desktopentry $debdir/usr/share/applications/zecwallet-lite.desktop dpkg-deb --build $debdir >/dev/null -cp $debdir.deb artifacts/linux-deb-zecwallet-v$APP_VERSION.deb +cp $debdir.deb artifacts/linux-deb-zecwallet-lite-v$APP_VERSION.deb echo "[OK]" @@ -145,51 +107,38 @@ if [ -z $MXE_PATH ]; then exit 0; fi -if [ ! -f $ZCASH_DIR/artifacts/zcashd.exe ]; then - echo "Couldn't find zcashd.exe in $ZCASH_DIR/artifacts/. Please build zcashd.exe" - exit 1; -fi - - -if [ ! -f $ZCASH_DIR/artifacts/zcash-cli.exe ]; then - echo "Couldn't find zcash-cli.exe in $ZCASH_DIR/artifacts/. Please build zcashd.exe" - exit 1; -fi - export PATH=$MXE_PATH:$PATH echo -n "Configuring............" make clean > /dev/null -rm -f zec-qt-wallet-mingw.pro +#rm -f zec-qt-wallet-mingw.pro rm -rf release/ #Mingw seems to have trouble with precompiled headers, so strip that option from the .pro file -cat zec-qt-wallet.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED_HEADER.*//g" > zec-qt-wallet-mingw.pro +#cat zec-qt-wallet.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED_HEADER.*//g" > zec-qt-wallet-mingw.pro echo "[OK]" echo -n "Building..............." -x86_64-w64-mingw32.static-qmake-qt5 zec-qt-wallet-mingw.pro CONFIG+=release > /dev/null +x86_64-w64-mingw32.static-qmake-qt5 zecwallet-lite.pro CONFIG+=release > /dev/null make -j32 > /dev/null echo "[OK]" echo -n "Packaging.............." -mkdir release/zecwallet-v$APP_VERSION -cp release/zecwallet.exe release/zecwallet-v$APP_VERSION -cp $ZCASH_DIR/artifacts/zcashd.exe release/zecwallet-v$APP_VERSION > /dev/null -cp $ZCASH_DIR/artifacts/zcash-cli.exe release/zecwallet-v$APP_VERSION > /dev/null -cp README.md release/zecwallet-v$APP_VERSION -cp LICENSE release/zecwallet-v$APP_VERSION -cd release && zip -r Windows-binaries-zecwallet-v$APP_VERSION.zip zecwallet-v$APP_VERSION/ > /dev/null +mkdir release/zecwallet-lite-v$APP_VERSION +cp release/zecwallet-lite.exe release/zecwallet-lite-v$APP_VERSION +cp README.md release/zecwallet-lite-v$APP_VERSION +cp LICENSE release/zecwallet-lite-v$APP_VERSION +cd release && zip -r Windows-binaries-zecwallet-lite-v$APP_VERSION.zip zecwallet-lite-v$APP_VERSION/ > /dev/null cd .. mkdir artifacts >/dev/null 2>&1 -cp release/Windows-binaries-zecwallet-v$APP_VERSION.zip ./artifacts/ +cp release/Windows-binaries-zecwallet-lite-v$APP_VERSION.zip ./artifacts/ echo "[OK]" -if [ -f artifacts/Windows-binaries-zecwallet-v$APP_VERSION.zip ] ; then +if [ -f artifacts/Windows-binaries-zecwallet-lite-v$APP_VERSION.zip ] ; then echo -n "Package contents......." - if unzip -l "artifacts/Windows-binaries-zecwallet-v$APP_VERSION.zip" | wc -l | grep -q "11"; then + if unzip -l "artifacts/Windows-binaries-zecwallet-lite-v$APP_VERSION.zip" | wc -l | grep -q "9"; then echo "[OK]" else echo "[ERROR]" diff --git a/zecwallet-lite.pro b/zecwallet-lite.pro index a169c1a..2dcacc4 100644 --- a/zecwallet-lite.pro +++ b/zecwallet-lite.pro @@ -13,7 +13,7 @@ PRECOMPILED_HEADER = src/precompiled.h QT += widgets QT += websockets -TARGET = zecwallet +TARGET = zecwallet-lite TEMPLATE = app From 48e584689967c4a277c089ecddc0085bb269eec5 Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Mon, 28 Oct 2019 12:39:41 -0700 Subject: [PATCH 5/7] Linux and Windows build --- .gitignore | 3 +++ lib/src/lib.rs | 8 -------- src/scripts/mkrelease.sh | 9 ++++++--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index b2608b6..273106c 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,6 @@ IDEWorkspaceChecks.plist *.sln node_modules zec-qt-wallet.pro.user.4.10-pre1 +zecwallet-lite +zecwallet-lite_plugin_import.cpp +zecwallet-lite_resource.rc diff --git a/lib/src/lib.rs b/lib/src/lib.rs index 98b03fa..afe5456 100644 --- a/lib/src/lib.rs +++ b/lib/src/lib.rs @@ -105,14 +105,6 @@ pub extern fn litelib_initialize_new_from_phrase(dangerous: bool, server: *const } }; - let seed = match lightclient.do_seed_phrase() { - Ok(s) => s.dump(), - Err(e) => { - let e_str = CString::new(format!("Error: {}", e)).unwrap(); - return e_str.into_raw(); - } - }; - LIGHTCLIENT.lock().unwrap().replace(Some(Arc::new(lightclient))); let c_str = CString::new("OK").unwrap(); diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh index 596c448..f96a8ef 100755 --- a/src/scripts/mkrelease.sh +++ b/src/scripts/mkrelease.sh @@ -9,7 +9,7 @@ if [ -z $PREV_VERSION ]; then echo "PREV_VERSION is not set"; exit 1; fi echo -n "Version files.........." # Replace the version number in the .pro file so it gets picked up everywhere -sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" zec-qt-wallet.pro > /dev/null +sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" zecwallet-lite.pro > /dev/null # Also update it in the README.md sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" README.md > /dev/null @@ -32,7 +32,8 @@ echo "[OK]" echo -n "Building..............." rm -rf bin/zecwallet* > /dev/null -make clean > /dev/null +# Build the lib first +cd lib && make release && cd .. make -j$(nproc) > /dev/null echo "[OK]" @@ -84,7 +85,7 @@ mkdir -p $debdir/usr/local/bin cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control -cp zecwallet $debdir/usr/local/bin/ +cp zecwallet-lite $debdir/usr/local/bin/ mkdir -p $debdir/usr/share/pixmaps/ cp res/zecwallet-lite.xpm $debdir/usr/share/pixmaps/ @@ -119,6 +120,8 @@ echo "[OK]" echo -n "Building..............." +# Build the lib first +cd lib && make winrelease && cd .. x86_64-w64-mingw32.static-qmake-qt5 zecwallet-lite.pro CONFIG+=release > /dev/null make -j32 > /dev/null echo "[OK]" From 4ab596af50a01b8df49b6ca5fb956432a478773b Mon Sep 17 00:00:00 2001 From: adityapk00 <31996805+adityapk00@users.noreply.github.com> Date: Mon, 28 Oct 2019 12:40:46 -0700 Subject: [PATCH 6/7] Update README.md --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a08c25a..a682400 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -ZecWallet-lite is z-Addr first, Sapling compatible wallet lightwallet for Zcash +Zecwallet-Lite is z-Addr first, Sapling compatible wallet lightwallet for Zcash ## Compiling from source * ZecWallet is written in C++ 14, and can be compiled with g++/clang++/visual c++. @@ -9,12 +9,10 @@ ZecWallet-lite is z-Addr first, Sapling compatible wallet lightwallet for Zcash ``` git clone https://github.com/adityapk/zecwallet-lite.git -cd zecwallet +cd zecwallet-lite /path/to/qt5/bin/qmake zecwallet-lite.pro CONFIG+=debug make -j$(nproc) -./zecwallet +./zecwallet-lite ``` -Right now, you'll also need to run `lightwalletd` on your local machine for Zecwallet to connect to. - -_PS: ZecWallet is NOT an official wallet, and is not affiliated with the Electric Coin Company in any way._ +_PS: Zecwallet-Lite is NOT an official wallet, and is not affiliated with the Electric Coin Company in any way._ From 8139326c1ff55a30eac609c28ceb3671ed332189 Mon Sep 17 00:00:00 2001 From: adityapk00 <31996805+adityapk00@users.noreply.github.com> Date: Mon, 28 Oct 2019 12:41:05 -0700 Subject: [PATCH 7/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a682400..6260847 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Zecwallet-Lite is z-Addr first, Sapling compatible wallet lightwallet for Zcash ### Building on Linux ``` -git clone https://github.com/adityapk/zecwallet-lite.git +git clone https://github.com/adityapk00/zecwallet-lite.git cd zecwallet-lite /path/to/qt5/bin/qmake zecwallet-lite.pro CONFIG+=debug make -j$(nproc)