wow wow wow

pull/7/head
wowario 5 years ago
parent a8bd2ab77e
commit 50323d7a9d
No known key found for this signature in database
GPG Key ID: 24DCBE762DE9C111

6
.gitmodules vendored

@ -1,4 +1,4 @@
[submodule "monero"] [submodule "wownero"]
path = monero path = wownero
url = https://github.com/monero-project/monero url = https://github.com/wownero/wownero
ignore = all ignore = all

@ -237,7 +237,7 @@ Rectangle {
if (persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle) { if (persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle) {
return appWindow.fiatApiCurrencySymbol(); return appWindow.fiatApiCurrencySymbol();
} else { } else {
return "XMR" return ""
} }
} }
color: MoneroComponents.Style.blackTheme ? "white" : "black" color: MoneroComponents.Style.blackTheme ? "white" : "black"

@ -1,4 +1,4 @@
# Monero GUI # ~~Monero GUI~~ Wownero App
Copyright (c) 2014-2019, The Monero Project Copyright (c) 2014-2019, The Monero Project

@ -92,8 +92,8 @@ RUN cp openssl/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/li
RUN cp boost_${BOOST_VERSION}/android32/lib/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib RUN cp boost_${BOOST_VERSION}/android32/lib/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib
RUN cp ZBar/android/obj/local/armeabi-v7a/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib RUN cp ZBar/android/obj/local/armeabi-v7a/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib
RUN git clone https://github.com/monero-project/monero-gui.git \ RUN git clone https://github.com/wownero/wownero-app.git \
&& cd monero-gui \ && cd wownero-app \
&& git submodule update \ && git submodule update \
&& CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ BOOST_ROOT=/opt/android/boost_1_62_0 \ && CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ BOOST_ROOT=/opt/android/boost_1_62_0 \
BOOST_LIBRARYDIR=${WORKDIR}/boost_${BOOST_VERSION}/android32/lib/ \ BOOST_LIBRARYDIR=${WORKDIR}/boost_${BOOST_VERSION}/android32/lib/ \

@ -64,8 +64,8 @@ fi
source ./utils.sh source ./utils.sh
pushd $(pwd) pushd $(pwd)
ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
MONERO_DIR=monero MONERO_DIR=wownero
MONEROD_EXEC=monerod MONEROD_EXEC=wownerod
MAKE='make' MAKE='make'
if [[ $platform == *bsd* ]]; then if [[ $platform == *bsd* ]]; then
@ -93,9 +93,9 @@ if [ "$ANDROID" != true ] && ([ "$platform" == "linux32" ] || [ "$platform" == "
fi fi
if [ "$platform" == "darwin" ]; then if [ "$platform" == "darwin" ]; then
BIN_PATH=$BIN_PATH/monero-wallet-gui.app/Contents/MacOS/ BIN_PATH=$BIN_PATH/wownero-app.app/Contents/MacOS/
elif [ "$platform" == "mingw64" ] || [ "$platform" == "mingw32" ]; then elif [ "$platform" == "mingw64" ] || [ "$platform" == "mingw32" ]; then
MONEROD_EXEC=monerod.exe MONEROD_EXEC=wownerod.exe
fi fi
# force version update # force version update
@ -111,7 +111,7 @@ if ! QMAKE=$(find_command qmake qmake-qt5); then
echo "Failed to find suitable qmake command." echo "Failed to find suitable qmake command."
exit 1 exit 1
fi fi
$QMAKE ../monero-wallet-gui.pro "$CONFIG" || exit $QMAKE ../wownero-app.pro "$CONFIG" || exit
$MAKE || exit $MAKE || exit
# Copy monerod to bin folder # Copy monerod to bin folder

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
MONERO_URL=https://github.com/monero-project/monero.git MONERO_URL=https://github.com/wownero/wownero.git
MONERO_BRANCH=master MONERO_BRANCH=master
pushd $(pwd) pushd $(pwd)
@ -8,12 +8,12 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $ROOT_DIR/utils.sh source $ROOT_DIR/utils.sh
INSTALL_DIR=$ROOT_DIR/wallet INSTALL_DIR=$ROOT_DIR/wallet
MONERO_DIR=$ROOT_DIR/monero MONERO_DIR=$ROOT_DIR/wownero
BUILD_LIBWALLET=false BUILD_LIBWALLET=false
# init and update monero submodule # init and update monero submodule
if [ ! -d $MONERO_DIR/src ]; then if [ ! -d $MONERO_DIR/src ]; then
git submodule init monero git submodule init wownero
fi fi
git submodule update --remote git submodule update --remote
git -C $MONERO_DIR fetch git -C $MONERO_DIR fetch
@ -32,14 +32,14 @@ git -C $MONERO_DIR checkout -B $VERSIONTAG
# Save current user settings and revert back when we are done with merging PR's # Save current user settings and revert back when we are done with merging PR's
OLD_GIT_USER=$(git -C $MONERO_DIR config --local user.name) OLD_GIT_USER=$(git -C $MONERO_DIR config --local user.name)
OLD_GIT_EMAIL=$(git -C $MONERO_DIR config --local user.email) OLD_GIT_EMAIL=$(git -C $MONERO_DIR config --local user.email)
git -C $MONERO_DIR config user.name "Monero GUI" git -C $MONERO_DIR config user.name "Wownero App"
git -C $MONERO_DIR config user.email "gui@monero.local" git -C $MONERO_DIR config user.email "app@wownero.local"
# check for PR requirements in most recent commit message (i.e requires #xxxx) # check for PR requirements in most recent commit message (i.e requires #xxxx)
for PR in $(git log --format=%B -n 1 | grep -io "requires #[0-9]*" | sed 's/[^0-9]*//g'); do for PR in $(git log --format=%B -n 1 | grep -io "requires #[0-9]*" | sed 's/[^0-9]*//g'); do
echo "Merging monero push request #$PR" echo "Merging monero push request #$PR"
# fetch pull request and merge # fetch pull request and merge
git -C $MONERO_DIR fetch origin pull/$PR/head:PR-$PR git -C $MONERO_DIR fetch origin pull/$PR/head:PR-$PR
git -C $MONERO_DIR merge --quiet PR-$PR -m "Merge monero PR #$PR" git -C $MONERO_DIR merge --quiet PR-$PR -m "Merge wownero PR #$PR"
BUILD_LIBWALLET=true BUILD_LIBWALLET=true
done done
@ -281,6 +281,6 @@ if [ -d $MONERO_DIR/build/$BUILD_TYPE/external/unbound ]; then
fi fi
# install randomx # install randomx
eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/randomx all install eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/RandomWOW all install
popd popd

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 745 B

After

Width:  |  Height:  |  Size: 801 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 436 B

After

Width:  |  Height:  |  Size: 774 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 822 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 765 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

@ -367,4 +367,4 @@ Root: HKCR; Subkey: "monero\shell\open\command"; ValueType: "string"; ValueData:
Root: HKCR; Subkey: "moneroseed"; ValueType: "string"; ValueData: "URL:Monero Seed Node Protocol"; Flags: uninsdeletekey Root: HKCR; Subkey: "moneroseed"; ValueType: "string"; ValueData: "URL:Monero Seed Node Protocol"; Flags: uninsdeletekey
Root: HKCR; Subkey: "moneroseed"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" Root: HKCR; Subkey: "moneroseed"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: ""
Root: HKCR; Subkey: "moneroseed\DefaultIcon"; ValueType: "string"; ValueData: "{app}\monero-wallet-gui.exe,0" Root: HKCR; Subkey: "moneroseed\DefaultIcon"; ValueType: "string"; ValueData: "{app}\monero-wallet-gui.exe,0"
Root: HKCR; Subkey: "moneroseed\shell\open\command"; ValueType: "string"; ValueData: """{app}\monero-wallet-gui.exe"" ""%1""" Root: HKCR; Subkey: "moneroseed\shell\open\command"; ValueType: "string"; ValueData: """{app}\monero-wallet-gui.exe"" ""%1"""

@ -1,3 +1,3 @@
REM Execute the Monero daemon and then stay with window open after it exits REM Execute the Monero daemon and then stay with window open after it exits
"C:\Program Files\Monero Core\monerod.exe" "C:\Program Files\Monero Core\wownerod.exe"
PAUSE PAUSE

@ -26,22 +26,22 @@ if [ -z $OPENSSL_ROOT_DIR ]; then
fi fi
echo "Building IOS armv7" echo "Building IOS armv7"
rm -r monero/build > /dev/null rm -r wownero/build > /dev/null
mkdir -p monero/build/release mkdir -p wownero/build/release
pushd monero/build/release pushd wownero/build/release
cmake -D IOS=ON -D ARCH=armv7 -D BOOST_LIBRARYDIR=${BOOST_INCLUDEDIR} -D BOOST_INCLUDEDIR=${BOOST_INCLUDEDIR} -D OPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} -D OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -D CMAKE_BUILD_TYPE=debug -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="/Users/jacob/crypto/monero-core/monero" ../.. cmake -D IOS=ON -D ARCH=armv7 -D BOOST_LIBRARYDIR=${BOOST_INCLUDEDIR} -D BOOST_INCLUDEDIR=${BOOST_INCLUDEDIR} -D OPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} -D OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -D CMAKE_BUILD_TYPE=debug -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="/Users/jacob/crypto/wownero-app/wownero" ../..
make -j4 && make install make -j4 && make install
popd popd
echo "Building IOS arm64" echo "Building IOS arm64"
rm -r monero/build > /dev/null rm -r wownero/build > /dev/null
mkdir -p monero/build/release mkdir -p wownero/build/release
pushd monero/build/release pushd wownero/build/release
cmake -D IOS=ON -D ARCH=armv8-a -D BOOST_LIBRARYDIR=${BOOST_INCLUDEDIR} -D BOOST_INCLUDEDIR=${BOOST_INCLUDEDIR} -D OPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} -D OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -D CMAKE_BUILD_TYPE=debug -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="/Users/jacob/crypto/monero-core/monero" ../.. cmake -D IOS=ON -D ARCH=armv8-a -D BOOST_LIBRARYDIR=${BOOST_INCLUDEDIR} -D BOOST_INCLUDEDIR=${BOOST_INCLUDEDIR} -D OPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} -D OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -D CMAKE_BUILD_TYPE=debug -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="/Users/jacob/crypto/wownero-app/wownero" ../..
make -j4 && make install make -j4 && make install
popd popd
echo "Creating fat library for armv7 and arm64" echo "Creating fat library for armv7 and arm64"
pushd monero pushd wownero
mkdir -p lib-ios mkdir -p lib-ios
lipo -create lib-armv7/libwallet_merged.a lib-arm64/libwallet_merged.a -output lib-ios/libwallet_merged.a lipo -create lib-armv7/libwallet_merged.a lib-arm64/libwallet_merged.a -output lib-ios/libwallet_merged.a
lipo -create lib-armv7/libunbound.a lib-arm64/libunbound.a -output lib-ios/libunbound.a lipo -create lib-armv7/libunbound.a lib-arm64/libunbound.a -output lib-ios/libunbound.a

