From 029b3a5d4beb666b2886dc9d13eb2c1fbd63ce3b Mon Sep 17 00:00:00 2001 From: D33r-Gee Date: Wed, 2 Oct 2024 14:41:51 -0700 Subject: [PATCH 1/2] qml: Introduce UI Flow for Loading Snapshot - This introduce the UI flow to load a AssumeUTXO snapshot - It modifies the connection settings - Adds a SnapshotLoadSettings file, Icon, and modified progress bar. - Also it adds error page on snapshotloading failure --- bitcoin | 2 +- qml/bitcoin_qml.qrc | 7 + qml/components/ConnectionSettings.qml | 31 +++ qml/components/SnapshotLoadSettings.qml | 269 ++++++++++++++++++++ qml/controls/GreenCheckIcon.qml | 11 + qml/controls/Header.qml | 2 + qml/controls/ProgressIndicator.qml | 3 +- qml/controls/Theme.qml | 3 + qml/models/chainmodel.cpp | 39 +++ qml/models/chainmodel.h | 6 +- qml/models/nodemodel.cpp | 99 +++++++ qml/models/nodemodel.h | 43 +++- qml/pages/settings/SettingsConnection.qml | 12 + qml/pages/settings/SettingsSnapshotLoad.qml | 38 +++ qml/res/icons/circle-file.png | Bin 0 -> 1391 bytes qml/res/icons/circle-green-check.png | Bin 0 -> 1503 bytes qml/res/icons/circle-red-cross.png | Bin 0 -> 2406 bytes qml/res/icons/green-check.png | Bin 0 -> 788 bytes qml/res/src/circle-file.svg | 18 ++ qml/res/src/circle-green-check.svg | 18 ++ qml/res/src/green-check.svg | 9 + 21 files changed, 605 insertions(+), 5 deletions(-) create mode 100644 qml/components/SnapshotLoadSettings.qml create mode 100644 qml/controls/GreenCheckIcon.qml create mode 100644 qml/pages/settings/SettingsSnapshotLoad.qml create mode 100644 qml/res/icons/circle-file.png create mode 100644 qml/res/icons/circle-green-check.png create mode 100644 qml/res/icons/circle-red-cross.png create mode 100644 qml/res/icons/green-check.png create mode 100644 qml/res/src/circle-file.svg create mode 100644 qml/res/src/circle-green-check.svg create mode 100644 qml/res/src/green-check.svg diff --git a/bitcoin b/bitcoin index 8ffbd7b778..c29a5df514 160000 --- a/bitcoin +++ b/bitcoin @@ -1 +1 @@ -Subproject commit 8ffbd7b778600aa1e824027f1e675929a4240856 +Subproject commit c29a5df51402b85fb335b0d16e3016e984224d90 diff --git a/qml/bitcoin_qml.qrc b/qml/bitcoin_qml.qrc index 2a1a9c4432..dbdcf885e1 100644 --- a/qml/bitcoin_qml.qrc +++ b/qml/bitcoin_qml.qrc @@ -16,6 +16,7 @@ components/ProxySettings.qml components/StorageLocations.qml components/Separator.qml + components/SnapshotLoadSettings.qml components/StorageOptions.qml components/StorageSettings.qml components/ThemeSettings.qml @@ -29,6 +30,7 @@ controls/CoreTextField.qml controls/ExternalLink.qml controls/FocusBorder.qml + controls/GreenCheckIcon.qml controls/Header.qml controls/Icon.qml controls/IconButton.qml @@ -79,6 +81,7 @@ pages/settings/SettingsDeveloper.qml pages/settings/SettingsDisplay.qml pages/settings/SettingsProxy.qml + pages/settings/SettingsSnapshotLoad.qml pages/settings/SettingsStorage.qml pages/settings/SettingsTheme.qml pages/wallet/Activity.qml @@ -115,6 +118,9 @@ res/icons/check.png res/icons/copy.png res/icons/coinbase.png + res/icons/circle-file.png + res/icons/circle-green-check.png + res/icons/circle-red-cross.png res/icons/cross.png res/icons/ellipsis.png res/icons/error.png @@ -122,6 +128,7 @@ res/icons/flip-vertical.png res/icons/gear.png res/icons/gear-outline.png + res/icons/green-check.png res/icons/hidden.png res/icons/info.png res/icons/lock.png diff --git a/qml/components/ConnectionSettings.qml b/qml/components/ConnectionSettings.qml index 385cb5ab45..8fe7e1a130 100644 --- a/qml/components/ConnectionSettings.qml +++ b/qml/components/ConnectionSettings.qml @@ -10,7 +10,38 @@ import "../controls" ColumnLayout { id: root signal next + signal gotoSnapshot + property bool onboarding: false + property bool snapshotImportCompleted: onboarding ? false : chainModel.isSnapshotActive + property bool isIBDCompleted: nodeModel.isIBDCompleted spacing: 4 + Setting { + id: gotoSnapshot + visible: !snapshotImportCompleted && !root.isIBDCompleted + Layout.fillWidth: true + header: qsTr("Load snapshot") + description: qsTr("Instant use with background sync") + actionItem: Item { + width: 26 + height: 26 + CaretRightIcon { + anchors.centerIn: parent + visible: !snapshotImportCompleted + color: gotoSnapshot.stateColor + } + GreenCheckIcon { + anchors.centerIn: parent + visible: snapshotImportCompleted + color: Theme.color.transparent + size: 30 + } + } + onClicked: root.gotoSnapshot() + } + Separator { + visible: !snapshotImportCompleted && !root.isIBDCompleted + Layout.fillWidth: true + } Setting { Layout.fillWidth: true header: qsTr("Enable listening") diff --git a/qml/components/SnapshotLoadSettings.qml b/qml/components/SnapshotLoadSettings.qml new file mode 100644 index 0000000000..cfcf3a97a9 --- /dev/null +++ b/qml/components/SnapshotLoadSettings.qml @@ -0,0 +1,269 @@ +// Copyright (c) 2023-present The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Dialogs + +import "../controls" + +ColumnLayout { + id: columnLayout + signal back + property bool snapshotLoading: nodeModel.snapshotLoading + property bool snapshotLoaded: nodeModel.isSnapshotLoaded + property bool snapshotImportCompleted: onboarding ? false : chainModel.isSnapshotActive + property bool onboarding: false + property bool snapshotVerified: onboarding ? false : chainModel.isSnapshotActive + property string snapshotFileName: "" + property var snapshotInfo: (snapshotVerified || snapshotLoaded) ? chainModel.getSnapshotInfo() : ({}) + property string selectedFile: "" + property bool headersSynced: nodeModel.headersSynced + property bool snapshotError: nodeModel.snapshotError + + width: Math.min(parent.width, 450) + anchors.horizontalCenter: parent.horizontalCenter + + StackLayout { + id: settingsStack + currentIndex: onboarding ? 0 : snapshotLoaded ? 2 : snapshotVerified ? 2 : snapshotLoading ? 1 : snapshotError ? 3 : 0 + + ColumnLayout { + Layout.alignment: Qt.AlignHCenter + Layout.preferredWidth: Math.min(parent.width, 450) + + Image { + Layout.alignment: Qt.AlignCenter + source: "image://images/circle-file" + + sourceSize.width: 200 + sourceSize.height: 200 + } + + Header { + Layout.fillWidth: true + Layout.topMargin: 20 + headerBold: true + header: qsTr("Load snapshot") + descriptionBold: false + descriptionColor: Theme.color.neutral6 + descriptionSize: 17 + descriptionLineHeight: 1.1 + description: qsTr("You can start using the application more quickly by loading a recent transaction snapshot." + + " It will be automatically verified in the background.") + } + + CoreText { + Layout.fillWidth: true + Layout.topMargin: 20 + color: Theme.color.neutral6 + font.pixelSize: 17 + visible: !headersSynced && !onboarding + text: !headersSynced + ? qsTr("Please wait for headers to sync before loading a snapshot.") + : qsTr("") + wrap: true + wrapMode: Text.WordWrap + } + + ContinueButton { + Layout.preferredWidth: Math.min(300, columnLayout.width - 2 * Layout.leftMargin) + Layout.topMargin: 40 + Layout.leftMargin: 20 + Layout.rightMargin: Layout.leftMargin + Layout.bottomMargin: 20 + Layout.alignment: Qt.AlignCenter + text: qsTr("Choose snapshot file") + enabled: headersSynced || onboarding + onClicked: fileDialog.open() + } + + FileDialog { + id: fileDialog + currentFolder: optionsModel.getDefaultDataDirectory + nameFilters: ["Snapshot files (*.dat)", "All files (*)"] + onAccepted: { + snapshotFileName = selectedFile + console.log("snapshotFileName", snapshotFileName) + if (!onboarding) { + nodeModel.snapshotLoadThread(snapshotFileName) + } else { + nodeModel.setSnapshotFilePath(snapshotFileName) + back() + } + } + } + } + + ColumnLayout { + Layout.alignment: Qt.AlignHCenter + Layout.preferredWidth: Math.min(parent.width, 450) + + Image { + Layout.alignment: Qt.AlignCenter + source: "image://images/circle-file" + + sourceSize.width: 200 + sourceSize.height: 200 + } + + Header { + Layout.fillWidth: true + Layout.topMargin: 20 + Layout.leftMargin: 20 + Layout.rightMargin: 20 + header: qsTr("Loading Snapshot") + description: qsTr("This might take a while...") + } + + ProgressIndicator { + id: progressIndicator + Layout.topMargin: 20 + width: 200 + height: 20 + progress: nodeModel.snapshotProgress + Layout.alignment: Qt.AlignCenter + progressColor: Theme.color.blue + } + } + + ColumnLayout { + id: loadedSnapshotColumn + Layout.alignment: Qt.AlignHCenter + Layout.preferredWidth: Math.min(parent.width, 450) + + Image { + Layout.alignment: Qt.AlignCenter + source: "image://images/circle-green-check" + + sourceSize.width: 60 + sourceSize.height: 60 + } + + Header { + Layout.fillWidth: true + Layout.topMargin: 20 + headerBold: true + header: qsTr("Snapshot Loaded") + descriptionBold: false + descriptionColor: Theme.color.neutral6 + descriptionSize: 17 + descriptionLineHeight: 1.1 + description: snapshotInfo && snapshotInfo["date"] ? + qsTr("It contains unspent transactions up to %1. Next, transactions will be verified and newer transactions downloaded.").arg(snapshotInfo["date"]) : + qsTr("It contains transactions up to DEBUG. Newer transactions still need to be downloaded." + + " The data will be verified in the background.") + } + + ContinueButton { + Layout.preferredWidth: Math.min(300, columnLayout.width - 2 * Layout.leftMargin) + Layout.topMargin: 40 + Layout.alignment: Qt.AlignCenter + text: qsTr("Done") + onClicked: { + chainModel.isSnapshotActiveChanged() + back() + } + } + + Setting { + id: viewDetails + Layout.alignment: Qt.AlignCenter + header: qsTr("View details") + actionItem: CaretRightIcon { + id: caretIcon + color: viewDetails.stateColor + rotation: viewDetails.expanded ? 90 : 0 + Behavior on rotation { NumberAnimation { duration: 200 } } + } + + property bool expanded: false + + onClicked: { + expanded = !expanded + } + } + + ColumnLayout { + id: detailsContent + visible: viewDetails.expanded + Layout.preferredWidth: Math.min(300, parent.width - 2 * Layout.leftMargin) + Layout.alignment: Qt.AlignCenter + Layout.leftMargin: 80 + Layout.rightMargin: 80 + Layout.topMargin: 10 + spacing: 10 + // TODO: make sure the block height number aligns right + RowLayout { + CoreText { + text: qsTr("Block Height:") + Layout.alignment: Qt.AlignLeft + font.pixelSize: 14 + } + CoreText { + text: snapshotInfo && snapshotInfo["height"] ? + snapshotInfo["height"] : qsTr("DEBUG") + Layout.alignment: Qt.AlignRight + font.pixelSize: 14 + } + } + Separator { Layout.fillWidth: true } + ColumnLayout { + Layout.fillWidth: true + spacing: 5 + CoreText { + text: qsTr("Hash:") + font.pixelSize: 14 + } + CoreText { + text: snapshotInfo && snapshotInfo["hashSerializedFirstHalf"] ? + snapshotInfo["hashSerializedFirstHalf"] + "\n" + snapshotInfo["hashSerializedSecondHalf"] : + qsTr("DEBUG") + Layout.fillWidth: true + font.pixelSize: 14 + textFormat: Text.PlainText + } + } + } + } + + ColumnLayout { + id: snapshotErrorColumn + Layout.alignment: Qt.AlignHCenter + Layout.preferredWidth: Math.min(parent.width, 450) + + Image { + Layout.alignment: Qt.AlignCenter + source: "image://images/circle-red-cross" + + sourceSize.width: 60 + sourceSize.height: 60 + } + + Header { + Layout.fillWidth: true + Layout.topMargin: 20 + headerBold: true + header: qsTr("Snapshot Could Not Be Verified") + descriptionBold: false + descriptionColor: Theme.color.neutral6 + descriptionSize: 17 + descriptionLineHeight: 1.1 + description: qsTr("There was a problem with the transactions in the snapshot. Please try a different file.") + } + + ContinueButton { + Layout.preferredWidth: Math.min(300, columnLayout.width - 2 * Layout.leftMargin) + Layout.topMargin: 40 + Layout.alignment: Qt.AlignCenter + text: qsTr("OK") + onClicked: { + nodeModel.setSnapshotError(false) + back() + } + } + } + } +} diff --git a/qml/controls/GreenCheckIcon.qml b/qml/controls/GreenCheckIcon.qml new file mode 100644 index 0000000000..02977857b2 --- /dev/null +++ b/qml/controls/GreenCheckIcon.qml @@ -0,0 +1,11 @@ +// Copyright (c) 2023 - present The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +import QtQuick 2.15 +import QtQuick.Controls 2.15 + +Icon { + source: "image://images/green-check" + size: 30 +} diff --git a/qml/controls/Header.qml b/qml/controls/Header.qml index f3c4c0c3e3..ece49234d2 100644 --- a/qml/controls/Header.qml +++ b/qml/controls/Header.qml @@ -25,6 +25,7 @@ ColumnLayout { property int subtextSize: 15 property color subtextColor: Theme.color.neutral9 property bool wrap: true + property real descriptionLineHeight: 1 spacing: 0 Loader { @@ -60,6 +61,7 @@ ColumnLayout { text: root.description horizontalAlignment: root.center ? Text.AlignHCenter : Text.AlignLeft wrapMode: wrap ? Text.WordWrap : Text.NoWrap + lineHeight: root.descriptionLineHeight Behavior on color { ColorAnimation { duration: 150 } diff --git a/qml/controls/ProgressIndicator.qml b/qml/controls/ProgressIndicator.qml index 117a4baebb..9d6d62d329 100644 --- a/qml/controls/ProgressIndicator.qml +++ b/qml/controls/ProgressIndicator.qml @@ -7,6 +7,7 @@ import QtQuick.Controls 2.15 Control { property real progress: 0 + property color progressColor: Theme.color.orange Behavior on progress { NumberAnimation { easing.type: Easing.Bezier @@ -26,7 +27,7 @@ Control { width: contentItem.width height: contentItem.height radius: contentItem.radius - color: Theme.color.orange + color: progressColor } } } diff --git a/qml/controls/Theme.qml b/qml/controls/Theme.qml index f57e152cbd..3c7621c2b5 100644 --- a/qml/controls/Theme.qml +++ b/qml/controls/Theme.qml @@ -27,6 +27,7 @@ Control { required property color blue required property color amber required property color purple + required property color transparent required property color neutral0 required property color neutral1 required property color neutral2 @@ -59,6 +60,7 @@ Control { blue: "#3CA3DE" amber: "#C9B500" purple: "#C075DC" + transparent: "#00000000" neutral0: "#000000" neutral1: "#1A1A1A" neutral2: "#2D2D2D" @@ -91,6 +93,7 @@ Control { blue: "#2D9CDB" amber: "#C9B500" purple: "#BB6BD9" + transparent: "#00000000" neutral0: "#FFFFFF" neutral1: "#F8F8F8" neutral2: "#F4F4F4" diff --git a/qml/models/chainmodel.cpp b/qml/models/chainmodel.cpp index ce3a6b12ae..4e56066898 100644 --- a/qml/models/chainmodel.cpp +++ b/qml/models/chainmodel.cpp @@ -9,6 +9,9 @@ #include #include #include +#include +#include +#include using interfaces::FoundBlock; @@ -106,3 +109,39 @@ void ChainModel::setCurrentTimeRatio() Q_EMIT timeRatioListChanged(); } + +// TODO: Change this once a better solution has been found. +// Using hardcoded snapshot info to display in SnapshotSettings.qml +QVariantMap ChainModel::getSnapshotInfo() { + QVariantMap snapshot_info; + + std::vector available_heights = Params().GetAvailableSnapshotHeights(); + if (!available_heights.empty()) { + // Get the highest height snapshot (last element in the vector) + const int height = available_heights.back(); + std::optional maybe_snapshot = Params().AssumeutxoForHeight(height); + + if (maybe_snapshot.has_value()) { + const auto& latest_snapshot = maybe_snapshot.value(); + const auto& hash_serialized = latest_snapshot.hash_serialized; + + // Get block time using the interfaces pattern + uint256 block_hash{m_chain.getBlockHash(height)}; + int64_t block_time; + m_chain.findBlock(block_hash, FoundBlock().time(block_time)); + + QString fullHash = QString::fromStdString(hash_serialized.ToString()); + + int midPoint = fullHash.length() / 2; + QString firstHalf = fullHash.left(midPoint); + QString secondHalf = fullHash.mid(midPoint); + + snapshot_info["height"] = height; + snapshot_info["hashSerializedFirstHalf"] = firstHalf; + snapshot_info["hashSerializedSecondHalf"] = secondHalf; + snapshot_info["date"] = QDateTime::fromSecsSinceEpoch(block_time).toString("MMMM d yyyy"); + } + } + + return snapshot_info; +} diff --git a/qml/models/chainmodel.h b/qml/models/chainmodel.h index 9318510eda..6a5124be7f 100644 --- a/qml/models/chainmodel.h +++ b/qml/models/chainmodel.h @@ -27,6 +27,7 @@ class ChainModel : public QObject Q_PROPERTY(quint64 assumedBlockchainSize READ assumedBlockchainSize CONSTANT) Q_PROPERTY(quint64 assumedChainstateSize READ assumedChainstateSize CONSTANT) Q_PROPERTY(QVariantList timeRatioList READ timeRatioList NOTIFY timeRatioListChanged) + Q_PROPERTY(bool isSnapshotActive READ isSnapshotActive NOTIFY isSnapshotActiveChanged) public: explicit ChainModel(interfaces::Chain& chain); @@ -36,11 +37,13 @@ class ChainModel : public QObject quint64 assumedBlockchainSize() const { return m_assumed_blockchain_size; }; quint64 assumedChainstateSize() const { return m_assumed_chainstate_size; }; QVariantList timeRatioList() const { return m_time_ratio_list; }; - + bool isSnapshotActive() const { return m_chain.hasAssumedValidChain(); }; int timestampAtMeridian(); void setCurrentTimeRatio(); + Q_INVOKABLE QVariantMap getSnapshotInfo(); + public Q_SLOTS: void setTimeRatioList(int new_time); void setTimeRatioListInitial(); @@ -48,6 +51,7 @@ public Q_SLOTS: Q_SIGNALS: void timeRatioListChanged(); void currentNetworkNameChanged(); + void isSnapshotActiveChanged(); private: QString m_current_network_name; diff --git a/qml/models/nodemodel.cpp b/qml/models/nodemodel.cpp index be6fc4adba..f3cd870b48 100644 --- a/qml/models/nodemodel.cpp +++ b/qml/models/nodemodel.cpp @@ -14,14 +14,19 @@ #include #include +#include #include #include +#include +#include +#include NodeModel::NodeModel(interfaces::Node& node) : m_node{node} { ConnectToBlockTipSignal(); ConnectToNumConnectionsChangedSignal(); + ConnectToSnapshotLoadProgressSignal(); } void NodeModel::setBlockTipHeight(int new_height) @@ -80,6 +85,14 @@ void NodeModel::setVerificationProgress(double new_progress) if (new_progress != m_verification_progress) { setRemainingSyncTime(new_progress); + if (new_progress >= 0.00014) { + setHeadersSynced(true); + } + + if (new_progress >= 0.999) { + setIsIBDCompleted(true); + } + m_verification_progress = new_progress; Q_EMIT verificationProgressChanged(); } @@ -190,3 +203,89 @@ QString NodeModel::defaultProxyAddress() { return QString::fromStdString(std::string(DEFAULT_PROXY_HOST) + ":" + util::ToString(DEFAULT_PROXY_PORT)); } + +void NodeModel::ConnectToSnapshotLoadProgressSignal() +{ + assert(!m_handler_snapshot_load_progress); + + m_handler_snapshot_load_progress = m_node.handleSnapshotLoadProgress( + [this](double progress) { + setSnapshotProgress(progress); + }); +} + +void NodeModel::snapshotLoadThread(QString path_file) { + m_snapshot_loading = true; + Q_EMIT snapshotLoadingChanged(); + + path_file = QUrl(path_file).toLocalFile(); + + QThread* snapshot_thread = QThread::create([this, path_file]() { + const fs::path path_file_fs = fs::u8path(path_file.toStdString()); + auto snapshot = m_node.loadSnapshot(path_file_fs); + + bool result = snapshot ? snapshot->activate() : false; + + if (!result) { + QMetaObject::invokeMethod(this, [this]() { + m_snapshot_loading = false; + Q_EMIT snapshotLoadingChanged(); + m_snapshot_error = true; + Q_EMIT snapshotErrorChanged(); + }, Qt::QueuedConnection); + } else { + QMetaObject::invokeMethod(this, [this, result]() { + m_snapshot_loaded = true; + Q_EMIT snapshotLoaded(result); + Q_EMIT snapshotLoadingChanged(); + }, Qt::QueuedConnection); + } + }); + + connect(snapshot_thread, &QThread::finished, snapshot_thread, &QThread::deleteLater); + + snapshot_thread->start(); +} + +void NodeModel::setSnapshotProgress(double new_progress) { + if (new_progress != m_snapshot_progress) { + m_snapshot_progress = new_progress; + Q_EMIT snapshotProgressChanged(); + } +} + +void NodeModel::setHeadersSynced(bool new_synced) { + if (new_synced != m_headers_synced) { + m_headers_synced = new_synced; + Q_EMIT headersSyncedChanged(); + checkAndLoadSnapshot(); + } +} + +void NodeModel::setIsIBDCompleted(bool new_completed) { + if (new_completed != m_is_ibd_completed) { + m_is_ibd_completed = new_completed; + Q_EMIT isIBDCompletedChanged(); + } +} + +void NodeModel::setSnapshotFilePath(const QString& new_path) { + if (new_path != m_snapshot_file_path) { + m_snapshot_file_path = new_path; + Q_EMIT snapshotFilePathChanged(); + } +} + +void NodeModel::checkAndLoadSnapshot() +{ + if (m_headers_synced && !m_snapshot_file_path.isEmpty()) { + snapshotLoadThread(m_snapshot_file_path); + } +} + +void NodeModel::setSnapshotError(bool new_error) { + if (new_error != m_snapshot_error) { + m_snapshot_error = new_error; + Q_EMIT snapshotErrorChanged(); + } +} diff --git a/qml/models/nodemodel.h b/qml/models/nodemodel.h index 993da098a5..00f45569db 100644 --- a/qml/models/nodemodel.h +++ b/qml/models/nodemodel.h @@ -37,6 +37,13 @@ class NodeModel : public QObject Q_PROPERTY(double verificationProgress READ verificationProgress NOTIFY verificationProgressChanged) Q_PROPERTY(bool pause READ pause WRITE setPause NOTIFY pauseChanged) Q_PROPERTY(bool faulted READ errorState WRITE setErrorState NOTIFY errorStateChanged) + Q_PROPERTY(double snapshotProgress READ snapshotProgress WRITE setSnapshotProgress NOTIFY snapshotProgressChanged) + Q_PROPERTY(bool snapshotLoading READ snapshotLoading NOTIFY snapshotLoadingChanged) + Q_PROPERTY(bool isSnapshotLoaded READ isSnapshotLoaded NOTIFY snapshotLoaded) + Q_PROPERTY(bool headersSynced READ headersSynced WRITE setHeadersSynced NOTIFY headersSyncedChanged) + Q_PROPERTY(bool isIBDCompleted READ isIBDCompleted WRITE setIsIBDCompleted NOTIFY isIBDCompletedChanged) + Q_PROPERTY(QString snapshotFilePath READ snapshotFilePath WRITE setSnapshotFilePath NOTIFY snapshotFilePathChanged) + Q_PROPERTY(bool snapshotError READ snapshotError WRITE setSnapshotError NOTIFY snapshotErrorChanged) public: explicit NodeModel(interfaces::Node& node); @@ -55,6 +62,18 @@ class NodeModel : public QObject void setPause(bool new_pause); bool errorState() const { return m_faulted; } void setErrorState(bool new_error); + bool isSnapshotLoaded() const { return m_snapshot_loaded; } + double snapshotProgress() const { return m_snapshot_progress; } + void setSnapshotProgress(double new_progress); + bool snapshotLoading() const { return m_snapshot_loading; } + bool headersSynced() const { return m_headers_synced; } + void setHeadersSynced(bool new_synced); + bool isIBDCompleted() const { return m_is_ibd_completed; } + void setIsIBDCompleted(bool new_completed); + QString snapshotFilePath() const { return m_snapshot_file_path; } + Q_INVOKABLE void setSnapshotFilePath(const QString& new_path); + bool snapshotError() const { return m_snapshot_error; } + Q_INVOKABLE void setSnapshotError(bool new_error); Q_INVOKABLE float getTotalBytesReceived() const { return (float)m_node.getTotalBytesRecv(); } Q_INVOKABLE float getTotalBytesSent() const { return (float)m_node.getTotalBytesSent(); } @@ -62,6 +81,9 @@ class NodeModel : public QObject Q_INVOKABLE void startNodeInitializionThread(); Q_INVOKABLE void requestShutdown(); + Q_INVOKABLE void snapshotLoadThread(QString path_file); + Q_INVOKABLE void checkAndLoadSnapshot(); + void startShutdownPolling(); void stopShutdownPolling(); @@ -83,6 +105,15 @@ public Q_SLOTS: void setTimeRatioList(int new_time); void setTimeRatioListInitial(); + void initializationFinished(); + void snapshotLoaded(bool result); + void snapshotProgressChanged(); + void snapshotLoadingChanged(); + void showProgress(const QString& title, int progress); + void headersSyncedChanged(); + void isIBDCompletedChanged(); + void snapshotFilePathChanged(); + void snapshotErrorChanged(); protected: void timerEvent(QTimerEvent* event) override; @@ -96,17 +127,25 @@ public Q_SLOTS: double m_verification_progress{0.0}; bool m_pause{false}; bool m_faulted{false}; - + double m_snapshot_progress{0.0}; int m_shutdown_polling_timer_id{0}; + int m_snapshot_timer_id{0}; + bool m_snapshot_loading{false}; + bool m_snapshot_loaded{false}; + bool m_headers_synced{false}; + bool m_is_ibd_completed{false}; + QString m_snapshot_file_path; + bool m_snapshot_error{false}; QVector> m_block_process_time; interfaces::Node& m_node; std::unique_ptr m_handler_notify_block_tip; std::unique_ptr m_handler_notify_num_peers_changed; - + std::unique_ptr m_handler_snapshot_load_progress; void ConnectToBlockTipSignal(); void ConnectToNumConnectionsChangedSignal(); + void ConnectToSnapshotLoadProgressSignal(); }; #endif // BITCOIN_QML_MODELS_NODEMODEL_H diff --git a/qml/pages/settings/SettingsConnection.qml b/qml/pages/settings/SettingsConnection.qml index d180fa2ff2..726a62c7a1 100644 --- a/qml/pages/settings/SettingsConnection.qml +++ b/qml/pages/settings/SettingsConnection.qml @@ -12,6 +12,7 @@ Page { id: root signal back property bool onboarding: false + property bool snapshotImportCompleted: onboarding ? false : chainModel.isSnapshotActive background: null PageStack { id: stack @@ -31,6 +32,9 @@ Page { detailActive: true detailItem: ConnectionSettings { onNext: stack.push(proxySettings) + onGotoSnapshot: stack.push(loadSnapshotSettings) + snapshotImportCompleted: root.snapshotImportCompleted + onboarding: root.onboarding } states: [ @@ -87,5 +91,13 @@ Page { onBack: stack.pop() } } + Component { + id: loadSnapshotSettings + SettingsSnapshotLoad { + onboarding: root.onboarding + snapshotImportCompleted: root.snapshotImportCompleted + onBack: stack.pop() + } + } } } diff --git a/qml/pages/settings/SettingsSnapshotLoad.qml b/qml/pages/settings/SettingsSnapshotLoad.qml new file mode 100644 index 0000000000..cd308ede94 --- /dev/null +++ b/qml/pages/settings/SettingsSnapshotLoad.qml @@ -0,0 +1,38 @@ +// Copyright (c) 2024-present The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import "../../controls" +import "../../components" + +Page { + signal back + property bool onboarding: false + property bool snapshotImportCompleted: onboarding ? false : chainModel.isSnapshotActive + + id: root + + background: null + implicitWidth: 450 + leftPadding: 20 + rightPadding: 20 + topPadding: 30 + + header: NavigationBar2 { + leftItem: NavButton { + iconSource: "image://images/caret-left" + text: qsTr("Back") + onClicked: root.back() + } + } + SnapshotLoadSettings { + width: Math.min(parent.width, 450) + anchors.horizontalCenter: parent.horizontalCenter + onboarding: root.onboarding + snapshotImportCompleted: root.snapshotImportCompleted + onBack: root.back() + } +} diff --git a/qml/res/icons/circle-file.png b/qml/res/icons/circle-file.png new file mode 100644 index 0000000000000000000000000000000000000000..14a776e6d5ba9ff0d34ecd7178169004c6b00147 GIT binary patch literal 1391 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVB7>k44ofvPP)Tsw@I14-?iy0WW zg+Z8+Vb&Z8paQi3pAc7|q|M@cqX>Tp@YL`63=FBHk|4ie21X76DK!HN2VZkeSt}-K zH&+I3T`pleAs#1YJr8$zGiw`DITvMizK*;9Z-nwT-MkjkckwFg?eP1-QI8~Io*Ku! z@J@UknDXv)`Uk&yjY|*JJ^9%zAKdHjy3=T6C?cvanP_TY%D})};_2cTQZZ-i&DY){ zfg%haim%;t-@WVV)}?3Mv+THnG<6nhaB*=}PrSDLMLqW~Ay3DY+71VSCZ!2o9KkN9 z<)*FsaqH_=>$7Lx^?ly){oKsEFKcGaef?+7&As2}Ri9Tl!R*bLl@V=v=rL1dv`pdc z(y+j*JuITlo=12cgL72(y%A2?5v010TUTg?_hrXr3qJ6j@pz=x|D>^W$BUCMH-`Up zWqe)Oc;sc^?l)CJ;t|WwOtx(Z`Lz0*v9|Lo6i z4ByU2{N5>g7fUILv%jg>86T-74qsIGp>&&$UVX3o`Gp+?-au z?7O^|MJ!YQnS%d|B;PU%t3OTpeO&28S#f(z`{!+kEq8WoEMZ)8w&1q)_BrWFKU}q5 z6;EZ`WcqJL_SV|2#IW5;>Y|3p4a@C5&VKvg%0=I+!EdUTH!pI0&ahB--z(K?{#gpE z%a*Y+a@bZC^|l{Bl8|NE`^fJt)5Df|@#U^6NtZ1S?fjl1;P+@x%o|zP9UrFg9mh#b>>0D%T*ONgzqi;6=snu%VcEuMBXU*Z!ig%ov>1~fh|k3Vb+q2 z1@o3TU1V^y?G+NXk>RrlFxY31)yIXa~XB&kLJLU-MTCA@Zt2#cf&|h49 z&VfUBCLQ&CD8%sT@}13{k0wd5JpOr&{oj+@&Hg){pLMPNaJwtP%I6ZR9W5<6w4@IxH z>2$N+evs6<@1-$Y``V-W?uNPZ|MT6m(AQg*S@?gW|ND2$ztgYR2xSQ@k;q$;HutOC zcb2I>Y|%!nRe|BY1^-OvS?|F9Ll+*h~G&19)-=ttob zae5n8<(!JW7#L!DYW=P1Cb!*!Ui&`$dVKFw@cQfW{~2_6dDogo-qQl+b_P#ZKbLh* G2~7YIypH<- literal 0 HcmV?d00001 diff --git a/qml/res/icons/circle-green-check.png b/qml/res/icons/circle-green-check.png new file mode 100644 index 0000000000000000000000000000000000000000..25bb20e00fb07a7e6e6d80cf2474744f35e14d2a GIT binary patch literal 1503 zcmc&!{WsHl9RJSDmT;$WH{_u(Z1#XqtgvWXY#uHNbN9q1hH2_jx|z6C=a$n=r7T@! zPT7-ZDb=~`94YInRGd!54T(JVgyw$zeE)!Z&inm&zu%wN`}Kak&*z8F$tV`h+|Cu7{Ebu7OvlxT&}VO)6QFhE;OiRXh-KQ*ykT(>&Dzf>r?b_%w;IDiGp= zIoRN);@~v`clCPdr4bP|DOm7EokG$GaVoxd^8t4y*F()EH3_jw4%qLd6?v%m;7qbs zk#S;w=joce0p2L&#dJoF17Vc#}yrOkDu*!yS-5MfRQXU zlndLV-wg=n-f$bg@JBPVzh4^s8uj)iE3(5NuUirQAYZ*^@@?O%oE0%|v~GvDmz6ci zMy6-J1^{RQBQzv7ud21OKLZtQRjOww7|g*JEc0OnGcifI_a-daDkL<-Ka1Ugv@FJr zLeV$_ya-X_j)1{nf2xcv*&UVzo;~Q;@YbQBePUncd!J+D0e=VwDbTK`F$_v^^Ze>KWZ$Senic=Dc!njuchFV$2#Rns49e2y9U)b!lJZZC zMA?n%wZrDHb3fL=%0AGF^MMTb!(X#Z_%jj*O5vf}`gnm6-=!2SVN@n|>a3lP?95*P za5`_j7c^F6^8^tW9&+LmWN7W+edyd75d_MJrxbS9!OA}ECd%UO^q7e;xqZ+EL%NZl zA@>oq;e8+Q47L(MB3>tF0sa>BH;|`?6|$+RRVp!QzZJ*i!Xx@y$fUHwBv!F_cE?Q# z7A9WaauSaGRs&5oktbB#v5hhpDoR$Zub!&itniC{azfJ?xs|+Z!|VS=E0~(UvdB$F z-*|s*JkFWlzL@rxlW71G#YbmSimoh|6ed{){jJN0o|d;fR4oVlmhnf9LVm`NCf(|_ zSUT;}CGVI!lNDVWEt~EpL@)owE7~85A5o@b??3mnD>}-_f%@l#bDG4%#)Vx-4*B=t zhW6WbV|Z3Oe16ADWASp#=L7f#k!}FeqYyg{z7pQ`W*buS7oA20evwkUTLOQYcDA-V zhu-yqw)x&n2)cJ0Uu-$Y6tV34+l z5K`Jb^Uj;qh4Z;OpK9;0uGQ3%D%<%y9A)jvpqVCR$W`y3l|Z?5cCzsuAz0F9t#1S1 ztyImnw#n%@K{yNL-1?y3WN&tJ+6a2#it7N|$9m(12YWK_R>Ei5rJdg@o<$@%e|+=I zYeIOrzTe+Ce?q(eQayKC~1-RZOtA@ zi0}9wV2!3nOgKnX8a(ZkyndTwPB(NI7e=5L&)D0SAUPjZJ5iTxBN+_haYKjI2ktS$ ZS2(F+W_HU!{3!Sz0E{qJsEW!h`WFKci5vg` literal 0 HcmV?d00001 diff --git a/qml/res/icons/circle-red-cross.png b/qml/res/icons/circle-red-cross.png new file mode 100644 index 0000000000000000000000000000000000000000..9a7aad3a461be47ece60d019fcdf7a73ff6443cf GIT binary patch literal 2406 zcmV-s37PhZP)tm@JYkv&|~M!Kl#F-2+-l zcINxKTLL;TPr7@6TlEzVVE4UWpL^~(eICSOA&fr^qh>+ZcQ0#N>w=;jUJ&B_jIQ_C zLJT-U4B5JV4fxP2^v$f9bY*Ti2wgUv718JibCoDgqqag5HR#7?}MQP5c zYTcqNN1I5J2Q-7gqadvh3mE~%*V&SrjYA~{ zhua_m1XK#6?g1mjA?&PO6(^Aw%`gv5(*|JsW3o#|}TU-b1}lzrPx2e$DzcsL1xYAJ}k#ksi}zOkUw z9rolS10jZ?&Wg!N%gM~ z$mp3H0NUPWOFoP&2CZmq39$e!mGZ4*KY6K=&9Z=Qd zb|TTRLg0d`9sq&ep--$zfGyl>N>bZu{l|2Rfv_i5Er5%AnQ0_0dCv`_#`bbm0*m8X zvTWFrG!I>J3!gtM`C6LxaVC|zW2I8}+-n9!qG!@{K@Zl%{=R*?!O``zK|Vn&`d(&w z`dcfR{0fF?5)=BU=!c-HQ<<5WJ7yyBqkAnpkRaFKK;`|NOg7T~+Xo3eALPwVNR7Mj zsi{BhRO$?)tcX5peCa#gegRnel4vs)w?|UjlYm7N|R=_U~EN(qW4+wlf z5-EvJ5d`4>-UoR6n z+$#4FDv!V`%&MgcbHNVT|Mf}yXO05u>0fE@g-#R-47J$`up0|a+r#>v$P7H~_$Q&ZC*m*ca zpc6kU#7+zW-XRhdGiD<@FRz^#4m>l)VLn{QnOAx3ygYVdC}7E%s$O6$xF@tYa1p+3 zNxt(Y!V=ScsITgXhhC^nVL*~U5;Qc<2+W5@a>)y=Rj2f8sgxVB9f`Lp#YudEq7(WmWaf=hv^VO*-F6 zZz~A7)7vwVX_(%Ah73|5PN`)+oq62zkSJY1STF02yw~L zw8MGHTRBiPt;Jz4sw(Qlu}PQ&4`VP}PCS*Q=7PxMppBDNls335e9g6;No4W$xg}LS z@QU4+Z?MFZrJi^(s7JX<9u9 zEUk-2R+i&H3l!*?umev4gC+l`Ek$Vp%IllJ_l0nt4?12M#CCA=#vF+E6PC}8o8@7OCA5DQgzQH>A)5y(It;-{5P501p+JEy@(g&h52+K z-aT7PCsOBiFUfN2Khx876(?^si4<)ZmhG?+Py45HHJdmS?i#R`iZt3OW>}KcWce3nZddm)@~lF2s$CC?`?j+@g)>Y%mmRMD2s;(=#{xadgI5nGn)L13`tt&j)< zlU6!i9r}y5m*EiQEzMW*!!XObp2AgiQmIBD9P(BV`iXS59aUwT2s?g6tJ@KKObamx zbhCZQk|ebh?b`-1*kYKih8c9m#92NYjW)=d)@Lfp(T6iLe48A;#BDT4A_%NoOsAU{ zBG8DNF$|yy1lC5Lyw&63{Cv%0zZENA4E`a3e!tl9s=wv){V{?uCWNxs51%i(nPv3Tp*EOq z!BTwoGYH%)339N~+mz*oM{{%gm}AF^Q5HS2ZZF@T!(d8s#_LGl$#PSZr|HyGV_1a! Y2LWH6SR=G#9{>OV07*qoM6N<$g5~&p6951J literal 0 HcmV?d00001 diff --git a/qml/res/icons/green-check.png b/qml/res/icons/green-check.png new file mode 100644 index 0000000000000000000000000000000000000000..acce5e1a21539646b08354584cf7a08688613dc9 GIT binary patch literal 788 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkQ1EkrPlzj!R$rGu71VusRsPAT5Ti1VP5A%+|E{NJfLxQ!nQwl4{Pp*@ z>&~+E507+QS^*SHINWvd-Cd1!i9q&?Z|{KQng@q^uB=Kr(lh7QHm&tZiATB*y||>m zG0kXG#X_$t zR1`ep{QsZv5zq$@ffxu50P&6gAHZxJM9R#Vmsz$mE-%}E92oeqo-U3d6?1wg-}h#6 z6gd8zJ9c?oP*z;4MpT&F*9+MKBKtxw$lvCFp{T`C)y=`Ayy#F@P~gc=R;t@Rzx$T= zzWu`Y)bwYY&CPdPGZ(cqb{LvnDo*~U#Xn*9#`WD6c`P1NmUzpG`+qs1zw>CJP*j7E zYvkoalkW<6iDb{P_$%wxc`S=O)Q@;bvVc--Hyl55YFNq<(UtjkvIfmH0b{ypdE2uD-F|ZGxftH+D|9_}Y@73EaR~ OWbkzLb6Mw<&;$U4l7p@Q literal 0 HcmV?d00001 diff --git a/qml/res/src/circle-file.svg b/qml/res/src/circle-file.svg new file mode 100644 index 0000000000..d8af3949d8 --- /dev/null +++ b/qml/res/src/circle-file.svg @@ -0,0 +1,18 @@ + + circle-file-svg + + + + + + + + + + + + + \ No newline at end of file diff --git a/qml/res/src/circle-green-check.svg b/qml/res/src/circle-green-check.svg new file mode 100644 index 0000000000..d56c175fd4 --- /dev/null +++ b/qml/res/src/circle-green-check.svg @@ -0,0 +1,18 @@ + + Circle arrow up-svg + + + + + + + + + + + + + \ No newline at end of file diff --git a/qml/res/src/green-check.svg b/qml/res/src/green-check.svg new file mode 100644 index 0000000000..95f7c80ead --- /dev/null +++ b/qml/res/src/green-check.svg @@ -0,0 +1,9 @@ + + green-check-svg + + + + \ No newline at end of file From a05e12c85a25d78bb90754a4ee78b9a8bb493018 Mon Sep 17 00:00:00 2001 From: D33r-Gee Date: Wed, 6 Aug 2025 11:18:37 -0700 Subject: [PATCH 2/2] submodule: Update submodule to PR #33117 from bitcoin/bitcoin -Also pointing url to D33r-Gee /bitcoin repository --- .gitmodules | 2 +- bitcoin | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index fabdfe5061..03c4756751 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "bitcoin"] path = bitcoin - url = https://github.com/bitcoin/bitcoin + url = https://github.com/D33r-Gee/bitcoin diff --git a/bitcoin b/bitcoin index c29a5df514..8bc4035570 160000 --- a/bitcoin +++ b/bitcoin @@ -1 +1 @@ -Subproject commit c29a5df51402b85fb335b0d16e3016e984224d90 +Subproject commit 8bc4035570acfe512c756c6de30d6440d322d514