Merge pull request #1 from devhyper/i2p-integration

I2p integration
This commit is contained in:
preland 2024-01-20 18:31:00 -06:00 committed by GitHub
commit c46e236988
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 489 additions and 0 deletions

3
.gitmodules vendored
View file

@ -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

View file

@ -6,3 +6,6 @@ add_library(quirc STATIC
)
set_target_properties(quirc PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_include_directories(quirc PUBLIC quirc/lib)
option(WITH_BINARY "" OFF)
add_subdirectory(i2pd/build)

1
external/i2pd vendored Submodule

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

View file

@ -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{
@ -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"
@ -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 }
}
]

View file

@ -0,0 +1,169 @@
// Copyright (c) 2014-2018, 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: false
onClicked: {
handleProtectButton.checked = true;
handleUnprotectButton.checked = false;
startI2PD();
}
}
MoneroComponents.RadioButton {
id: handleUnprotectButton
text: qsTr("Do not protect my connection") + translationManager.emptyString
fontSize: 16
enabled: !checked
checked: true
onClicked: {
handleUnprotectButton.checked = true;
handleProtectButton.checked = false;
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()
{
/*
var noSync = false;
//these args will be deleted because DaemonManager::start will re-add them later.
//removing '--tx-proxy=i2p,...' lets us blindly add '--tx-proxy i2p,...' later without risking duplication.
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 = args.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
}
}
var success = daemonManager.start(allArgs.join(" "), persistentSettings.nettype, persistentSettings.blockchainDataDir, persistentSettings.bootstrapNodeAddress, noSync, persistentSettings.pruneBlockchain)
if (success) {
*/
i2pdManager.start();
//}
}
function stopI2PD()
{
i2pdManager.stop();
}
function onI2PDStatus(isRunning)
{
}
Component.onCompleted: {
i2pdManager.i2pdStatus.connect(onI2PDStatus);
}
}

View file

@ -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/miningxmr@2x.png</file>

View file

@ -1,4 +1,5 @@
add_subdirectory(QR-Code-scanner)
add_subdirectory(i2pd)
add_subdirectory(openpgp)
add_subdirectory(zxcvbn-c)
@ -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
@ -132,6 +134,7 @@ target_link_libraries(monero-wallet-gui
easylogging
${QT5_LIBRARIES}
${EXTRA_LIBRARIES}
i2p
openpgp
qrdecoder
translations

20
src/i2pd/CMakeLists.txt Normal file
View file

@ -0,0 +1,20 @@
add_library(i2p STATIC
I2PDManager.cpp
)
find_package(ZLIB REQUIRED)
target_include_directories(i2p
PRIVATE
"../../external/i2pd/libi2pd"
"../../external/i2pd/libi2pd_client"
"../../external/i2pd/i18n"
)
target_link_libraries(i2p
PRIVATE
libi2pdclient
libi2pd
libi2pdlang
ZLIB::ZLIB
)

219
src/i2pd/I2PDManager.cpp Normal file
View file

@ -0,0 +1,219 @@
// Copyright (c) 2014-2022, 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.
#include "I2PDManager.h"
#include "../../external/i2pd/libi2pd/Config.h"
#include "../../external/i2pd/libi2pd/FS.h"
#include "../../external/i2pd/libi2pd/Base.h"
#include "../../external/i2pd/libi2pd/version.h"
#include "../../external/i2pd/libi2pd/Transports.h"
#include "../../external/i2pd/libi2pd/RouterInfo.h"
#include "../../external/i2pd/libi2pd/RouterContext.h"
#include "../../external/i2pd/libi2pd/Tunnel.h"
#include "../../external/i2pd/libi2pd/HTTP.h"
#include "../../external/i2pd/libi2pd/NetDb.hpp"
#include "../../external/i2pd/libi2pd/Garlic.h"
#include "../../external/i2pd/libi2pd/Streaming.h"
#include "../../external/i2pd/libi2pd/Destination.h"
#include "../../external/i2pd/libi2pd_client/ClientContext.h"
#include "../../external/i2pd/libi2pd/Crypto.h"
#include <vector>
#include <QApplication>
#include <QDir>
#include <QDebug>
I2PDManager::I2PDManager(QObject *parent)
: QObject(parent)
{
#ifdef Q_OS_WIN
m_i2pdDataDir = QApplication::applicationDirPath() + "/i2pd";
if (!QDir(m_i2pdDataDir).exists()) {
QDir().mkdir(m_i2pdDataDir);
}
#elif defined(Q_OS_UNIX)
m_i2pdDataDir = QApplication::applicationDirPath() + "/i2pd";
if (!QDir(m_i2pdDataDir).exists()) {
QDir().mkdir(m_i2pdDataDir);
}
#endif
if (m_i2pdDataDir.length() == 0) {
qCritical() << "I2PD not compatible with current platform";
}
std::string dataDir = "--datadir=" + m_i2pdDataDir.toStdString();
std::vector<const char*> argv({"i2pd", dataDir.data()});
init(argv.size(), (char**) argv.data());
}
I2PDManager::~I2PDManager()
{
}
void I2PDManager::init(int argc, char* argv[])
{
i2p::config::Init();
i2p::config::ParseCmdline(argc, argv);
std::string datadir;
i2p::config::GetOption("datadir", datadir);
i2p::fs::DetectDataDir(datadir, false);
i2p::fs::Init();
i2p::config::Finalize();
std::string certsdir; i2p::config::GetOption("certsdir", certsdir);
i2p::fs::SetCertsDir(certsdir);
certsdir = i2p::fs::GetCertsDir();
bool precomputation; i2p::config::GetOption("precomputation.elgamal", precomputation);
bool aesni; i2p::config::GetOption("cpuext.aesni", aesni);
bool avx; i2p::config::GetOption("cpuext.avx", avx);
bool forceCpuExt; i2p::config::GetOption("cpuext.force", forceCpuExt);
bool ssu; i2p::config::GetOption("ssu", ssu);
if (!ssu && i2p::config::IsDefault ("precomputation.elgamal"))
precomputation = false; // we don't elgamal table if no ssu, unless it's specified explicitly
i2p::crypto::InitCrypto(precomputation, aesni, avx, forceCpuExt);
i2p::transport::InitAddressFromIface(); // get address4/6 from interfaces
int netID; i2p::config::GetOption("netid", netID);
i2p::context.SetNetID(netID);
i2p::context.Init();
i2p::transport::InitTransports();
bool isFloodfill; i2p::config::GetOption("floodfill", isFloodfill);
if (isFloodfill)
{
i2p::context.SetFloodfill (true);
}
else
i2p::context.SetFloodfill (false);
bool transit; i2p::config::GetOption("notransit", transit);
i2p::context.SetAcceptsTunnels (!transit);
uint16_t transitTunnels; i2p::config::GetOption("limits.transittunnels", transitTunnels);
if (isFloodfill && i2p::config::IsDefault ("limits.transittunnels"))
transitTunnels *= 2; // double default number of transit tunnels for floodfill
i2p::tunnel::tunnels.SetMaxNumTransitTunnels (transitTunnels);
/* this section also honors 'floodfill' flag, if set above */
std::string bandwidth; i2p::config::GetOption("bandwidth", bandwidth);
if (bandwidth.length () > 0)
{
if (bandwidth[0] >= 'K' && bandwidth[0] <= 'X')
{
i2p::context.SetBandwidth (bandwidth[0]);
}
else
{
auto value = std::atoi(bandwidth.c_str());
if (value > 0)
{
i2p::context.SetBandwidth (value);
}
else
{
i2p::context.SetBandwidth (i2p::data::CAPS_FLAG_LOW_BANDWIDTH2);
}
}
}
else if (isFloodfill)
{
i2p::context.SetBandwidth (i2p::data::CAPS_FLAG_EXTRA_BANDWIDTH2);
}
else
{
i2p::context.SetBandwidth (i2p::data::CAPS_FLAG_LOW_BANDWIDTH2);
}
int shareRatio; i2p::config::GetOption("share", shareRatio);
i2p::context.SetShareRatio (shareRatio);
std::string family; i2p::config::GetOption("family", family);
i2p::context.SetFamily(family);
}
void I2PDManager::start()
{
if (!isRunning()) {
i2p::data::netdb.Start();
bool nettime; i2p::config::GetOption("nettime.enabled", nettime);
if (nettime)
{
m_NTPSync = std::unique_ptr<i2p::util::NTPTimeSync>(new i2p::util::NTPTimeSync);
m_NTPSync->Start();
}
bool ntcp2; i2p::config::GetOption("ntcp2.enabled", ntcp2);
bool ssu2; i2p::config::GetOption("ssu2.enabled", ssu2);
bool checkInReserved; i2p::config::GetOption("reservedrange", checkInReserved);
i2p::transport::transports.SetCheckReserved(checkInReserved);
i2p::transport::transports.Start(ntcp2, ssu2);
if (!(i2p::transport::transports.IsBoundSSU2() || i2p::transport::transports.IsBoundNTCP2()))
{
i2p::transport::transports.Stop();
i2p::data::netdb.Stop();
return;
}
i2p::tunnel::tunnels.Start();
i2p::context.Start();
i2p::client::context.Start();
}
}
void I2PDManager::stop()
{
if (isRunning()) {
i2p::client::context.Stop();
i2p::context.Stop();
i2p::tunnel::tunnels.Stop();
if (m_NTPSync)
{
m_NTPSync->Stop ();
m_NTPSync = nullptr;
}
i2p::transport::transports.Stop();
i2p::data::netdb.Stop();
i2p::crypto::TerminateCrypto();
}
}
bool I2PDManager::isRunning() const
{
//return m_isRunning;
return false;
}

55
src/i2pd/I2PDManager.h Normal file
View file

@ -0,0 +1,55 @@
// Copyright (c) 2014-2022, 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.
#ifndef I2PDMANAGER_H
#define I2PDMANAGER_H
#include <QObject>
#include "../../external/i2pd/libi2pd/Timestamp.h"
class I2PDManager : public QObject
{
Q_OBJECT
public:
explicit I2PDManager(QObject *parent = 0);
~I2PDManager();
public:
Q_INVOKABLE void start();
Q_INVOKABLE void stop();
Q_INVOKABLE bool isRunning() const;
private:
void init(int argc, char* argv[]);
QString m_i2pdDataDir;
std::unique_ptr<i2p::util::NTPTimeSync> m_NTPSync;
bool m_isRunning;
};
#endif // I2PDMANAGER_H

View file

@ -79,6 +79,7 @@
#ifndef Q_OS_IOS
#include "daemon/DaemonManager.h"
#include "p2pool/P2PoolManager.h"
#include "i2pd/I2PDManager.h"
#endif
#if defined(Q_OS_WIN)
@ -414,6 +415,8 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
"DaemonManager can't be instantiated directly");
qmlRegisterUncreatableType<P2PoolManager>("moneroComponents.P2PoolManager", 1, 0, "P2PoolManager",
"P2PoolManager can't be instantiated directly");
qmlRegisterUncreatableType<I2PDManager>("moneroComponents.I2PDManager", 1, 0, "I2PDManager",
"I2PDManager can't be instantiated directly");
#endif
qmlRegisterUncreatableType<AddressBookModel>("moneroComponents.AddressBookModel", 1, 0, "AddressBookModel",
"AddressBookModel can't be instantiated directly");
@ -476,8 +479,10 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
#ifndef Q_OS_IOS
DaemonManager daemonManager;
P2PoolManager p2poolManager;
I2PDManager i2pdManager;
engine.rootContext()->setContextProperty("daemonManager", &daemonManager);
engine.rootContext()->setContextProperty("p2poolManager", &p2poolManager);
engine.rootContext()->setContextProperty("i2pdManager", &i2pdManager);
#endif
engine.rootContext()->setContextProperty("isWindows", isWindows);