Merge pull request 'Update alpha message' (#196) from tobtoht/feather:beta_warning into master

Reviewed-on: https://git.wownero.com/feather/feather/pulls/196

.drone.yml

@@ -14,9 +14,10 @@ steps:
     commands:
     - git config --global url."http://gitea:3000/tor/".insteadOf https://git.torproject.org/
     - git config --global url."http://gitea:3000/".insteadOf https://github.com/
-    - git submodule update --init --depth 120 monero
+    - git config --global url."http://gitea:3000/".insteadOf https://git.wownero.com/
-    - git submodule update --init --depth 120 --recursive monero
+    - git submodule update --init monero
-    - TOR="/usr/local/tor/bin/tor" XMRIG="/xmrig/xmrig" make -j6 release-static
+    - git submodule update --init --recursive monero
+    - TOR="/usr/local/tor/bin/tor" XMRIG="/xmrig/xmrig" make -j8 release-static
     environment:
       OPENSSL_ROOT_DIR: /usr/local/openssl/
       CMAKEFLAGS_EXTRA: -DFETCH_DEPS=Off
@@ -45,17 +46,19 @@ volumes:
     path: /build/feather_files/files/linux-release/
 
 ---
-
 kind: pipeline
 type: docker
 name: linux-release-appimage
-
 steps:
   - name: build
     image: feather:appimage
+    volumes:
+     - name: files_linux_release
+       path: /files
     commands:
     - export FN="feather-`echo $DRONE_COMMIT_AFTER | cut -c 1-7`.zip"
     - export BRANCH="$DRONE_SOURCE_BRANCH"
+    - cp /files/$BRANCH/$FN feather.zip
     - bash ./contrib/build-appimage.sh
   - name: deploy
     image: feather:appimage
@@ -69,18 +72,18 @@ steps:
     - echo "writing to $TARGET_DIR/$FN"
     - mv "Feather-1.0-x86_64.AppImage" "$TARGET_DIR/$FN"
     - echo "[*] written to https://build.featherwallet.org/files/linux-release-appimage/$DRONE_SOURCE_BRANCH/$FN"
-
 volumes:
   - name: files_linux_appimage
     host:
       path: /build/feather_files/files/linux-release-appimage/
+  - name: files_linux_release
+    host:
+      path: /build/feather_files/files/linux-release/
 
 ---
-
 kind: pipeline
 type: docker
 name: windows-mxe-release
-
 steps:
   - name: build
     image: feather:win
@@ -92,9 +95,10 @@ steps:
     commands:
     - git config --global url."http://gitea:3000/tor/".insteadOf https://git.torproject.org/
     - git config --global url."http://gitea:3000/".insteadOf https://github.com/
-    - git submodule update --init --depth 120 monero
+    - git config --global url."http://gitea:3000/".insteadOf https://git.wownero.com/
-    - git submodule update --init --depth 120 --recursive monero
+    - git submodule update --init monero
-    - PATH="/mxe/usr/bin/:$PATH" TOR="/mxe/usr/x86_64-w64-mingw32.static/bin/tor.exe" XMRIG="/xmrig/xmrig.exe" make -j6 windows-mxe-release
+    - git submodule update --init --recursive monero
+    - PATH="/mxe/usr/bin/:$PATH" TOR="/mxe/usr/x86_64-w64-mingw32.static/bin/tor.exe" XMRIG="/xmrig/xmrig.exe" make -j8 windows-mxe-release
     environment:
       CMAKEFLAGS_EXTRA: -DFETCH_DEPS=Off
   - name: deploy
@@ -111,7 +115,6 @@ steps:
     - echo "writing to $TARGET_DIR/$FN"
     - zip -j "$TARGET_DIR/$FN" build/feather.log build/bin/feather.exe
     - echo "[*] written to https://build.featherwallet.org/files/windows-mxe-release/$DRONE_SOURCE_BRANCH/$FN"
-
 volumes:
 - name: ccache_win_release
   host:
@@ -121,7 +124,6 @@ volumes:
     path: /build/feather_files/files/windows-mxe-release/
 
 ---
-
 kind: pipeline
 type: docker
 name: mac-release
@@ -134,7 +136,6 @@ steps:
       path: /files
     commands:
     - mkdir -p build
-    - scp -P22 utils/build_macos.sh administrator@steve.jobs.xmr.pm:build_macos.sh
     - ssh administrator@steve.jobs.xmr.pm "chmod +x build_macos.sh && PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin ~/build_macos.sh $DRONE_COMMIT_SHA"
     - scp -P22 administrator@steve.jobs.xmr.pm:feather.zip build/feather.zip
   - name: deploy
@@ -156,6 +157,6 @@ volumes:
     path: /build/feather_files/files/mac-release/
 ---
 kind: signature
-hmac: 527d334190a8a824b3b781a05ae4c7d87f4fa2bc37ebc53a96db91f925fa4a52
+hmac: f16a0379280e2e89987930d635ec6fb938d67732fdaf4ddc488f2a9db64bda2c
 
 ...

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "monero"]
 	path = monero
 	url = https://git.wownero.com/feather/monero.git
