diff --git a/CMakeLists.txt b/CMakeLists.txt index ed6cb5d..85e3f64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,9 +5,9 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}") set(THREADS_PREFER_PTHREAD_FLAG ON) set(VERSION_MAJOR "3") -set(VERSION_MINOR "1") +set(VERSION_MINOR "2") set(VERSION_REVISION "0") -set(VERSION "beta-5") +set(VERSION "beta-6") option(FETCH_DEPS "Download dependencies if they are not found" ON) option(OPENVR "Include OpenVR support") @@ -25,7 +25,7 @@ include(FindCcache) include(CheckIncludeFile) include(CheckSymbolExists) -set(WOWNERO_HEAD "ff5182f7f2825263e93e88064931597b3c6cf928") +set(WOWNERO_HEAD "cf3bba3aee00d9d3e3f902f66f3710d820d3bdfb") set(BUILD_GUI_DEPS ON) set(BUILD_64 ON CACHE BOOL "Build 64-bit binaries") set(INSTALL_VENDORED_LIBUNBOUND ${STATIC}) diff --git a/Dockerfile b/Dockerfile index 576d30b..e6bae14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,6 @@ RUN wget https://www.openssl.org/source/openssl-1.1.1i.tar.gz && \ cd openssl-1.1.1i && \ ./config no-shared no-dso --prefix=/usr/local/openssl && \ make -j$THREADS && \ - make test && \ make -j$THREADS install_sw && \ rm -rf $(pwd) @@ -66,10 +65,10 @@ RUN git clone -b tor-0.4.5.5-rc --depth 1 https://git.torproject.org/tor.git && rm -rf $(pwd) && \ strip -s -D /usr/local/tor/bin/tor -FROM ubuntu:16.04 +FROM ubuntu:18.04 ARG THREADS=1 -ARG QT_VERSION=5.15.2 +ARG QT_VERSION=v5.15.2 ENV CFLAGS="-fPIC" ENV CPPFLAGS="-fPIC" @@ -95,7 +94,7 @@ RUN apt-get update && \ # libusb libudev-dev \ # fontconfig - autopoint gettext gperf libpng12-dev \ + autopoint gettext gperf libpng-dev \ # libxcb libpthread-stubs0-dev \ # xorgproto @@ -161,7 +160,7 @@ RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb- cd libxcb-util && \ git reset --hard acf790d7752f36e450d476ad79807d4012ec863b && \ git submodule init && \ - git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ + git clone https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \ ./autogen.sh --enable-shared --disable-static && \ make -j$THREADS && \ @@ -172,7 +171,7 @@ RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb- cd libxcb-image && \ git reset --hard d882052fb2ce439c6483fce944ba8f16f7294639 && \ git submodule init && \ - git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ + git clone https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \ ./autogen.sh --enable-shared --disable-static && \ make -j$THREADS && \ @@ -183,7 +182,7 @@ RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb- cd libxcb-keysyms && \ git reset --hard 0e51ee5570a6a80bdf98770b975dfe8a57f4eeb1 && \ git submodule init && \ - git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ + git clone https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \ ./autogen.sh --enable-shared --disable-static && \ make -j$THREADS && \ @@ -194,7 +193,7 @@ RUN git clone -b 0.3.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb- cd libxcb-render-util && \ git reset --hard 0317caf63de532fd7a0493ed6afa871a67253747 && \ git submodule init && \ - git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ + git clone https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \ ./autogen.sh --enable-shared --disable-static && \ make -j$THREADS && \ @@ -205,7 +204,7 @@ RUN git clone -b 0.4.1 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb- cd libxcb-wm && \ git reset --hard 24eb17df2e1245885e72c9d4bbb0a0f69f0700f2 && \ git submodule init && \ - git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ + git clone https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \ git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \ ./autogen.sh --enable-shared --disable-static && \ make -j$THREADS && \ @@ -278,7 +277,6 @@ RUN wget https://www.openssl.org/source/openssl-1.1.1i.tar.gz && \ cd openssl-1.1.1i && \ ./config no-shared no-dso --prefix=/usr/local/openssl && \ make -j$THREADS && \ - make test && \ make -j$THREADS install_sw && \ rm -rf $(pwd) @@ -393,9 +391,9 @@ RUN git clone -b v4.0.2 --depth 1 https://github.com/fukuchi/libqrencode.git && make -j$THREADS install && \ rm -rf $(pwd) -RUN git clone https://git.wownero.com/wowlet/monero-seed.git && \ - cd monero-seed && \ - git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \ +RUN git clone https://git.wownero.com/wowlet/wownero-seed.git && \ + cd wownero-seed && \ + git reset --hard ef6910b6bb3b61757c36e2e5db0927d75f1731c8 && \ cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && \ make -Cbuild -j$THREADS && \ make -Cbuild install && \ @@ -416,4 +414,6 @@ RUN mkdir linuxdeployqt && \ ./linuxdeployqt-7-x86_64.AppImage --appimage-extract && \ rm linuxdeployqt-7-x86_64.AppImage +RUN apt-get update && \ + apt-get -o Dpkg::Options::="--force-confold" install -q -y --force-yes libcairo2-dev libxinerama-dev RUN git config --global --add safe.directory /wowlet \ No newline at end of file diff --git a/Dockerfile.windows b/Dockerfile.windows index cd67224..e642b79 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,7 +1,7 @@ FROM ubuntu:20.04 ARG THREADS=1 -ARG QT_VERSION=5.15.2 +ARG QT_VERSION=v5.15.2 ENV SOURCE_DATE_EPOCH=1397818193 ENV OPENSSL_ROOT_DIR=/usr/local/openssl/ @@ -96,7 +96,7 @@ RUN git clone -b v1.2.11 --depth 1 https://github.com/madler/zlib && \ rm -rf $(pwd) # libpng -> libqrencode -RUN git clone -b libpng16 --depth 1 https://github.com/glennrp/libpng.git && \ +RUN git clone -b libpng16 https://github.com/glennrp/libpng.git && \ cd libpng && \ git reset --hard a37d4836519517bdce6cb9d956092321eca3e73b && \ CPPFLAGS="-I/depends/x86_64-w64-mingw32/include" LDFLAGS="-L/depends/x86_64-w64-mingw32/lib" \ @@ -175,9 +175,9 @@ RUN git clone -b tor-0.4.5.7 --depth 1 https://git.torproject.org/tor.git && \ rm -rf $(pwd) && \ strip -s -D /usr/local/tor/bin/tor.exe -RUN git clone https://git.wownero.com/wowlet/monero-seed.git && \ - cd monero-seed && \ - git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \ +RUN git clone https://git.wownero.com/wowlet/wownero-seed.git && \ + cd wownero-seed && \ + git reset --hard ef6910b6bb3b61757c36e2e5db0927d75f1731c8 && \ cmake -DCMAKE_INSTALL_PREFIX=/depends/x86_64-w64-mingw32 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TOOLCHAIN_FILE=/depends/x86_64-w64-mingw32/share/toolchain.cmake -Bbuild && \ @@ -185,4 +185,5 @@ RUN git clone https://git.wownero.com/wowlet/monero-seed.git && \ make -Cbuild install && \ rm -rf $(pwd) -RUN git config --global --add safe.directory /wowlet \ No newline at end of file +RUN git config --global --add safe.directory /wowlet +RUN git config --global --add safe.directory /wowlet/wownero \ No newline at end of file diff --git a/Makefile b/Makefile index 46dc084..76b2f6b 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,7 @@ CMAKEFLAGS = \ release-static: CMAKEFLAGS += -DBUILD_TAG="linux-x64" release-static: CMAKEFLAGS += -DXMRIG=OFF +release-static: CMAKEFLAGS += -DARCH=x86-64 release-static: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF) release-static: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Release release-static: CMAKEFLAGS += -DREPRODUCIBLE=$(or ${SOURCE_DATE_EPOCH},OFF) diff --git a/src/assets/nodes.json b/src/assets/nodes.json index 2738ade..1032659 100644 --- a/src/assets/nodes.json +++ b/src/assets/nodes.json @@ -1,13 +1,35 @@ { "mainnet": { "tor": [ - "a2b6ain7ozgpxhzxkhl7vrnphrlvn4cqvibyhpcvyfbbgare6bm5m2yd.onion:18081" + "v2admi6gbeprxnk6i2oscizhgy4v5ixu6iezkhj5udiwbfjjs2w7dnid.onion:34568", + "awbibkoaa67jhuaqes4n2243gd6vtidjzqj2djukrubp2eudrmxr5mid.onion:34568", + "7ftpbpp6rbgqi5kjmhyin46essnh3eqb3m3rhfi7r2fr33iwkeuer3yd.onion:34568", + "j7rf2jcccizcp47y5moehguyuqdpg4lusk642sw4nayuruitqaqbc7ad.onion:34568", + "aje53o5z5twne5q2ljw44zkahhsuhjtwaxuburxddbf7n4pfsj4rj6qd.onion:34568", + "nepc4lxndsooj2akn7ofrj3ooqc25242obchcag6tw3f2mxrms2uuvyd.onion:34568", + "666l2ajxqjgj5lskvbokvworjysgvqag4oitokjuy7wz6juisul4jqad.onion:34568", + "ty7ppqozzodz75audgvkprekiiqsovbyrkfdjwadrkbe3etyzloatxad.onion:34568", + "ewynwpnprbgqllv2syn3drjdrqkw7ehoeg73znelm6mevvmpddexsoqd.onion:34568", + "mqkiqwmhhpqtzlrf26stv7jvtaudbyzkbg3lttkmvvvauzgtxm62tgyd.onion:34568", + "zao3w6isidntdbnyee5ufs7fyzmv7wzchpw32i3uo5eldjwmo4bxg2qd.onion:34568" ], "clearnet": [ - "wownero.fyi:34568", - "wow.pwned.systems:34568", - "de1.wownodes.com:34568", - "global.wownodes.com:34568" + "global.wownodes.com:34568", + "super.fast.node.xmr.pm:34568", + "node.wownero.club:34568", + "node.suchwow.xyz:34568", + "eu-west-1.wow.xmr.pm:34568", + "eu-west-2.wow.xmr.pm:34568", + "eu-west-3.wow.xmr.pm:34568", + "eu-west-4.wow.xmr.pm:34568", + "eu-west-5.wow.xmr.pm:34568", + "eu-west-6.wow.xmr.pm:34568", + "na-west-1.wow.xmr.pm:34568", + "much.wow.such.money:34568", + "very.wow.such.money:34568", + "169.119.33.174:34568", + "wow.bot.tips:34568", + "idontwanttogototoronto.wow.fail:34568" ] }, "stagenet": { diff --git a/wownero b/wownero index ff5182f..cf3bba3 160000 --- a/wownero +++ b/wownero @@ -1 +1 @@ -Subproject commit ff5182f7f2825263e93e88064931597b3c6cf928 +Subproject commit cf3bba3aee00d9d3e3f902f66f3710d820d3bdfb