@ -84,7 +84,7 @@ ApplicationWindow {
readonly property string localDaemonAddress : "localhost:" + getDefaultDaemonRpcPort(persistentSettings.nettype) readonly property string localDaemonAddress : "localhost:" + getDefaultDaemonRpcPort(persistentSettings.nettype)
property string currentDaemonAddress; property string currentDaemonAddress;
property int disconnectedEpoch: 0 property int disconnectedEpoch: 0
property int estimatedBlockchainSize: 75 // GB property int estimatedBlockchainSize: 2 // GB
property alias viewState: rootItem.state property alias viewState: rootItem.state
property string prevSplashText; property string prevSplashText;
property bool splashDisplayedBeforeButtonRequest; property bool splashDisplayedBeforeButtonRequest;
@ -96,17 +96,9 @@ ApplicationWindow {
property real fiatPriceXMREUR: 0 property real fiatPriceXMREUR: 0
property var fiatPriceAPIs: { property var fiatPriceAPIs: {
return { return {
"kraken": {
"xmrusd": "https://api.kraken.com/0/public/Ticker?pair=XMRUSD",
"xmreur": "https://api.kraken.com/0/public/Ticker?pair=XMREUR"
},
"coingecko": { "coingecko": {
"xmrusd": "https://api.coingecko.com/api/v3/simple/price?ids=monero&vs_currencies=usd", "wowusd": "https://api.coingecko.com/api/v3/simple/price?ids=wownero&vs_currencies=usd",
"xmreur": "https://api.coingecko.com/api/v3/simple/price?ids=monero&vs_currencies=eur" "woweur": "https://api.coingecko.com/api/v3/simple/price?ids=wownero&vs_currencies=eur"
},
"cryptocompare": {
"xmrusd": "https://min-api.cryptocompare.com/data/price?fsym=XMR&tsyms=USD",
"xmreur": "https://min-api.cryptocompare.com/data/price?fsym=XMR&tsyms=EUR",
} }
} }
} }
@ -331,7 +323,7 @@ ApplicationWindow {
if(!wallet || wallet === undefined || wallet.path === undefined){ if(!wallet || wallet === undefined || wallet.path === undefined){
informationPopup.title = qsTr("Error") + translationManager.emptyString; informationPopup.title = qsTr("Error") + translationManager.emptyString;
informationPopup.text = qsTr("Couldn't open wallet: ") + 'please restart GUI.'; informationPopup.text = qsTr("Couldn't open wallet: ") + 'please restart App.';
informationPopup.icon = StandardIcon.Critical informationPopup.icon = StandardIcon.Critical
informationPopup.open() informationPopup.open()
informationPopup.onCloseCallback = function() { informationPopup.onCloseCallback = function() {
@ -431,8 +423,8 @@ ApplicationWindow {
} }
function onUriHandler(uri){ function onUriHandler(uri){
if(uri.startsWith("monero://")){ if(uri.startsWith("wownero://")){
var address = uri.substring("monero://".length); var address = uri.substring("wownero://".length);
var params = {} var params = {}
if(address.length === 0) return; if(address.length === 0) return;
@ -723,7 +715,7 @@ ApplicationWindow {
// resume refresh // resume refresh
currentWallet.startRefresh(); currentWallet.startRefresh();
informationPopup.title = qsTr("Daemon failed to start") + translationManager.emptyString; informationPopup.title = qsTr("Daemon failed to start") + translationManager.emptyString;
informationPopup.text = error + ".\n\n" + qsTr("Please check your wallet and daemon log for errors. You can also try to start %1 manually.").arg((isWindows)? "monerod.exe" : "monerod") informationPopup.text = error + ".\n\n" + qsTr("Please check your wallet and daemon log for errors. You can also try to start %1 manually.").arg((isWindows)? "wownerod.exe" : "wownerod")
informationPopup.icon = StandardIcon.Critical informationPopup.icon = StandardIcon.Critical
informationPopup.onCloseCallback = null informationPopup.onCloseCallback = null
informationPopup.open(); informationPopup.open();
@ -1165,18 +1157,18 @@ ApplicationWindow {
return; return;
} }
var key = currency === "xmreur" ? "XXMRZEUR" : "XXMRZUSD"; var key = currency === "woweur" ? "XWOWZEUR" : "XWOWZUSD";
var ticker = resp.result[key]["o"]; var ticker = resp.result[key]["o"];
return ticker; return ticker;
} else if(url.startsWith("https://api.coingecko.com/api/v3/")){ } else if(url.startsWith("https://api.coingecko.com/api/v3/")){
var key = currency === "xmreur" ? "eur" : "usd"; var key = currency === "woweur" ? "eur" : "usd";
if(!resp.hasOwnProperty("monero") || !resp["monero"].hasOwnProperty(key)){ if(!resp.hasOwnProperty("wownero") || !resp["wownero"].hasOwnProperty(key)){
appWindow.fiatApiError("Coingecko API has error(s)"); appWindow.fiatApiError("Coingecko API has error(s)");
return; return;
} }
return resp["monero"][key]; return resp["wownero"][key];
} else if(url.startsWith("https://min-api.cryptocompare.com/data/")){ } else if(url.startsWith("https://min-api.cryptocompare.com/data/")){
var key = currency === "xmreur" ? "EUR" : "USD"; var key = currency === "woweur" ? "EUR" : "USD";
if(!resp.hasOwnProperty(key)){ if(!resp.hasOwnProperty(key)){
appWindow.fiatApiError("cryptocompare API has error(s)"); appWindow.fiatApiError("cryptocompare API has error(s)");
return; return;
@ -1353,7 +1345,7 @@ ApplicationWindow {
id: persistentSettings id: persistentSettings
fileName: { fileName: {
if(isTails && tailsUsePersistence) if(isTails && tailsUsePersistence)
return homePath + "/Persistent/Monero/monero-core.conf"; return homePath + "/Persistent/Wownero/wownero-app.conf";
return ""; return "";
} }
@ -1381,9 +1373,9 @@ ApplicationWindow {
property string blockchainDataDir: "" property string blockchainDataDir: ""
property bool useRemoteNode: false property bool useRemoteNode: false
property string remoteNodeAddress: "" property string remoteNodeAddress: ""
property string bootstrapNodeAddress: "" property string bootstrapNodeAddress: "node.wowne.ro:34568"
property bool segregatePreForkOutputs: true property bool segregatePreForkOutputs: false
property bool keyReuseMitigation2: true property bool keyReuseMitigation2: false
property int segregationHeight: 0 property int segregationHeight: 0
property int kdfRounds: 1 property int kdfRounds: 1
property bool hideBalance: false property bool hideBalance: false
@ -1398,8 +1390,8 @@ ApplicationWindow {
property bool fiatPriceEnabled: false property bool fiatPriceEnabled: false
property bool fiatPriceToggle: false property bool fiatPriceToggle: false
property string fiatPriceProvider: "kraken" property string fiatPriceProvider: "coingecko"
property string fiatPriceCurrency: "xmrusd" property string fiatPriceCurrency: "wowusd"
Component.onCompleted: { Component.onCompleted: {
MoneroComponents.Style.blackTheme = persistentSettings.blackTheme MoneroComponents.Style.blackTheme = persistentSettings.blackTheme
@ -2048,7 +2040,7 @@ ApplicationWindow {
function checkUpdates() { function checkUpdates() {
const version = Version.GUI_VERSION.match(/\d+\.\d+\.\d+\.\d+/); const version = Version.GUI_VERSION.match(/\d+\.\d+\.\d+\.\d+/);
if (version) { if (version) {
walletManager.checkUpdatesAsync("monero-gui", "gui", getBuildTag(), version[0]); walletManager.checkUpdatesAsync("wownero-app", "app", getBuildTag(), version[0]);
} else { } else {
console.error("failed to parse version number", Version.GUI_VERSION); console.error("failed to parse version number", Version.GUI_VERSION);
} }
@ -2122,9 +2114,9 @@ ApplicationWindow {
case NetworkType.STAGENET: case NetworkType.STAGENET:
return 38081; return 38081;
case NetworkType.TESTNET: case NetworkType.TESTNET:
return 28081; return 11181;
default: default:
return 18081; return 34568;
} }
} }

@ -1 +0,0 @@
Subproject commit ab594cfee94dff87bb7039724563f6177a892b8b

@ -90,7 +90,7 @@ Rectangle {
wrapMode: Text.WordWrap; wrapMode: Text.WordWrap;
leftPadding: 0 leftPadding: 0
topPadding: 0 topPadding: 0
text: qsTr("This makes it easier to send or receive Monero and reduces errors when typing in addresses manually.") + translationManager.emptyString text: qsTr("This makes it easier to send or receive Wownero and reduces errors when typing in addresses manually.") + translationManager.emptyString
width: parent.width width: parent.width
} }
@ -296,7 +296,7 @@ Rectangle {
.arg(qsTr("Address")) + translationManager.emptyString .arg(qsTr("Address")) + translationManager.emptyString
placeholderText: { placeholderText: {
if(persistentSettings.nettype == NetworkType.MAINNET){ if(persistentSettings.nettype == NetworkType.MAINNET){
return "4.. / 8.. / OpenAlias"; return "Wo.. / WW.. / OpenAlias";
} else if (persistentSettings.nettype == NetworkType.STAGENET){ } else if (persistentSettings.nettype == NetworkType.STAGENET){
return "5.. / 7.."; return "5.. / 7..";
} else if(persistentSettings.nettype == NetworkType.TESTNET){ } else if(persistentSettings.nettype == NetworkType.TESTNET){

@ -711,7 +711,7 @@ Rectangle {
font.pixelSize: 15 font.pixelSize: 15
text: { text: {
if(!isout && confirmationsRequired === 60) return qsTr("Yes") + translationManager.emptyString; if(!isout && confirmationsRequired === 60) return qsTr("Yes") + translationManager.emptyString;
if(fee !== "") return fee + " XMR"; if(fee !== "") return fee + " WOW";
return "-"; return "-";
} }

@ -68,7 +68,7 @@ Rectangle {
MoneroComponents.TextPlain { MoneroComponents.TextPlain {
id: soloMainLabel id: soloMainLabel
text: qsTr("Mining with your computer helps strengthen the Monero network. The more that people mine, the harder it is for the network to be attacked, and every little bit helps.\n\nMining also gives you a small chance to earn some Monero. Your computer will create hashes looking for block solutions. If you find a block, you will get the associated reward. Good luck!") + translationManager.emptyString text: qsTr("Mining with your computer helps strengthen the Wownero network. The more that people mine, the harder it is for the network to be attacked, and every little bit helps.\n\nMining also gives you a small chance to earn some Wownero. Your computer will create hashes looking for block solutions. If you find a block, you will get the associated reward. Good luck!") + translationManager.emptyString
wrapMode: Text.Wrap wrapMode: Text.Wrap
Layout.fillWidth: true Layout.fillWidth: true
font.family: MoneroComponents.Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name

@ -102,7 +102,7 @@ Rectangle {
MoneroComponents.TextPlain { MoneroComponents.TextPlain {
text: qsTr("This page allows you to interact with the shared ring database. " + text: qsTr("This page allows you to interact with the shared ring database. " +
"This database is meant for use by Monero wallets as well as wallets from Monero clones which reuse the Monero keys.") + translationManager.emptyString "This database is meant for use by Wownero wallets as well as wallets from Wownero clones which reuse the Wownero keys.") + translationManager.emptyString
wrapMode: Text.Wrap wrapMode: Text.Wrap
Layout.fillWidth: true Layout.fillWidth: true
font.family: MoneroComponents.Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
@ -118,16 +118,16 @@ Rectangle {
onLinkActivated: { onLinkActivated: {
sharedRingDBDialog.title = qsTr("Outputs marked as spent") + translationManager.emptyString; sharedRingDBDialog.title = qsTr("Outputs marked as spent") + translationManager.emptyString;
sharedRingDBDialog.text = qsTr( sharedRingDBDialog.text = qsTr(
"In order to obscure which inputs in a Monero transaction are being spent, a third party should not be able " + "In order to obscure which inputs in a Wownero transaction are being spent, a third party should not be able " +
"to tell which inputs in a ring are already known to be spent. Being able to do so would weaken the protection " + "to tell which inputs in a ring are already known to be spent. Being able to do so would weaken the protection " +
"afforded by ring signatures. If all but one of the inputs are known to be already spent, then the input being " + "afforded by ring signatures. If all but one of the inputs are known to be already spent, then the input being " +
"actually spent becomes apparent, thereby nullifying the effect of ring signatures, one of the three main layers " + "actually spent becomes apparent, thereby nullifying the effect of ring signatures, one of the three main layers " +
"of privacy protection Monero uses.<br>" + "of privacy protection Wownero uses.<br>" +
"To help transactions avoid those inputs, a list of known spent ones can be used to avoid using them in new " + "To help transactions avoid those inputs, a list of known spent ones can be used to avoid using them in new " +
"transactions. Such a list is maintained by the Monero project and is available on the getmonero.org website, " + "transactions. Such a list is maintained by the Wownero project and is available on the wownero.org website, " +
"and you can import this list here.<br>" + "and you can import this list here.<br>" +
"Alternatively, you can scan the blockchain (and the blockchain of key-reusing Monero clones) yourself " + "Alternatively, you can scan the blockchain (and the blockchain of key-reusing Wownero clones) yourself " +
"using the monero-blockchain-mark-spent-outputs tool to create a list of known spent outputs.<br>" "using the wownero-blockchain-mark-spent-outputs tool to create a list of known spent outputs.<br>"
) + translationManager.emptyString ) + translationManager.emptyString
sharedRingDBDialog.icon = StandardIcon.Information sharedRingDBDialog.icon = StandardIcon.Information
sharedRingDBDialog.open() sharedRingDBDialog.open()
@ -255,16 +255,16 @@ Rectangle {
onLinkActivated: { onLinkActivated: {
sharedRingDBDialog.title = qsTr("Rings") + translationManager.emptyString; sharedRingDBDialog.title = qsTr("Rings") + translationManager.emptyString;
sharedRingDBDialog.text = qsTr( sharedRingDBDialog.text = qsTr(
"In order to avoid nullifying the protection afforded by Monero's ring signatures, an output should not " + "In order to avoid nullifying the protection afforded by Wownero's ring signatures, an output should not " +
"be spent with different rings on different blockchains. While this is normally not a concern, it can become one " + "be spent with different rings on different blockchains. While this is normally not a concern, it can become one " +
"when a key-reusing Monero clone allows you to spend existing outputs. In this case, you need to ensure this " + "when a key-reusing Wownero clone allows you to spend existing outputs. In this case, you need to ensure this " +
"existing outputs uses the same ring on both chains.<br>" + "existing outputs uses the same ring on both chains.<br>" +
"This will be done automatically by Monero and any key-reusing software which is not trying to actively strip " + "This will be done automatically by Wownero and any key-reusing software which is not trying to actively strip " +
"you of your privacy.<br>" + "you of your privacy.<br>" +
"If you are using a key-reusing Monero clone too, and this clone does not include this protection, you can still " + "If you are using a key-reusing Wownero clone too, and this clone does not include this protection, you can still " +
"ensure your transactions are protected by spending on the clone first, then manually adding the ring on this page, " + "ensure your transactions are protected by spending on the clone first, then manually adding the ring on this page, " +
"which allows you to then spend your Monero safely.<br>" + "which allows you to then spend your Wownero safely.<br>" +
"If you do not use a key-reusing Monero clone without these safety features, then you do not need to do anything " + "If you do not use a key-reusing Wownero clone without these safety features, then you do not need to do anything " +
"as it is all automated.<br>" "as it is all automated.<br>"
) + translationManager.emptyString ) + translationManager.emptyString
sharedRingDBDialog.icon = StandardIcon.Information sharedRingDBDialog.icon = StandardIcon.Information
@ -276,7 +276,7 @@ Rectangle {
textFormat: Text.RichText textFormat: Text.RichText
font.family: MoneroComponents.Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 font.pixelSize: 14
text: qsTr("This records rings used by outputs spent on Monero on a key reusing chain, so that the same ring may be reused to avoid privacy issues.") + translationManager.emptyString text: qsTr("This records rings used by outputs spent on Wownero on a key reusing chain, so that the same ring may be reused to avoid privacy issues.") + translationManager.emptyString
wrapMode: Text.Wrap wrapMode: Text.Wrap
Layout.fillWidth: true; Layout.fillWidth: true;
color: MoneroComponents.Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor

@ -339,7 +339,7 @@ Rectangle {
labelText: qsTr("Address") + translationManager.emptyString labelText: qsTr("Address") + translationManager.emptyString
addressValidation: true addressValidation: true
placeholderFontSize: 16 placeholderFontSize: 16
placeholderText: qsTr("Enter the Monero Address (example: 44AFFq5kSiGBoZ...)") + translationManager.emptyString placeholderText: qsTr("Enter the Wownero Address (example: WoAFFq5kSiGBoZ...)") + translationManager.emptyString
wrapMode: Text.WrapAnywhere wrapMode: Text.WrapAnywhere
text: '' text: ''
} }

@ -51,7 +51,7 @@ Rectangle {
color: "transparent" color: "transparent"
property alias transferHeight1: pageRoot.height property alias transferHeight1: pageRoot.height
property alias transferHeight2: advancedLayout.height property alias transferHeight2: advancedLayout.height
property int mixin: 10 // (ring size 11) property int mixin: 21 // (ring size 22)
property string warningContent: "" property string warningContent: ""
property string sendButtonWarning: { property string sendButtonWarning: {
// Currently opened wallet is not view-only // Currently opened wallet is not view-only
@ -159,7 +159,7 @@ Rectangle {
visible: leftPanel.minutesToUnlock !== "" visible: leftPanel.minutesToUnlock !== ""
MoneroComponents.WarningBox { MoneroComponents.WarningBox {
text: qsTr("Spendable funds: %1 XMR. Please wait ~%2 minutes for your whole balance to become spendable.").arg(leftPanel.balanceUnlockedString).arg(leftPanel.minutesToUnlock) text: qsTr("Spendable funds: %1 WOW. Please wait ~%2 minutes for your whole balance to become spendable.").arg(leftPanel.balanceUnlockedString).arg(leftPanel.minutesToUnlock)
} }
} }
@ -177,7 +177,7 @@ Rectangle {
labelButtonText: qsTr("Resolve") + translationManager.emptyString labelButtonText: qsTr("Resolve") + translationManager.emptyString
placeholderText: { placeholderText: {
if(persistentSettings.nettype == NetworkType.MAINNET){ if(persistentSettings.nettype == NetworkType.MAINNET){
return "4.. / 8.. / OpenAlias"; return "Wo.. / WW.. / OpenAlias";
} else if (persistentSettings.nettype == NetworkType.STAGENET){ } else if (persistentSettings.nettype == NetworkType.STAGENET){
return "5.. / 7.."; return "5.. / 7..";
} else if(persistentSettings.nettype == NetworkType.TESTNET){ } else if(persistentSettings.nettype == NetworkType.TESTNET){
@ -773,7 +773,7 @@ Rectangle {
root.warningContent = messageNotConnected; root.warningContent = messageNotConnected;
break break
case Wallet.ConnectionStatus_WrongVersion: case Wallet.ConnectionStatus_WrongVersion:
root.warningContent = qsTr("Connected daemon is not compatible with GUI. \n" + root.warningContent = qsTr("Connected daemon is not compatible with App. \n" +
"Please upgrade or connect to another daemon") "Please upgrade or connect to another daemon")
break break
default: default:

@ -449,7 +449,7 @@ Item {
font.pixelSize: 14 font.pixelSize: 14
font.bold: false font.bold: false
color: "white" color: "white"
text: qsTr("Amount to receive") + " (XMR)" + translationManager.emptyString text: qsTr("Amount to receive") + " (WOW)" + translationManager.emptyString
themeTransition: false themeTransition: false
} }

@ -67,7 +67,7 @@ Rectangle {
MoneroComponents.TextBlock { MoneroComponents.TextBlock {
font.pixelSize: 14 font.pixelSize: 14
text: qsTr("GUI version: ") + translationManager.emptyString text: qsTr("App version: ") + translationManager.emptyString
} }
MoneroComponents.TextBlock { MoneroComponents.TextBlock {
@ -97,7 +97,7 @@ Rectangle {
MoneroComponents.TextBlock { MoneroComponents.TextBlock {
id: guiMoneroVersion id: guiMoneroVersion
font.pixelSize: 14 font.pixelSize: 14
text: qsTr("Embedded Monero version: ") + translationManager.emptyString text: qsTr("Embedded Wownero version: ") + translationManager.emptyString
} }
MoneroComponents.TextBlock { MoneroComponents.TextBlock {
@ -388,7 +388,7 @@ Rectangle {
onClicked: { onClicked: {
var data = ""; var data = "";
data += "GUI version: " + Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")"; data += "GUI version: " + Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")";
data += "\nEmbedded Monero version: " + Version.GUI_MONERO_VERSION; data += "\nEmbedded Wownero version: " + Version.GUI_MONERO_VERSION;
data += "\nWallet path: " + walletLocation.walletPath; data += "\nWallet path: " + walletLocation.walletPath;
data += "\nWallet creation height: "; data += "\nWallet creation height: ";

@ -256,11 +256,11 @@ Rectangle {
ListModel { ListModel {
id: fiatPriceCurrencyModel id: fiatPriceCurrencyModel
ListElement { ListElement {
data: "xmrusd" data: "wowusd"
column1: "USD" column1: "USD"
} }
ListElement { ListElement {
data: "xmreur" data: "woweur"
column1: "EUR" column1: "EUR"
} }
} }

@ -220,7 +220,7 @@ Rectangle{
wrapMode: Text.WordWrap; wrapMode: Text.WordWrap;
leftPadding: 0 leftPadding: 0
topPadding: 0 topPadding: 0
text: qsTr("Uses a third-party server to connect to the Monero network. Less secure, but easier on your computer.") + translationManager.emptyString text: qsTr("Uses a third-party server to connect to the Wownero network. Less secure, but easier on your computer.") + translationManager.emptyString
width: parent.width - (remoteNodeIcon.width + remoteNodeIcon.anchors.leftMargin + anchors.leftMargin) width: parent.width - (remoteNodeIcon.width + remoteNodeIcon.anchors.leftMargin + anchors.leftMargin)
} }
@ -257,7 +257,7 @@ Rectangle{
MoneroComponents.WarningBox { MoneroComponents.WarningBox {
Layout.topMargin: 26 Layout.topMargin: 26
Layout.bottomMargin: 6 Layout.bottomMargin: 6
text: qsTr("To find a remote node, type 'Monero remote node' into your favorite search engine. Please ensure the node is run by a trusted third-party.") + translationManager.emptyString text: qsTr("To find a remote node, ask on IRC #Wownero.") + translationManager.emptyString
} }
MoneroComponents.RemoteNodeEdit { MoneroComponents.RemoteNodeEdit {

@ -18,16 +18,16 @@
<string>????</string> <string>????</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>monero-wallet-gui</string> <string>wownero-app</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>Monero GUI</string> <string>Wownero App</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>Copyright © 2014-2020 The Monero Project</string> <string>Copyright © 2014-2020 The Monero Project</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.monero-project.monero-wallet-gui</string> <string>org.wownero.wownero-app</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>@VERSION_LONG@</string> <string>@VERSION_LONG@</string>
@ -45,10 +45,10 @@
<array> <array>
<dict> <dict>
<key>CFBundleURLName</key> <key>CFBundleURLName</key>
<string>monero Handler</string> <string>wownero Handler</string>
<key>CFBundleURLSchemes</key> <key>CFBundleURLSchemes</key>
<array> <array>
<string>monero</string> <string>wownero</string>
</array> </array>
</dict> </dict>
<dict> <dict>

@ -121,7 +121,7 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const
arguments << "--max-concurrency" << QString::number(concurrency); arguments << "--max-concurrency" << QString::number(concurrency);
} }
qDebug() << "starting monerod " + m_monerod; qDebug() << "starting wownerod " + m_monerod;
qDebug() << "With command line arguments " << arguments; qDebug() << "With command line arguments " << arguments;
QMutexLocker locker(&m_daemonMutex); QMutexLocker locker(&m_daemonMutex);
@ -202,9 +202,9 @@ bool DaemonManager::stopWatcher(NetworkType::Type nettype) const
if(counter >= 5) { if(counter >= 5) {
qDebug() << "Killing it! "; qDebug() << "Killing it! ";
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QProcess::execute("taskkill", {"/F", "/IM", "monerod.exe"}); QProcess::execute("taskkill", {"/F", "/IM", "wownerod.exe"});
#else #else
QProcess::execute("pkill", {"monerod"}); QProcess::execute("pkill", {"wownerod"});
#endif #endif
} }
@ -322,9 +322,9 @@ QVariantMap DaemonManager::validateDataDir(const QString &dataDir) const
valid = false; valid = false;
} }
// Make sure there is 75GB storage available // Make sure there is 5GB storage available
storageAvailable = storage.bytesAvailable()/1000/1000/1000; storageAvailable = storage.bytesAvailable()/1000/1000/1000;
if (storageAvailable < 75) { if (storageAvailable < 5) {
valid = false; valid = false;
} }
} else { } else {
@ -352,9 +352,9 @@ DaemonManager::DaemonManager(QObject *parent)
// Platform depetent path to monerod // Platform depetent path to monerod
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
m_monerod = QApplication::applicationDirPath() + "/monerod.exe"; m_monerod = QApplication::applicationDirPath() + "/wownerod.exe";
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
m_monerod = QApplication::applicationDirPath() + "/monerod"; m_monerod = QApplication::applicationDirPath() + "/wownerod";
#endif #endif
if (m_monerod.length() == 0) { if (m_monerod.length() == 0) {

@ -854,7 +854,7 @@ void Wallet::setWalletCreationHeight(quint64 height)
QString Wallet::getDaemonLogPath() const QString Wallet::getDaemonLogPath() const
{ {
return QString::fromStdString(m_walletImpl->getDefaultDataDir()) + "/bitmonero.log"; return QString::fromStdString(m_walletImpl->getDefaultDataDir()) + "/wownero.log";
} }
bool Wallet::blackballOutput(const QString &amount, const QString &offset) bool Wallet::blackballOutput(const QString &amount, const QString &offset)

@ -38,15 +38,15 @@
#include "wallet/api/wallet2_api.h" #include "wallet/api/wallet2_api.h"
// default log path by OS (should be writable) // default log path by OS (should be writable)
static const QString defaultLogName = "monero-wallet-gui.log"; static const QString defaultLogName = "wownero-app.log";
#if defined(Q_OS_IOS) #if defined(Q_OS_IOS)
//AppDataLocation = "<APPROOT>/Library/Application Support" //AppDataLocation = "<APPROOT>/Library/Application Support"
static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).at(0); static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).at(0);
static const QString appFolder = "monero-wallet-gui"; static const QString appFolder = "wownero-app";
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
//AppDataLocation = "C:/Users/<USER>/AppData/Roaming/<APPNAME>" //AppDataLocation = "C:/Users/<USER>/AppData/Roaming/<APPNAME>"
static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).at(0); static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).at(0);
static const QString appFolder = "monero-wallet-gui"; static const QString appFolder = "wownero-app";
#elif defined(Q_OS_ANDROID) #elif defined(Q_OS_ANDROID)
//AppDataLocation = "<USER>/<APPNAME>/files" //AppDataLocation = "<USER>/<APPNAME>/files"
static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).at(1); static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).at(1);
@ -58,7 +58,7 @@ static const QString defaultLogName = "monero-wallet-gui.log";
#else // linux + bsd #else // linux + bsd
//HomeLocation = "~" //HomeLocation = "~"
static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0); static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0);
static const QString appFolder = ".bitmonero"; static const QString appFolder = ".wownero";
#endif #endif

@ -179,9 +179,9 @@ int main(int argc, char *argv[])
MainApp app(argc, argv); MainApp app(argc, argv);
app.setApplicationName("monero-core"); app.setApplicationName("wownero-app");
app.setOrganizationDomain("getmonero.org"); app.setOrganizationDomain("wownero.org");
app.setOrganizationName("monero-project"); app.setOrganizationName("wownero-project");
// Ask to enable Tails OS persistence mode, it affects: // Ask to enable Tails OS persistence mode, it affects:
// - Log file location // - Log file location
@ -203,9 +203,9 @@ int main(int argc, char *argv[])
#endif #endif
if(isTails && TailsOS::usePersistence){ if(isTails && TailsOS::usePersistence){
moneroAccountsDir = QDir::homePath() + "/Persistent/Monero/wallets"; moneroAccountsDir = QDir::homePath() + "/Persistent/Wownero/wallets";
} else if (!moneroAccountsRootDir.empty()) { } else if (!moneroAccountsRootDir.empty()) {
moneroAccountsDir = moneroAccountsRootDir.at(0) + "/Monero/wallets"; moneroAccountsDir = moneroAccountsRootDir.at(0) + "/Wownero/wallets";
} else { } else {
qCritical() << "Error: accounts root directory could not be set"; qCritical() << "Error: accounts root directory could not be set";
return 1; return 1;
@ -245,7 +245,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
// Log settings // Log settings
const QString logPath = QDir::toNativeSeparators(getLogPath(parser.value(logPathOption))); const QString logPath = QDir::toNativeSeparators(getLogPath(parser.value(logPathOption)));
Monero::Wallet::init(argv[0], "monero-wallet-gui", logPath.toStdString().c_str(), true); Monero::Wallet::init(argv[0], "wownero-wallet-gui", logPath.toStdString().c_str(), true);
qInstallMessageHandler(messageHandler); qInstallMessageHandler(messageHandler);
// loglevel is configured in main.qml. Anything lower than // loglevel is configured in main.qml. Anything lower than
@ -328,7 +328,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
} }
} }
qWarning().nospace().noquote() << "Qt:" << QT_VERSION_STR << " GUI:" << GUI_VERSION qWarning().nospace().noquote() << "Qt:" << QT_VERSION_STR << " App:" << GUI_VERSION
<< " | screen: " << rect.width() << "x" << rect.height() << " | screen: " << rect.width() << "x" << rect.height()
<< " - dpi: " << dpi << " - ratio:" << calculated_ratio; << " - dpi: " << dpi << " - ratio:" << calculated_ratio;
@ -463,7 +463,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
if (accountName.isEmpty()) if (accountName.isEmpty())
accountName = qgetenv("USERNAME"); // Windows accountName = qgetenv("USERNAME"); // Windows
if (accountName.isEmpty()) if (accountName.isEmpty())
accountName = "My monero Account"; accountName = "My wownero Account";
engine.rootContext()->setContextProperty("defaultAccountName", accountName); engine.rootContext()->setContextProperty("defaultAccountName", accountName);
engine.rootContext()->setContextProperty("homePath", QDir::homePath()); engine.rootContext()->setContextProperty("homePath", QDir::homePath());

@ -107,7 +107,7 @@ QVariant TransactionHistoryModel::parseTransactionInfo(const TransactionInfo &tI
case TransactionConfirmationsRole: case TransactionConfirmationsRole:
return tInfo.confirmations(); return tInfo.confirmations();
case TransactionConfirmationsRequiredRole: case TransactionConfirmationsRequiredRole:
return (tInfo.blockHeight() < tInfo.unlockTime()) ? tInfo.unlockTime() - tInfo.blockHeight() : 10; return (tInfo.blockHeight() < tInfo.unlockTime()) ? tInfo.unlockTime() - tInfo.blockHeight() : 4;
case TransactionHashRole: case TransactionHashRole:
return tInfo.hash(); return tInfo.hash();
case TransactionTimeStampRole: case TransactionTimeStampRole:

@ -43,9 +43,9 @@ void TailsOS::showDataPersistenceDisabledWarning()
msgBox.setText(QObject::tr("Warning: persistence disabled")); msgBox.setText(QObject::tr("Warning: persistence disabled"));
msgBox.setWindowTitle(QObject::tr("Warning: persistence disabled")); msgBox.setWindowTitle(QObject::tr("Warning: persistence disabled"));
msgBox.setInformativeText( msgBox.setInformativeText(
QObject::tr("Monero GUI has detected that Tails persistence is " QObject::tr("Wownero App has detected that Tails persistence is "
"currently disabled. Any configurations you make inside " "currently disabled. Any configurations you make inside "
"the Monero GUI will not be saved." "the Wownero App will not be saved."
"\n\n" "\n\n"
"In addition, make sure to not save your wallet on the " "In addition, make sure to not save your wallet on the "
"filesystem, as it will be lost at shutdown." "filesystem, as it will be lost at shutdown."
@ -63,7 +63,7 @@ void TailsOS::showDataPersistenceDisabledWarning()
void TailsOS::askPersistence() void TailsOS::askPersistence()
{ {
QMessageBox msgBox; QMessageBox msgBox;
msgBox.setWindowTitle(QObject::tr("Monero GUI")); msgBox.setWindowTitle(QObject::tr("Wownero App"));
msgBox.setText(QObject::tr("Use Tails persistence?")); msgBox.setText(QObject::tr("Use Tails persistence?"));
msgBox.setInformativeText( msgBox.setInformativeText(
QObject::tr("Persist wallet files and configuration on the encrypted volume?" QObject::tr("Persist wallet files and configuration on the encrypted volume?"

@ -83,7 +83,7 @@ QString getAccountName(){
if (accountName.isEmpty()) if (accountName.isEmpty())
accountName = qgetenv("USERNAME"); // Windows accountName = qgetenv("USERNAME"); // Windows
if (accountName.isEmpty()) if (accountName.isEmpty())
accountName = "My monero Account"; accountName = "My wownero Account";
return accountName; return accountName;
} }
@ -91,11 +91,11 @@ QString getAccountName(){
QString xdgMime(QApplication &app){ QString xdgMime(QApplication &app){
return QString( return QString(
"[Desktop Entry]\n" "[Desktop Entry]\n"
"Name=Monero GUI\n" "Name=Wownero App\n"
"GenericName=Monero-GUI\n" "GenericName=Wownero App\n"
"X-GNOME-FullName=Monero-GUI\n" "X-GNOME-FullName=Wownero-App\n"
"Comment=Monero GUI\n" "Comment=Wownero App\n"
"Keywords=Monero;\n" "Keywords=Wownero;\n"
"Exec=%1 %u\n" "Exec=%1 %u\n"
"Terminal=false\n" "Terminal=false\n"
"Type=Application\n" "Type=Application\n"
@ -116,7 +116,7 @@ void registerXdgMime(QApplication &app){
// - Tails written to persistent dotfiles // - Tails written to persistent dotfiles
QString mime = xdgMime(app); QString mime = xdgMime(app);
QString appPath = QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation); QString appPath = QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation);
QString filePath = QString("%1/monero-gui.desktop").arg(appPath); QString filePath = QString("%1/wownero-app.desktop").arg(appPath);
if (TailsOS::detect() && TailsOS::detectDotPersistence() && TailsOS::usePersistence) { if (TailsOS::detect() && TailsOS::detectDotPersistence() && TailsOS::usePersistence) {
TailsOS::persistXdgMime(filePath, mime); TailsOS::persistXdgMime(filePath, mime);

@ -2,4 +2,4 @@
set QMLSCENE_DEVICE=softwarecontext set QMLSCENE_DEVICE=softwarecontext
start /b monero-wallet-gui.exe start /b wownero-app.exe

@ -0,0 +1,2 @@
var GUI_VERSION = "v0.7.0.0"
var GUI_MONERO_VERSION = "v0.7.0.0"

@ -57,7 +57,7 @@ Rectangle {
WizardHeader { WizardHeader {
title: qsTr("Daemon settings") + translationManager.emptyString title: qsTr("Daemon settings") + translationManager.emptyString
subtitle: qsTr("To be able to communicate with the Monero network your wallet needs to be connected to a Monero node. For best privacy it's recommended to run your own node.") + translationManager.emptyString subtitle: qsTr("To be able to communicate with the Wownero network your wallet needs to be connected to a Wownero node. For best privacy it's recommended to run your own node.") + translationManager.emptyString
} }
WizardDaemonSettings { WizardDaemonSettings {

@ -58,13 +58,13 @@ Rectangle {
WizardHeader { WizardHeader {
Layout.bottomMargin: 20 Layout.bottomMargin: 20
title: qsTr("Welcome to Monero") + translationManager.emptyString title: qsTr("Welcome to Wownero") + translationManager.emptyString
subtitle: "" subtitle: ""
} }
WizardMenuItem { WizardMenuItem {
headerText: qsTr("Create a new wallet") + translationManager.emptyString headerText: qsTr("Create a new wallet") + translationManager.emptyString
bodyText: qsTr("Choose this option if this is your first time using Monero.") + translationManager.emptyString bodyText: qsTr("Choose this option if this is your first time using Wownero.") + translationManager.emptyString
imageIcon: "qrc:///images/create-wallet.png" imageIcon: "qrc:///images/create-wallet.png"
onMenuClicked: { onMenuClicked: {
@ -85,7 +85,7 @@ Rectangle {
WizardMenuItem { WizardMenuItem {
headerText: qsTr("Create a new wallet from hardware") + translationManager.emptyString headerText: qsTr("Create a new wallet from hardware") + translationManager.emptyString
bodyText: qsTr("Connect your hardware wallet to create a new Monero wallet.") + translationManager.emptyString bodyText: qsTr("Connect your hardware wallet to create a new Wownero wallet.") + translationManager.emptyString
imageIcon: "qrc:///images/restore-wallet-from-hardware.png" imageIcon: "qrc:///images/restore-wallet-from-hardware.png"
onMenuClicked: { onMenuClicked: {

@ -0,0 +1,233 @@
// Copyright (c) 2014-2019, The Monero Project
//
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
// permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice, this list of
// conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
// of conditions and the following disclaimer in the documentation and/or other
// materials provided with the distribution.
//
// 3. Neither the name of the copyright holder nor the names of its contributors may be
// used to endorse or promote products derived from this software without specific
// prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.9
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick.XmlListModel 2.0
import QtQuick.Controls 2.0
import "../js/Wizard.js" as Wizard
import "../components" as MoneroComponents
import "../components/effects/" as MoneroEffects
Rectangle {
id: langScreen
color: "transparent"
anchors.fill: parent
property int layoutScale: {
if(appWindow.width < 800){
return 1;
} else {
return 2;
}
}
MoneroEffects.GradientBackground {
anchors.fill: parent
fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor
initialStartColor: MoneroComponents.Style.wizardBackgroundGradientStart
initialStopColor: MoneroComponents.Style.middlePanelBackgroundGradientStop
blackColorStart: MoneroComponents.Style._b_wizardBackgroundGradientStart
blackColorStop: MoneroComponents.Style._b_middlePanelBackgroundGradientStop
whiteColorStart: MoneroComponents.Style._w_wizardBackgroundGradientStart
whiteColorStop: MoneroComponents.Style._w_middlePanelBackgroundGradientStop
start: Qt.point(0, 0)
end: Qt.point(height, width)
}
ColumnLayout {
anchors.top: parent.top
anchors.topMargin: persistentSettings.customDecorations ? 65 : 15
width: parent.width - 100
anchors.horizontalCenter: parent.horizontalCenter;
Text {
text: qsTr("Language settings") + translationManager.emptyString
Layout.fillWidth: true
font.family: MoneroComponents.Style.fontRegular.name
color: MoneroComponents.Style.defaultFontColor
font.pixelSize: {
if(langScreen.layoutScale === 2 ){
return 34;
} else {
return 28;
}
}
wrapMode: Text.WordWrap
leftPadding: 0
topPadding: 0
bottomPadding: 0
}
Text {
Layout.fillWidth: true
visible: parent.subtitle !== ""
color: MoneroComponents.Style.dimmedFontColor
text: qsTr("Change the language of the Wownero App.") + translationManager.emptyString
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: {
if(langScreen.layoutScale === 2 ){
return 16;
} else {
return 14;
}
}
wrapMode: Text.WordWrap
leftPadding: 0
topPadding: 0
}
Flow {
id: flow
height: 800
Layout.fillWidth: true
Layout.topMargin: 20
spacing: 5
Repeater {
model: langModel
delegate: Rectangle {
id: item
color: "transparent"
width: {
var minimumWidth = img.width + langRect.width;
if(minimumWidth < 200) return 200;
return minimumWidth;
}
height: 48
Rectangle {
id: img
anchors.top: parent.top
color: "transparent"
width: 32
height: parent.height
Image {
source: flag
mipmap: true
smooth: true
width: 32
height: 32
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
}
Rectangle {
id: langRect
anchors.top: parent.top
anchors.left: img.right
color: "transparent"
height: parent.height
width: langText.width + 22
MoneroComponents.TextPlain {
id: langText
font.bold: true
font.pixelSize: 14
color: MoneroComponents.Style.defaultFontColor
text: display_name
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
}
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
var locale_spl = locale.split("_");
// reload active translations
console.log(locale_spl[0]);
translationManager.setLanguage(locale_spl[0]);
// set wizard language settings
wizard.language_locale = locale;
wizard.language_wallet = wallet_language;
wizard.language_language = display_name;
appWindow.showStatusMessage(qsTr("Language changed."), 3);
appWindow.toggleLanguageView();
}
hoverEnabled: true
onEntered: {
parent.opacity = 0.75
}
onExited: {
parent.opacity = 1
}
}
}
}
}
RowLayout {
Layout.fillWidth: true
Layout.topMargin: 32
spacing: 20
MoneroComponents.StandardButton {
small: true
text: qsTr("Close") + translationManager.emptyString
onClicked: {
appWindow.toggleLanguageView();
}
}
}
XmlListModel {
id: langModel
source: "/lang/languages.xml"
query: "/languages/language"
XmlRole { name: "display_name"; query: "@display_name/string()" }
XmlRole { name: "locale"; query: "@locale/string()" }
XmlRole { name: "wallet_language"; query: "@wallet_language/string()" }
XmlRole { name: "flag"; query: "@flag/string()" }
// TODO: XmlListModel is read only, we should store current language somewhere else
// and set current language accordingly
XmlRole { name: "isCurrent"; query: "@enabled/string()" }
onStatusChanged: {
if(status === XmlListModel.Ready){
console.log("languages available: ",count);
}
}
}
}
}

@ -81,7 +81,7 @@ Rectangle {
} }
MoneroComponents.TextPlain { MoneroComponents.TextPlain {
text: qsTr("Temporary use of remote nodes is useful in order to use Monero immediately (hence the name bootstrap), however be aware that when using remote nodes (including with the bootstrap setting), nodes could track your IP address, track your \"restore height\" and associated block request data, and send you inaccurate information to learn more about transactions you make.") + translationManager.emptyString text: qsTr("Temporary use of remote nodes is useful in order to use Wownero immediately (hence the name bootstrap), however be aware that when using remote nodes (including with the bootstrap setting), nodes could track your IP address, track your \"restore height\" and associated block request data, and send you inaccurate information to learn more about transactions you make.") + translationManager.emptyString
wrapMode: Text.Wrap wrapMode: Text.Wrap
Layout.topMargin: 8 Layout.topMargin: 8
Layout.fillWidth: true Layout.fillWidth: true

@ -69,7 +69,7 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
MoneroComponents.TextPlain { MoneroComponents.TextPlain {
text: qsTr("This mode is ideal for managing small amounts of Monero. You have access to basic features for making and managing transactions. It will automatically connect to the Monero network so you can start using Monero immediately.") + translationManager.emptyString text: qsTr("This mode is ideal for managing small amounts of Wownero. You have access to basic features for making and managing transactions. It will automatically connect to the Wownero network so you can start using Wownero immediately.") + translationManager.emptyString
themeTransitionBlackColor: MoneroComponents.Style._b_lightGreyFontColor themeTransitionBlackColor: MoneroComponents.Style._b_lightGreyFontColor
themeTransitionWhiteColor: MoneroComponents.Style._w_lightGreyFontColor themeTransitionWhiteColor: MoneroComponents.Style._w_lightGreyFontColor
wrapMode: Text.Wrap wrapMode: Text.Wrap

@ -65,7 +65,7 @@ Rectangle {
WizardHeader { WizardHeader {
title: qsTr("Daemon settings") + translationManager.emptyString title: qsTr("Daemon settings") + translationManager.emptyString
subtitle: qsTr("To be able to communicate with the Monero network your wallet needs to be connected to a Monero node. For best privacy it's recommended to run your own node.\n\nIf you don't have the option to run your own node, there's an option to connect to a remote node.") + translationManager.emptyString subtitle: qsTr("To be able to communicate with the Wownero network your wallet needs to be connected to a Wownero node. For best privacy it's recommended to run your own node.\n\nIf you don't have the option to run your own node, there's an option to connect to a remote node.") + translationManager.emptyString
} }
WizardDaemonSettings { WizardDaemonSettings {

@ -0,0 +1 @@
Subproject commit 4c6c7ab87b2a56165f400f6e49f17b9577a2bcad

@ -7,7 +7,7 @@ TEMPLATE = app
QT += svg qml gui-private quick widgets QT += svg qml gui-private quick widgets
WALLET_ROOT=$$PWD/monero WALLET_ROOT=$$PWD/wownero
CONFIG += c++11 link_pkgconfig CONFIG += c++11 link_pkgconfig
packagesExist(libusb-1.0) { packagesExist(libusb-1.0) {