-[submodule "contrib/torsocks"]
-	path = contrib/torsocks
-	url = https://git.torproject.org/torsocks.git
 [submodule "contrib/tor"]
 	path = contrib/tor
 	url = https://git.torproject.org/tor.git

CMakeLists.txt

@@ -7,7 +7,7 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 set(VERSION_MAJOR "0")
 set(VERSION_MINOR "1")
 set(VERSION_REVISION "0")
-set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
+set(VERSION "beta-1")
 
 option(FETCH_DEPS "Download dependencies if they are not found" ON)
 option(XMRTO "Include Xmr.To module" ON)
@@ -31,7 +31,7 @@ if(DEBUG)
     set(CMAKE_VERBOSE_MAKEFILE ON)
 endif()
 
-set(MONERO_HEAD "2c41634c13994a8a112a1e3a61e5e0b456791a97")
+set(MONERO_HEAD "1fffb4e27a317cdfaf58c7848c143eb7fc3110d9")
 set(BUILD_GUI_DEPS ON)
 set(ARCH "x86-64")
 set(BUILD_64 ON)

Dockerfile

@@ -1,188 +1,214 @@
-FROM ubuntu:18.04
+FROM ubuntu:16.04
 
 ARG THREADS=1
+ARG QT_VERSION=5.15.2
 
-RUN apt clean && apt update
+ENV CFLAGS="-fPIC"
-RUN apt install -y gnupg
+ENV CPPFLAGS="-fPIC"
+ENV CXXFLAGS="-fPIC"
+ENV SOURCE_DATE_EPOCH=1397818193
 
-COPY utils/pubkeys/kitware.asc /kitware.asc
+RUN apt-get update
-RUN cat /kitware.asc | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
+RUN apt-get install -y nano vim ccache software-properties-common
-RUN apt install -y automake git pkg-config python wget python3.6-distutils software-properties-common
-RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && apt update
 
-ARG DEBIAN_FRONTEND=noninteractive
+RUN add-apt-repository ppa:git-core/ppa
-ENV TZ=Europe/Amsterdam
+RUN apt-get update
-RUN apt install -y build-essential nano vim aptitude ccache libusb-1.0-0-dev tzdata
 
-RUN apt install -y xutils-dev && \
+RUN apt install -y automake git pkg-config python xutils-dev && \
     git clone -b xorgproto-2020.1 --depth 1 https://gitlab.freedesktop.org/xorg/proto/xorgproto && \
     cd xorgproto && \
     git reset --hard c62e8203402cafafa5ba0357b6d1c019156c9f36 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
-RUN git clone -b xcb-proto-1.13 --depth 1 https://gitlab.freedesktop.org/xorg/proto/xcbproto && \
+RUN git clone -b 1.12 --depth 1 https://gitlab.freedesktop.org/xorg/proto/xcbproto && \
     cd xcbproto && \
-    git reset --hard 94228cde97d9aecfda04a8e699d462ba2b89e3a0 && \
+    git reset --hard 6398e42131eedddde0d98759067dde933191f049 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
 RUN apt install -y libtool-bin && \
     git clone -b libXau-1.0.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxau && \
     cd libxau && \
     git reset --hard d9443b2c57b512cfb250b35707378654d86c7dea && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh --enable-shared --disable-static && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
 RUN apt install -y libpthread-stubs0-dev && \
-    git clone -b 1.13.1 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb && \
+    git clone -b 1.12 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb && \
     cd libxcb && \
-    git reset --hard 8287ebd7b752c33b0cabc4982606fe4831106f7e && \
+    git reset --hard d34785a34f28fa6a00f8ce00d87e3132ff0f6467 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh --enable-shared --disable-static && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    make -j$THREADS clean && \
+    rm /usr/local/lib/libxcb-xinerama.so && \
+    ./autogen.sh --disable-shared --enable-static && \
+    make -j$THREADS && \
+    cp src/.libs/libxcb-xinerama.a /usr/local/lib/ && \
+    rm -rf $(pwd)
 
-RUN git clone -b 0.4.0 --depth 1 --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-util.git && \
+RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-util && \
     cd libxcb-util && \
     git reset --hard acf790d7752f36e450d476ad79807d4012ec863b && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    git submodule init && \
