From 65c2306b490b67f029667c949ace17460af40f1f Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Fri, 8 Jan 2021 04:34:53 -0500 Subject: [PATCH] Stuff --- lib/src/paper.rs | 4 ++-- lib/src/pdf.rs | 4 ++-- ui/mkdockerwinlinux.sh | 20 ++++++++++---------- ui/papersapling.pro | 12 ------------ ui/qtlib/Cargo.toml | 4 ++-- ui/qtlib/Makefile | 12 ++++++------ 6 files changed, 22 insertions(+), 34 deletions(-) diff --git a/lib/src/paper.rs b/lib/src/paper.rs index 7d7a851..f90a52f 100644 --- a/lib/src/paper.rs +++ b/lib/src/paper.rs @@ -43,7 +43,7 @@ pub fn double_sha256(payload: &[u8]) -> Vec { h2.to_vec() } -/// Parameters used to generate addresses and private keys. Look in chainparams.cpp (in zcashd/src) +/// Parameters used to generate addresses and private keys. Look in chainparams.cpp in hush3.git /// to get these values. /// Usually these will be different for testnet and for mainnet. pub struct CoinParams { @@ -438,4 +438,4 @@ fn get_zaddress(seed: &[u8], index: u32) -> (String, String, String, json::JsonV let encoded_vk = Bech32::new(params().zviewkey_prefix.into(), c_v).expect("bech32 failed").to_string(); return (encoded, encoded_pk, encoded_vk, path); -} \ No newline at end of file +} diff --git a/lib/src/pdf.rs b/lib/src/pdf.rs index 53e7559..883b323 100644 --- a/lib/src/pdf.rs +++ b/lib/src/pdf.rs @@ -16,7 +16,7 @@ use printpdf::*; * Save the list of wallets (address + private keys) to the given PDF file name. */ pub fn save_to_pdf(addresses: &str, filename: &str) -> Result<(), String> { - let (doc, page1, layer1) = PdfDocument::new("Hush Paper Wallet", Mm(210.0), Mm(297.0), "Layer 1"); + let (doc, page1, layer1) = PdfDocument::new("SilentDragonPaper Wallet", Mm(210.0), Mm(297.0), "Layer 1"); let font = doc.add_builtin_font(BuiltinFont::Courier).unwrap(); let font_bold = doc.add_builtin_font(BuiltinFont::CourierBold).unwrap(); @@ -258,4 +258,4 @@ fn split_to_max(s: &str, max: usize, blocksize: usize) -> Vec { // Add spaces return ans; -} \ No newline at end of file +} diff --git a/ui/mkdockerwinlinux.sh b/ui/mkdockerwinlinux.sh index 8edad98..d58e42e 100755 --- a/ui/mkdockerwinlinux.sh +++ b/ui/mkdockerwinlinux.sh @@ -29,30 +29,30 @@ if [ -z $APP_VERSION ]; then exit 1; fi -cd /opt/hushpaperwallet/ui +cd /opt/silentdragonpaper/ui source ~/.cargo/env # We need to run qmake before we run disclean /opt/Qt/5.11.2/static/bin/qmake papersapling.pro CONFIG+=release make distclean -rm -rf artifacts/linux-hushpaperwallet-v$APP_VERSION -mkdir -p artifacts/linux-hushpaperwallet-v$APP_VERSION +rm -rf artifacts/linux-silentdragonpaper-v$APP_VERSION +mkdir -p artifacts/linux-silentdragonpaper-v$APP_VERSION /opt/Qt/5.11.2/static/bin/qmake papersapling.pro CONFIG+=release make -j4 -strip hushpaperwalletui -cp hushpaperwalletui artifacts/linux-hushpaperwallet-v$APP_VERSION +strip silentdragonpaperui +cp silentdragonpaperui artifacts/linux-silentdragonpaper-v$APP_VERSION # Run qmake before distclean /opt/mxe/usr/bin/x86_64-w64-mingw32.static-qmake-qt5 papersapling.pro CONFIG+=release make distclean -rm -rf artifacts/Windows-hushpaperwallet-v$APP_VERSION -mkdir -p artifacts/Windows-hushpaperwallet-v$APP_VERSION +rm -rf artifacts/Windows-silentdragonpaper-v$APP_VERSION +mkdir -p artifacts/Windows-silentdragonpaper-v$APP_VERSION /opt/mxe/usr/bin/x86_64-w64-mingw32.static-qmake-qt5 papersapling.pro CONFIG+=release make -j4 -strip release/hushpaperwalletui.exe -cp release/hushpaperwalletui.exe artifacts/Windows-hushpaperwallet-v$APP_VERSION +strip release/silentdragonpaperui.exe +cp release/silentdragonpaperui.exe artifacts/Windows-silentdragonpaper-v$APP_VERSION # Cleanup before exiting -make distclean \ No newline at end of file +make distclean diff --git a/ui/papersapling.pro b/ui/papersapling.pro index 5ebc82a..61667c3 100644 --- a/ui/papersapling.pro +++ b/ui/papersapling.pro @@ -14,21 +14,9 @@ TEMPLATE = app MOC_DIR = bin OBJECTS_DIR = bin UI_DIR = src - - -# The following define makes your compiler emit warnings if you use -# any feature of Qt which has been marked as deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. DEFINES += QT_DEPRECATED_WARNINGS -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - CONFIG += c++14 - CONFIG += precompile_header PRECOMPILED_HEADER = src/precompiled.h diff --git a/ui/qtlib/Cargo.toml b/ui/qtlib/Cargo.toml index b8a1ea4..1e47ba3 100644 --- a/ui/qtlib/Cargo.toml +++ b/ui/qtlib/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "qtlib" version = "0.1.0" -authors = ["ZecWallet"] +authors = ["The Hush Developers", "ZecWallet"] edition = "2018" [lib] @@ -10,4 +10,4 @@ crate-type = ["staticlib"] [dependencies] libc = "0.2.58" -silentdragonpaperlib = { path = "../../lib" } \ No newline at end of file +silentdragonpaperlib = { path = "../../lib" } diff --git a/ui/qtlib/Makefile b/ui/qtlib/Makefile index 992a8eb..fae8b6b 100644 --- a/ui/qtlib/Makefile +++ b/ui/qtlib/Makefile @@ -6,18 +6,18 @@ endif all: release -winrelease: target/x86_64-pc-windows-gnu/release/zecpaperrust.lib +winrelease: target/x86_64-pc-windows-gnu/release/silentdragonpaper.lib -target/x86_64-pc-windows-gnu/release/zecpaperrust.lib: src/lib.rs Cargo.toml +target/x86_64-pc-windows-gnu/release/silentdragonpaper.lib: src/lib.rs Cargo.toml cargo build --lib --release --target x86_64-pc-windows-gnu -release: target/release/zecpaperrust.$(EXT) -debug: target/debug/zecpaperrust.$(EXT) +release: target/release/silentdragonpaper.$(EXT) +debug: target/debug/silentdragonpaper.$(EXT) -target/release/zecpaperrust.$(EXT): src/lib.rs Cargo.toml +target/release/silentdragonpaper.$(EXT): src/lib.rs Cargo.toml cargo build --lib --release -target/debug/zecpaperrust.$(EXT): src/lib.rs Cargo.toml +target/debug/silentdragonpaper.$(EXT): src/lib.rs Cargo.toml cargo build --lib clean: