Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement I2P integration #4337

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 8 additions & 0 deletions external/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
file(GLOB I2PD_SOURCES "i2pd/daemon/*.cpp" "i2pd/libi2pd/*.cpp" "i2pd/libi2pd_client/*.cpp" "i2pd/i18n/*.cpp")

add_library(quirc STATIC
quirc/lib/decode.c
quirc/lib/identify.c
Expand All @@ -6,3 +8,9 @@ add_library(quirc STATIC
)
set_target_properties(quirc PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_include_directories(quirc PUBLIC quirc/lib)

add_library(i2pd STATIC
${I2PD_SOURCES}
)
set_target_properties(i2pd PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_include_directories(i2pd PUBLIC i2pd/daemon i2pd/libi2pd i2pd/libi2pd_client i2pd/i18n)
1 change: 1 addition & 0 deletions external/i2pd
Submodule i2pd added at 41dd8b
39 changes: 39 additions & 0 deletions main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,39 @@ ApplicationWindow {
// Pause refresh while starting daemon
currentWallet.pauseRefresh();

if (persistentSettings.protectConnectionMode > 0) {
var defaultArgs = ["--detach","--data-dir","--bootstrap-daemon-address","--prune-blockchain","--no-sync","--check-updates","--non-interactive","--max-concurrency","--tx-proxy=i2p,127.0.0.1:4447"]
var customDaemonArgsArray = flags.split(' ');
var flag = "";
var allArgs = [];
var i2pdArgs = ["--tx-proxy i2p,127.0.0.1:4447"];
//create an array (allArgs) of ['--arg value','--arg2','--arg3']
for (let i = 0; i < customDaemonArgsArray.length; i++) {
if(!customDaemonArgsArray[i].startsWith("--")) {
flag += " " + customDaemonArgsArray[i]
} else {
if(flag){
allArgs.push(flag)
}
flag = customDaemonArgsArray[i]
}
}
allArgs.push(flag)
//pop from allArgs if value is inside the deleteme array (defaultArgs)
allArgs = allArgs.filter( ( el ) => !defaultArgs.includes( el.split(" ")[0] ) )
//append required i2pd flags
for (let i = 0; i < i2pdArgs.length; i++) {
if(!allArgs.includes(i2pdArgs[i])) {
allArgs.push(i2pdArgs[i])
continue
}
}

flags = allArgs.join(" ");

i2pdManager.start();
}

const noSync = appWindow.walletMode === 0;
const bootstrapNodeAddress = persistentSettings.walletMode < 2 ? "auto" : persistentSettings.bootstrapNodeAddress
daemonManager.start(flags, persistentSettings.nettype, persistentSettings.blockchainDataDir, bootstrapNodeAddress, noSync, persistentSettings.pruneBlockchain);
Expand All @@ -730,6 +763,9 @@ ApplicationWindow {
if (splash) {
hideProcessingSplash();
}
if (persistentSettings.protectConnectionMode > 0) {
i2pdManager.stop();
}
callback(result);
});
}
Expand Down Expand Up @@ -1450,6 +1486,8 @@ ApplicationWindow {

property string proxyAddress: "127.0.0.1:9050"
property bool proxyEnabled: isTails

property int protectConnectionMode: 0
function getProxyAddress() {
if ((socksProxyFlagSet && socksProxyFlag == "") || !proxyEnabled) {
return "";
Expand Down Expand Up @@ -2176,6 +2214,7 @@ ApplicationWindow {
// Close wallet non async on exit
daemonManager.exit();
p2poolManager.exit();
i2pdManager.exit();
closeWallet(Qt.quit);
}

Expand Down
10 changes: 10 additions & 0 deletions pages/settings/Settings.qml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ ColumnLayout {
text: qsTr("Info") + translationManager.emptyString
onSelected: settingsStateView.state = "Info"
}
MoneroComponents.NavbarItem {
active: settingsStateView.state == "Network"
text: qsTr("Network") + translationManager.emptyString
onSelected: settingsStateView.state = "Network"
}
}

Rectangle{
Expand All @@ -92,6 +97,7 @@ ColumnLayout {
property SettingsNode settingsNodeView: SettingsNode { }
property SettingsLog settingsLogView: SettingsLog { }
property SettingsInfo settingsInfoView: SettingsInfo { }
property SettingsNetwork settingsNetworkView: SettingsNetwork { }
Layout.fillWidth: true
Layout.preferredHeight: settingsHeight
color: "transparent"
Expand Down Expand Up @@ -133,6 +139,10 @@ ColumnLayout {
name: "Info"
PropertyChanges { target: settingsStateView; currentView: settingsStateView.settingsInfoView }
PropertyChanges { target: settingsPage; settingsHeight: settingsStateView.settingsInfoView.infoHeight + 140 }
}, State {
name: "Network"
PropertyChanges { target: settingsStateView; currentView: settingsStateView.settingsNetworkView }
PropertyChanges { target: settingsPage; settingsHeight: settingsStateView.settingsNetworkView.networkHeight + 140 }
}
]

Expand Down
141 changes: 141 additions & 0 deletions pages/settings/SettingsNetwork.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
// Copyright (c) 2014-2024, 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.Layouts 1.1
import QtQuick.Controls 2.0
import QtQuick.Dialogs 1.2

import moneroComponents.I2PDManager 1.0
import moneroComponents.DaemonManager 1.0

import "../../components" as MoneroComponents

Rectangle {
color: "transparent"
Layout.fillWidth: true
property alias networkHeight: networkLayout.height

ColumnLayout {
id: networkLayout
Layout.fillWidth: true
anchors.left: parent.left
anchors.top: parent.top
anchors.right: parent.right
anchors.margins: 20
anchors.topMargin: 0
spacing: 30

MoneroComponents.Label {
id: networkTitleLabel
fontSize: 24
text: qsTr("Network traffic protection") + translationManager.emptyString
}

MoneroComponents.TextPlain {
id: networkMainLabel
text: qsTr("Your wallet communicates with a set node and other nodes on the\nMonero network. This communication can be used to identify you.\nUse the options below to protect your privacy. Please check your\nlocal laws and internet policies before protecting your connection\nusing i2p, an anonymizing software.") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.fillWidth: true
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14
color: MoneroComponents.Style.defaultFontColor
}

ColumnLayout {
id: modeButtonsColumn
Layout.topMargin: 8

MoneroComponents.RadioButton {
id: handleProtectButton
text: qsTr("Protect my network connection") + translationManager.emptyString
fontSize: 16
enabled: !checked
checked: persistentSettings.protectConnectionMode > 0
onClicked: {
handleProtectButton.checked = true;
handleUnprotectButton.checked = false;
persistentSettings.protectConnectionMode = 1;
startI2PD();
}
}

MoneroComponents.RadioButton {
id: handleUnprotectButton
text: qsTr("Do not protect my connection") + translationManager.emptyString
fontSize: 16
enabled: !checked
checked: persistentSettings.protectConnectionMode === 0
onClicked: {
handleUnprotectButton.checked = true;
handleProtectButton.checked = false;
persistentSettings.protectConnectionMode = 0;
stopI2PD();
}
}
}

RowLayout
{
MoneroComponents.Label {
id: networkProtectionStatusLabel
fontSize: 20
text: qsTr("Status: ") + translationManager.emptyString
}

MoneroComponents.Label {
id: networkProtectionStatus
fontSize: 20
text: qsTr("Unprotected") + translationManager.emptyString
}
}
}

function startI2PD()
{
appWindow.stopDaemon(function() {
appWindow.startDaemon("")
});
}

function stopI2PD()
{
appWindow.stopDaemon(function() {
appWindow.startDaemon("")
});
}

function onI2PDStatus(isRunning)
{

}

Component.onCompleted: {
//i2pdManager.i2pdStatus.connect(onI2PDStatus); // figure out a way to keep up to date on the status
}
}
2 changes: 2 additions & 0 deletions qml.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@
<file>pages/settings/SettingsLog.qml</file>
<file>pages/settings/SettingsLayout.qml</file>
<file>pages/settings/SettingsInfo.qml</file>
<file>pages/settings/SettingsNetwork.qml</file>
<file>components/WarningBox.qml</file>
<file>images/miningxmr.png</file>
<file>images/[email protected]</file>
Expand Down Expand Up @@ -222,6 +223,7 @@
<file>wizard/WizardSummaryItem.qml</file>
<file>wizard/WizardModeSelection.qml</file>
<file>wizard/WizardModeRemoteNodeWarning.qml</file>
<file>wizard/WizardProtectConnection1.qml</file>
<file>wizard/WizardModeBootstrap.qml</file>
<file>wizard/WizardMenuItem.qml</file>
<file>js/Wizard.js</file>
Expand Down
3 changes: 3 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
add_subdirectory(QR-Code-scanner)
add_subdirectory(i2pd)
add_subdirectory(openpgp)
add_subdirectory(zxcvbn-c)

Expand Down Expand Up @@ -100,6 +101,7 @@ target_include_directories(monero-wallet-gui PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/daemon
${CMAKE_CURRENT_SOURCE_DIR}/p2pool
${CMAKE_CURRENT_SOURCE_DIR}/i2pd
${CMAKE_CURRENT_SOURCE_DIR}/libwalletqt
${CMAKE_CURRENT_SOURCE_DIR}/model
${CMAKE_CURRENT_SOURCE_DIR}/QR-Code-scanner
Expand Down Expand Up @@ -132,6 +134,7 @@ target_link_libraries(monero-wallet-gui
easylogging
${QT5_LIBRARIES}
${EXTRA_LIBRARIES}
i2p
openpgp
qrdecoder
translations
Expand Down
5 changes: 5 additions & 0 deletions src/i2pd/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
add_library(i2p STATIC
I2PDManager.cpp
)
find_package(ZLIB)
target_link_libraries(i2p PRIVATE i2pd ZLIB::ZLIB)
Loading
Loading