+    git clone --depth 1 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 && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
-RUN git clone -b xtrans-1.3.5 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxtrans.git && \
+RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-image && \
-    cd libxtrans && \
-    git reset --hard 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN git clone -b 0.4.0 --depth 1 --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-image.git && \
     cd libxcb-image && \
     git reset --hard d882052fb2ce439c6483fce944ba8f16f7294639 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    git submodule init && \
+    git clone --depth 1 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 && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
-RUN git clone -b 0.4.0 --depth 1 --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms.git && \
+RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms && \
     cd libxcb-keysyms && \
     git reset --hard 0e51ee5570a6a80bdf98770b975dfe8a57f4eeb1 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    git submodule init && \
+    git clone --depth 1 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 && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
-RUN git clone -b 0.3.9 --depth 1 --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util.git && \
+RUN git clone -b 0.3.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util && \
     cd libxcb-render-util && \
     git reset --hard 0317caf63de532fd7a0493ed6afa871a67253747 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    git submodule init && \
+    git clone --depth 1 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 && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
-RUN git clone -b 0.4.1 --depth 1 --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-wm.git && \
+RUN git clone -b 0.4.1 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-wm && \
     cd libxcb-wm && \
     git reset --hard 24eb17df2e1245885e72c9d4bbb0a0f69f0700f2 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    git submodule init && \
+    git clone --depth 1 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 && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
-RUN git clone -b libX11-1.6.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libx11 && \
+RUN apt install -y bison && \
-    cd libx11 && \
+    git clone -b xkbcommon-0.5.0 --depth 1 https://github.com/xkbcommon/libxkbcommon && \
-    git reset --hard db7cca17ad7807e92a928da9d4c68a00f4836da2 && \
+    cd libxkbcommon && \
-    ACLOCAL='aclocal -I /usr/local/share/aclocal/' CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    git reset --hard c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 && \
+    ./autogen.sh --prefix=/usr --enable-shared --disable-static --enable-x11 --disable-docs && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
-
+    rm -rf $(pwd)
-RUN git clone -b libXext-1.3.4 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxext && \
-    cd libxext && \
-    git reset --hard ebb167f34a3514783966775fb12573c4ed209625 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN apt install -y libpthread-stubs0-dev && \
-    git clone -b libXinerama-1.1.4 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxinerama.git && \
-    cd libxinerama && \
-    git reset --hard c3ab2361f13154921df2992f9eacc1ea1b3f946b && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install
 
 RUN git clone -b v1.2.11 --depth 1 https://github.com/madler/zlib && \
     cd zlib && \
     git reset --hard cacf7f1d4e3d44d871b605da3b647f07d718623f && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --static && \
+    ./configure --static && \
     make -j$THREADS && \
     make -j$THREADS install && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --static --prefix=/usr/local/zlib && \
+    ./configure --static --prefix=/usr/local/zlib && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
-RUN git clone -b VER-2-10-2 https://git.sv.nongnu.org/r/freetype/freetype2.git && \
+RUN git clone -b VER-2-10-2 --depth 1 https://git.savannah.gnu.org/git/freetype/freetype2.git && \
     cd freetype2 && \
     git reset --hard 132f19b779828b194b3fede187cee719785db4d8 && \
     ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --with-zlib=no && \
+    ./configure --disable-shared --enable-static --with-zlib=no && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
 RUN git clone -b R_2_2_9 --depth 1 https://github.com/libexpat/libexpat && \
     cd libexpat/expat && \
     git reset --hard a7bc26b69768f7fb24f0c7976fae24b157b85b13 && \
     ./buildconf.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static && \
+    ./configure --disable-shared --enable-static && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
-RUN apt install -y autopoint gettext gperf libpng-dev && \
+RUN apt install -y autopoint gettext gperf libpng12-dev && \
     git clone -b 2.13.92 --depth 1 https://gitlab.freedesktop.org/fontconfig/fontconfig && \
     cd fontconfig && \
     git reset --hard b1df1101a643ae16cdfa1d83b939de2497b1bf27 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static --sysconfdir=/etc --localstatedir=/var && \
+    ./autogen.sh --disable-shared --enable-static --sysconfdir=/etc --localstatedir=/var && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
 RUN git clone -b release-64-2 --depth 1 https://github.com/unicode-org/icu && \
     cd icu/icu4c/source && \
     git reset --hard e2d85306162d3a0691b070b4f0a73e4012433444 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-tests --disable-samples && \
+    ./configure --disable-shared --enable-static --disable-tests --disable-samples && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
 RUN apt install -y wget && \
     wget https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz && \
