Anonimity networks integration

Author: everoddandeven

.github/workflows/build.yml

@@ -129,6 +129,7 @@ jobs:
         path: |
           /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui
           /home/runner/work/monero-gui/monero-gui/build/release/bin/monerod
+          /home/runner/work/monero-gui/monero-gui/build/release/bin/i2pd
 
   docker-windows-static:
     runs-on: ubuntu-22.04
@@ -157,6 +158,7 @@ jobs:
         path: |
           /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monero-wallet-gui.exe
           /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monerod.exe
+          /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/i2pd.exe
 
   docker-android:
     runs-on: ubuntu-22.04

.gitmodules

@@ -5,3 +5,6 @@
 [submodule "external/quirc"]
 	path = external/quirc
 	url = https://github.com/dlbeer/quirc/
+[submodule "external/i2pd"]
+	path = external/i2pd
+	url = https://github.com/PurpleI2P/i2pd

Dockerfile.linux

@@ -13,6 +13,17 @@ RUN apt update && \
     libpng-dev libpthread-stubs0-dev libsodium-dev libtool-bin libudev-dev libusb-1.0-0-dev mesa-common-dev \
     pkg-config python wget xutils-dev
 
+RUN apt-get update -y && \
+    apt-get upgrade -y && \
+    apt-get dist-upgrade -y && \
+    apt-get install -y build-essential && \ 
+    apt-get install build-essential software-properties-common -y && \
+    add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
+    apt-get update -y && \
+    apt-get install gcc-9 g++-9 -y && \
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9 && \
+    update-alternatives --config gcc
+
 RUN git clone -b xorgproto-2020.1 --depth 1 https://gitlab.freedesktop.org/xorg/proto/xorgproto && \
     cd xorgproto && \
     git reset --hard c62e8203402cafafa5ba0357b6d1c019156c9f36 && \

Dockerfile.windows

@@ -6,7 +6,7 @@ ENV SOURCE_DATE_EPOCH=1397818193
 
 RUN apt update && \
     DEBIAN_FRONTEND=noninteractive apt install -y build-essential cmake g++-mingw-w64 gettext git libtool pkg-config \
-    python && \
+    python binutils-mingw-w64 libz-mingw-w64-dev && \
     rm -rf /var/lib/apt/lists/*
 
 RUN update-alternatives --set x86_64-w64-mingw32-g++ $(which x86_64-w64-mingw32-g++-posix) && \

components/NetworkStatusItem.qml

@@ -39,6 +39,22 @@ Rectangle {
     property var connected: Wallet.ConnectionStatus_Disconnected
 
     function getConnectionStatusString(status) {
+        switch(appWindow.i2pStartStopInProgress) {
+            case 1:
+                return qsTr("Starting I2P");
+            case 2:
+                return qsTr("Stopping I2P");
+            default:
+                break;
+        }
+        switch(appWindow.torStartStopInProgress) {
+            case 1:
+                return qsTr("Starting Tor");
+            case 2:
+                return qsTr("Stopping Tor");
+            default:
+                break;
+        }
         switch (appWindow.daemonStartStopInProgress)
         {
             case 1:
@@ -95,8 +111,12 @@ Rectangle {
                     if(appWindow.isMining) {
                        return "qrc:///images/miningxmr.png"
                     } else if(item.connected == Wallet.ConnectionStatus_Connected || !MoneroComponents.Style.blackTheme) {
+                        if (persistentSettings.proxyType === "TOR") return "qrc:///images/tor.png"
+                        else if (persistentSettings.proxyType === "I2P") return "qrc:///images/i2p.png"
                         return "qrc:///images/lightning.png"
                     } else {
+                        if (persistentSettings.proxyType === "TOR") return "qrc:///images/tor-white.png"
+                        else if (persistentSettings.proxyType === "I2P") return "qrc:///images/i2p-white.png"
                         return "qrc:///images/lightning-white.png"
                     }
                 }
@@ -198,9 +218,9 @@ Rectangle {
                             }
                         };
 
-                        daemonManager.sendCommandAsync(
-                            ["set_bootstrap_daemon", "auto"],
+                        daemonManager.setBootstrapNodeAsync(
                             appWindow.currentWallet.nettype,
+                            persistentSettings.proxyType,
                             persistentSettings.blockchainDataDir,
                             callback);
 

external/CMakeLists.txt

@@ -6,3 +6,32 @@ add_library(quirc STATIC
 )
 set_target_properties(quirc PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_include_directories(quirc PUBLIC quirc/lib)
+
+set(CMAKE_CXX_STANDARD 17)
+option(WITH_LIBRARY "" OFF)
+
+if (STATIC)
+    if (MINGW)
+        set(WITH_STATIC ON)
+        set(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
+        set(ZLIB_INCLUDE_DIR /usr/x86_64-w64-mingw32/include)
+        set(ZLIB_LIBRARY /usr/x86_64-w64-mingw32/lib/libz.a)
+    else()
+        set(Boost_USE_STATIC_RUNTIME ON)
+    endif()
+endif()
+
+add_subdirectory(i2pd/build)
+
+if(WIN32)
+    set(I2PD_BINARY ${CMAKE_BINARY_DIR}/external/i2pd/build/i2pd.exe)
+    set(I2PD_BIN ${CMAKE_BINARY_DIR}/bin/i2pd.exe)
+else()
+    set(I2PD_BINARY ${CMAKE_BINARY_DIR}/external/i2pd/build/i2pd)
+    set(I2PD_BIN ${CMAKE_BINARY_DIR}/bin/i2pd)
+endif()
+
+add_custom_target(copy_i2pd ALL
+        DEPENDS ${I2PD_BINARY}
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/bin
+    COMMAND ${CMAKE_COMMAND} -E copy ${I2PD_BINARY} ${I2PD_BIN})