-    echo "9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf boost_1_73_0.tar.gz" > hashsum.txt && \
+    echo "9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf boost_1_73_0.tar.gz" | sha256sum -c && \
-    sha256sum -c hashsum.txt && \
+    tar -xzf boost_1_73_0.tar.gz && \
-    tar -xvzf boost_1_73_0.tar.gz && \
+    rm boost_1_73_0.tar.gz && \
     cd boost_1_73_0 && \
     ./bootstrap.sh && \
-    ./b2 --with-atomic --with-system --with-filesystem --with-thread --with-date_time --with-chrono --with-regex --with-serialization --with-program_options --with-locale variant=release link=static runtime-link=static cflags='-fPIC' cxxflags='-fPIC' install -a --prefix=/usr
+    ./b2 --with-atomic --with-system --with-filesystem --with-thread --with-date_time --with-chrono --with-regex --with-serialization --with-program_options --with-locale variant=release link=static runtime-link=static cflags="${CFLAGS}" cxxflags="${CXXFLAGS}" install -a --prefix=/usr && \
+    rm -rf $(pwd)
 
 RUN wget https://www.openssl.org/source/openssl-1.1.1g.tar.gz && \
-    echo "ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 openssl-1.1.1g.tar.gz" > hashsum.txt && \
+    echo "ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 openssl-1.1.1g.tar.gz" | sha256sum -c && \
-    sha256sum -c hashsum.txt && \
     tar -xzf openssl-1.1.1g.tar.gz && \
+    rm openssl-1.1.1g.tar.gz && \
     cd openssl-1.1.1g && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./config no-shared no-zlib-dynamic --prefix=/usr/local/openssl && \
+    ./config no-shared no-zlib-dynamic --prefix=/usr/local/openssl && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    ./config no-shared no-zlib-dynamic --openssldir=/usr && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
-RUN wget https://download.qt.io/archive/qt/5.15/5.15.0/single/qt-everywhere-src-5.15.0.tar.xz && \
+RUN apt install -y libgl1-mesa-dev libglib2.0-dev mesa-common-dev && \
-    echo "22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3 qt-everywhere-src-5.15.0.tar.xz"  > hashsum.txt && \
+    rm /usr/lib/x86_64-linux-gnu/libX11.a && \
-    sha256sum -c hashsum.txt && \
+    rm /usr/lib/x86_64-linux-gnu/libXext.a && \
-    tar -xf qt-everywhere-src-5.15.0.tar.xz
+    rm /usr/lib/x86_64-linux-gnu/libX11-xcb.a && \
-
+    git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
-COPY contrib/Qt5.15_LinuxPatch.json /qt-everywhere-src-5.15.0/qtbase/src/gui/configure.json
+    cd qt5 && \
-RUN apt install -y libgl1-mesa-dev libglib2.0-dev libxkbcommon-dev libxkbcommon-x11-dev
+    git clone git://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \
-
+    git clone git://code.qt.io/qt/qtimageformats.git -b ${QT_VERSION} --depth 1 && \
-RUN cd /qt-everywhere-src-5.15.0 && \
+    git clone git://code.qt.io/qt/qtmultimedia.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtsvg.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qttools.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qttranslations.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtx11extras.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtwebsockets.git -b ${QT_VERSION} --depth 1 && \
     sed -ri s/\(Libs:.*\)/\\1\ -lexpat/ /usr/local/lib/pkgconfig/fontconfig.pc && \
     sed -ri s/\(Libs:.*\)/\\1\ -lz/ /usr/local/lib/pkgconfig/freetype2.pc && \
     sed -ri s/\(Libs:.*\)/\\1\ -lXau/ /usr/local/lib/pkgconfig/xcb.pc && \
+    sed -i s/\\/usr\\/X11R6\\/lib64/\\/usr\\/local\\/lib/ qtbase/mkspecs/linux-g++-64/qmake.conf && \
     OPENSSL_LIBS="-lssl -lcrypto -lpthread -ldl" \
     ./configure --prefix=/usr -platform linux-g++-64 -opensource -confirm-license -release -static -no-avx \
-    -no-opengl -qpa xcb -openssl-linked -I /usr/local/openssl/include -L /usr/local/openssl/lib -system-freetype -fontconfig -glib \
+    -no-opengl -qpa xcb --xcb -xcb-xlib -feature-xlib -openssl-linked -I /usr/local/openssl/include \
+    -L /usr/local/openssl/lib -system-freetype -fontconfig -glib \
     -no-dbus -no-sql-sqlite -no-use-gold-linker -no-kms \
     -qt-harfbuzz -qt-libjpeg -qt-libpng -qt-pcre -qt-zlib \
     -skip qt3d -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d \
@@ -193,82 +219,101 @@ RUN cd /qt-everywhere-src-5.15.0 && \
     -skip qtwinextras -skip qtx11extras -skip gamepad -skip serialbus -skip location -skip webengine \
     -skip qtdeclarative \
     -no-feature-cups -no-feature-ftp -no-feature-pdf -no-feature-animation \
-    -nomake examples -nomake tests -nomake tools
+    -nomake examples -nomake tests -nomake tools && \
-
-RUN cd /qt-everywhere-src-5.15.0 && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
-
+    cd qttools/src/linguist/lrelease && \
-RUN cd qt-everywhere-src-5.15.0/qttools/src/linguist/lrelease && \
+    ../../../../qtbase/bin/qmake && \
-    qmake && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    cd ../../../.. && \
+    rm -rf $(pwd)
 
 RUN apt install -y libudev-dev && \
     git clone -b v1.0.23 --depth 1 https://github.com/libusb/libusb && \
     cd libusb && \
     git reset --hard e782eeb2514266f6738e242cdcb18e3ae1ed06fa && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh --disable-shared --enable-static && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
 RUN git clone -b hidapi-0.9.0 --depth 1 https://github.com/libusb/hidapi && \
     cd hidapi && \
     git reset --hard 7da5cc91fc0d2dbe4df4f08cd31f6ca1a262418f && \
     ./bootstrap && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static && \
+    ./configure --disable-shared --enable-static && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
 RUN apt install -y libsodium-dev && \
     git clone -b v4.3.2 --depth 1 https://github.com/zeromq/libzmq && \
     cd libzmq && \
     git reset --hard a84ffa12b2eb3569ced199660bac5ad128bff1f0 && \
     ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-libunwind --with-libsodium && \
+    ./configure --disable-shared --enable-static --disable-libunwind --with-libsodium && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
 RUN git clone -b libgpg-error-1.38 --depth 1 git://git.gnupg.org/libgpg-error.git && \
     cd libgpg-error && \
     git reset --hard 71d278824c5fe61865f7927a2ed1aa3115f9e439 && \
     ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-doc --disable-tests && \
+    ./configure --disable-shared --enable-static --disable-doc --disable-tests && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
 RUN git clone -b libgcrypt-1.8.5 --depth 1 git://git.gnupg.org/libgcrypt.git && \
     cd libgcrypt && \
     git reset --hard 56606331bc2a80536db9fc11ad53695126007298 && \
     ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-doc && \
+    ./configure --disable-shared --enable-static --disable-doc && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
 RUN git clone -b v3.10.0 --depth 1 https://github.com/protocolbuffers/protobuf && \
     cd protobuf && \
     git reset --hard 6d4e7fd7966c989e38024a8ea693db83758944f1 && \
     ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --enable-static --disable-shared && \
+    ./configure --enable-static --disable-shared && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
-RUN apt install -y zip cmake && git clone -b v4.0.2 --depth 1 https://github.com/fukuchi/libqrencode.git && \
+RUN git clone -b v3.18.4 --depth 1 https://github.com/Kitware/CMake && \
+    cd CMake && \
+    git reset --hard 3cc3d42aba879fff5e85b363ae8f21386a3f9f9b && \
+    ./bootstrap && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN apt install -y libusb-1.0-0-dev
+
+RUN apt install -y zip && git clone -b v4.0.2 --depth 1 https://github.com/fukuchi/libqrencode.git && \
     cd libqrencode && \
     git reset --hard 59ee597f913fcfda7a010a6e106fbee2595f68e4 && \
     cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=/usr . && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
 RUN apt install -y libmbedtls-dev && git clone -b release-2.1.12-stable --depth 1 https://github.com/libevent/libevent.git && \
     cd libevent && \
+    git reset --hard 5df3037d10556bfcb675bc73e516978b75fc7bc7 && \
     mkdir build && cd build && \
     cmake -DEVENT_LIBRARY_STATIC=ON -DOPENSSL_ROOT_DIR=/usr/local/openssl -DCMAKE_INSTALL_PREFIX=/usr/local/libevent .. && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
+    rm -rf $(pwd)
 
-RUN git clone -b tor-0.4.3.5 --depth 1 https://git.torproject.org/tor.git && \
+RUN git clone -b tor-0.4.4.6 --depth 1 https://git.torproject.org/tor.git && \
     cd tor && \
+    git reset --hard 2a8b789ea6f308d081f369d78fa7cfdc9d00bf90 && \
     bash autogen.sh && \
     LDFLAGS="-L/usr/local/openssl/lib/" LIBS="-lssl -lcrypto -lpthread -ldl" CPPFLAGS="-I/usr/local/openssl/include/" ./configure \
     --enable-static-zlib \
@@ -291,23 +336,18 @@ RUN git clone -b tor-0.4.3.5 --depth 1 https://git.torproject.org/tor.git && \
     --disable-system-torrc \
     --prefix=/usr/local/tor && \
     make -j$THREADS && \
-    make -j$THREADS install
+    make -j$THREADS install && \
-
+    rm -rf $(pwd)
-RUN git clone https://git.torproject.org/torsocks.git && \
-    cd torsocks && \
-    bash autogen.sh && \
-    ./configure --prefix=/usr/local/torsocks && \
-    make -j$THREADS && \
-    make -j$THREADS install
 
 RUN git clone https://git.wownero.com/feather/monero-seed.git && \
     cd monero-seed && \
+    git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \
     cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && \
     make -Cbuild -j$THREADS && \
-    make -Cbuild install
+    make -Cbuild install && \
+    rm -rf $(pwd)
 
 RUN apt install -y curl && \
     curl -LO "https://github.com/xmrig/xmrig/releases/download/v6.3.5/xmrig-6.3.5-linux-static-x64.tar.gz" && \
-    echo "24d4f07cf5850f00ab513b228f95769a5a5ed68d35808d98f9959b58d97985a0 xmrig-6.3.5-linux-static-x64.tar.gz" > hashsum.txt && \
+    echo "24d4f07cf5850f00ab513b228f95769a5a5ed68d35808d98f9959b58d97985a0 xmrig-6.3.5-linux-static-x64.tar.gz" | sha256sum -c && \
-    sha256sum -c hashsum.txt && \
     tar xvf xmrig-6.3.5-linux-static-x64.tar.gz --one-top-level=/xmrig --strip 1

Dockerfile_appimage

@@ -3,7 +3,7 @@ FROM ubuntu:20.04
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt clean && apt update
-RUN apt install -y golang git build-essential wget curl ngrep unzip file squashfs-tools desktop-file-utils patchelf libxkbcommon-x11-dev
+RUN apt install -y golang git build-essential wget curl ngrep unzip file squashfs-tools desktop-file-utils patchelf libxkbcommon-x11-dev libx11-xcb-dev libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render0 libxcb-render-util0 libxcb-shape0 libxcb-sync1 libxcb-xfixes0 libxcb-shm0 libxcb-keysyms1 libxcb-xkb1
 
 RUN go get github.com/probonopd/go-appimage/src/appimagetool
 RUN go build -trimpath -ldflags="-s -w" github.com/probonopd/go-appimage/src/appimagetool
@@ -15,4 +15,4 @@ RUN cd /usr/bin && \
 
 RUN cd / && \
     wget -c https://github.com/AppImage/AppImageKit/releases/download/continuous/runtime-x86_64 && \
-    chmod +x runtime-x86_64
+    chmod +x runtime-x86_64

contrib/build-appimage.sh

@@ -2,33 +2,11 @@
 
 set -e
 
-function verify_hash() {
-    local file=$1 expected_hash=$2
-    actual_hash=$(sha256sum $file | awk '{print $1}')
-    if [ "$actual_hash" == "$expected_hash" ]; then
-        return 0
-    else
-        echo "$file $actual_hash (unexpected hash)" >&2
-        rm "$file"
-        exit 1
-    fi
-}
-
-function download_if_not_exist() {
-    local file_name=$1 url=$2
-    if [ ! -e $file_name ] ; then
-        wget -q -O $file_name "$url"
-    fi
-}
-
 APPDIR="$PWD/feather.AppDir"
 mkdir -p "$APPDIR"
 mkdir -p "$APPDIR/usr/share/applications/"
 mkdir -p "$APPDIR/usr/bin"
 
-echo "Downloading dependencies"
-
-download_if_not_exist "feather.zip" "https://build.featherwallet.org/files/linux-release/$BRANCH/$FN"
 unzip -q feather.zip
 
 cp "$PWD/src/assets/feather.desktop" "$APPDIR/usr/share/applications/feather.desktop"

contrib/build_tor.sh

@@ -1,126 +0,0 @@
-#!/usr/bin/env bash
-# this file is used by feather's CMake
-# arguments: ./build.tor $TAG $ROOT_FEATHER_DIR
-
-set -ex
-
-ERR_WIN="This script does not work on Windows"
-if [[ "$OSTYPE" == "msys" ]]; then
-    echo "$ERR_WIN"
-    exit 1
-elif [[ "$OSTYPE" == "win32" ]]; then
-    echo "$ERR_WIN"
-    exit 1
-fi
-
-TOR_TAG="$1"
-ROOT_DIR="$2"
-STATIC="$3"
-TOR_DIR="$ROOT_DIR/contrib/tor"
-TORSOCKS_DIR="$ROOT_DIR/contrib/torsocks"
-TARGET_DIR="$ROOT_DIR/src/tor"
-
-CPU_CORE_COUNT="$(nproc)"
-
-#
-### tor
-#
-
-pushd "$TOR_DIR"
-
-rm -rf "$TOR_DIR/build"
-mkdir -p "$TOR_DIR/build"
-
-# configure
-git -C "$TOR_DIR" fetch
-git -C "$TOR_DIR" checkout tor-0.4.3.5
-bash "$TOR_DIR/autogen.sh"
-
-if [[ "$STATIC" = "ON" ]]; then
-    # static assumes that openssl has been compiled with:
-    #    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./config no-asm no-shared no-zlib-dynamic --prefix=/usr/local/openssl --openssldir=/usr/local/openssl
-    # and libevent with:
-    #    cmake -DEVENT_LIBRARY_STATIC=ON -DOPENSSL_ROOT_DIR=/usr/local/openssl -DCMAKE_INSTALL_PREFIX=/usr/local/libevent
-    # and zlib with:
-    #    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --static --prefix=/usr/local/zlib
-
-    LDFLAGS="-L/usr/local/openssl/lib/" LIBS="-lssl -lcrypto -lpthread -ldl" CPPFLAGS="-I/usr/local/openssl/include/" ./configure \
-    --enable-static-zlib \
-    --enable-static-openssl \
-    --enable-static-libevent \
-    --disable-system-torrc \
-    --with-libevent-dir=/usr/local/libevent \
-    --with-openssl-dir=/usr/local/openssl/ \
-    --with-zlib-dir=/usr/local/zlib \
-    --disable-system-torrc \
-    --disable-tool-name-check \
-    --disable-systemd \
-    --disable-lzma \
-    --disable-unittests \
-    --disable-zstd \
-    --disable-seccomp \
-    --disable-asciidoc \
-    --disable-manpage \
-    --disable-html-manual \
-    --disable-system-torrc \
-    --prefix="$TOR_DIR/build"
-else
-    bash "$TOR_DIR/configure" \
-    --disable-tool-name-check \
-    --disable-systemd \
-    --disable-lzma \
-    --disable-unittests \
-    --disable-zstd \
-    --disable-asciidoc \
-    --disable-manpage \
-    --disable-html-manual \
-    --prefix="$TOR_DIR/build"
-fi
-
-# build
-make -j "$CPU_CORE_COUNT"
-make install -j "$CPU_CORE_COUNT"
-
-# copy to lib/tor
-cp "$TOR_DIR/build/bin/tor" "$TARGET_DIR"
-cp "$TOR_DIR/build/etc/tor/torrc.sample"* "$TARGET_DIR"
-
-#
-### torsocks
-#
-
-pushd "$TORSOCKS_DIR"
-mkdir -p "$TORSOCKS_DIR/build"
-
-# configure
-bash "$TORSOCKS_DIR/autogen.sh"
-bash "$TORSOCKS_DIR/configure" --prefix="$TORSOCKS_DIR/build"
-
-# build
-make -j "$CPU_CORE_COUNT"
-make install -j "$CPU_CORE_COUNT"
-
-# copy to lib/torsocks
-cp "$TORSOCKS_DIR/build/lib/torsocks/"* "$TARGET_DIR"
-cp "$TORSOCKS_DIR/build/bin/"* "$TARGET_DIR"
-cp "$TORSOCKS_DIR/build/etc/tor/"* "$TARGET_DIR"
-
-#
-### verify installation
-#
-
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    for fn in "$TARGET_DIR/libtorsocks.so" "$TARGET_DIR/tor"; do
-        if [[ ! -f "$fn" ]]; then
-            echo "[*] Failed to install tor or torsocks: no such file $fn"
-            exit 1
-        fi; done
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-    for fn in "$TARGET_DIR/libtorsocks.dylib" "$TARGET_DIR/tor"; do
-        if [[ ! -f "$fn" ]]; then
-            echo "[*] Failed to install tor or torsocks: no such file $fn"
-            exit 1
-        fi; done
-fi
-
-echo "[*] Compiled tor/torsocks into $TARGET_DIR"

contrib/torsocks_macos.patch

@@ -1,53 +0,0 @@
-From fc5eafeb2886605d4de1546846f06a12a18c87ef Mon Sep 17 00:00:00 2001
-From: "J.W" <jakwings@gmail.com>
-Date: Mon, 22 Apr 2019 05:19:32 +0100
-Subject: [PATCH 1/2] Fix macros for accept4(2)
-
-Both accept(2) and accept4(2) exist on linux but accept4(2) does not
-exist on macos 10.11.6 (and maybe other distros).
----
- src/lib/torsocks.c | 9 ++++++++-
- src/lib/torsocks.h | 4 +++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c
-index 16f2da0..9527513 100644
---- a/src/lib/torsocks.c
-+++ b/src/lib/torsocks.c
-@@ -234,9 +234,16 @@ static void init_libc_symbols(void)
- 	tsocks_libc_socket = dlsym(libc_ptr, LIBC_SOCKET_NAME_STR);
- 	tsocks_libc_syscall = dlsym(libc_ptr, LIBC_SYSCALL_NAME_STR);
- 	tsocks_libc_execve = dlsym(libc_ptr, LIBC_EXECVE_NAME_STR);
-+	tsocks_libc_accept = dlsym(libc_ptr, LIBC_ACCEPT_NAME_STR);
-+#if (defined(__linux__))
- 	tsocks_libc_accept4 = dlsym(libc_ptr, LIBC_ACCEPT4_NAME_STR);
-+#endif
-+
- 	if (!tsocks_libc_connect || !tsocks_libc_close || !tsocks_libc_socket ||
--			!tsocks_libc_syscall || !tsocks_libc_execve || ! tsocks_libc_accept4) {
-+#if (defined(__linux__))
-+			!tsocks_libc_accept4 ||
-+#endif
-+			!tsocks_libc_syscall || !tsocks_libc_execve || ! tsocks_libc_accept) {
- 		ERR("Unable to lookup symbols in " LIBC_NAME "(%s)", dlerror());
- 		goto error;
- 	}
-diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h
-index 33da526..bf9109d 100644
---- a/src/lib/torsocks.h
-+++ b/src/lib/torsocks.h
-@@ -30,8 +30,10 @@
-  * libc call outside of torsocks can be used. These are declared for each
-  * symbol torsocks hijacked.
-  */
-+#define TSOCKS_LIBC_FUNC(name) \
-+	tsocks_libc_##name
- #define TSOCKS_LIBC_DECL(name, type, sig) \
--	type (*tsocks_libc_##name)(sig);
-+	type (*TSOCKS_LIBC_FUNC(name))(sig);
- #define TSOCKS_DECL(name, type, sig) \
- 	extern type tsocks_##name(sig);
- 
--- 
-2.21.0
-

src/main.cpp

@@ -14,6 +14,10 @@
 
 #include <QtPlugin>
 
+#if defined(Q_OS_WIN)
+#include <windows.h>
+#endif
+
 #if defined(Q_OS_LINUX) && defined(STATIC)
 Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
 #endif
@@ -32,6 +36,13 @@ int main(int argc, char *argv[])
     Q_INIT_RESOURCE(assets_mining);
 #endif
 
+#ifdef _WIN32
+if (AttachConsole(ATTACH_PARENT_PROCESS)) {
+    freopen("CONOUT$", "w", stdout);
+    freopen("CONOUT$", "w", stderr);
+}
+#endif
+
     QStringList argv_;
     for(int i = 0; i != argc; i++){
         argv_ << QString::fromStdString(argv[i]);

src/mainwindow.cpp

@@ -268,9 +268,9 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
     }
 
     if(config()->get(Config::warnOnAlpha).toBool()) {
-        auto alphaWarning = "Feather wallet is currently in alpha. Bugs are to be expected and "
+        QString warning = "Feather Wallet is currently in beta.\n\nPlease report any bugs "
-                            "can be reported on our Git repository or on IRC.";
+                          "you encounter on our Git repository, IRC or on /r/FeatherWallet.";
-        Utils::showMessageBox("Warning", alphaWarning, true);
+        QMessageBox::warning(this, "Beta Warning", warning);
         config()->set(Config::warnOnAlpha, false);
     }
 
@@ -406,6 +406,7 @@ void MainWindow::initMenu() {
     ui->actionClose->setShortcut(QKeySequence("Ctrl+W"));
     ui->actionShow_debug_info->setShortcut(QKeySequence("Ctrl+D"));
     ui->actionSettings->setShortcut(QKeySequence("Ctrl+Alt+S"));
+    ui->actionUpdate_balance->setShortcut(QKeySequence("Ctrl+U"));
 
     // hide/show tabs
     m_tabShowHideSignalMapper = new QSignalMapper(this);

utils/pubkeys/kitware.asc

@@ -1,64 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=0GnF
------END PGP PUBLIC KEY BLOCK-----