Skip to content
Merged
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
9 changes: 9 additions & 0 deletions doc/release-notes-7618.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
GUI changes
-----------

- Dash-Qt can now register and maintain regular masternodes and EvoNodes from
the Masternodes tab. The registration wizard supports wallet-funded,
wallet-owned, and externally held collateral, while row actions provide
Update Service, Update Registrar, and Revoke workflows. Generated operator
keys are shown and confirmed before registration; wallet-seed-derived
operator keys are not required. (#7618)
12 changes: 12 additions & 0 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,12 @@ QT_MOC_CPP = \
qt/moc_intro.cpp \
qt/moc_macdockiconhandler.cpp \
qt/moc_macnotificationhandler.cpp \
qt/moc_masternodedialogs.cpp \
qt/moc_masternodelist.cpp \
qt/moc_masternodemodel.cpp \
qt/moc_masternodeoperationrunner.cpp \
qt/moc_masternodewidgets.cpp \
qt/moc_masternodewizard.cpp \
qt/moc_mnemonicverificationdialog.cpp \
qt/moc_modaloverlay.cpp \
qt/moc_networkwidget.cpp \
Expand Down Expand Up @@ -158,8 +162,12 @@ BITCOIN_QT_H = \
qt/macdockiconhandler.h \
qt/macnotificationhandler.h \
qt/macos_appnap.h \
qt/masternodedialogs.h \
qt/masternodelist.h \
qt/masternodemodel.h \
qt/masternodeoperationrunner.h \
qt/masternodewidgets.h \
qt/masternodewizard.h \
qt/mnemonicverificationdialog.h \
qt/modaloverlay.h \
qt/networkstyle.h \
Expand Down Expand Up @@ -302,7 +310,11 @@ BITCOIN_QT_WALLET_CPP = \
qt/createwalletdialog.cpp \
qt/descriptiondialog.cpp \
qt/editaddressdialog.cpp \
qt/masternodedialogs.cpp \
qt/masternodelist.cpp \
qt/masternodeoperationrunner.cpp \
qt/masternodewidgets.cpp \
qt/masternodewizard.cpp \
qt/mnemonicverificationdialog.cpp \
qt/openuridialog.cpp \
qt/overviewpage.cpp \
Expand Down
6 changes: 6 additions & 0 deletions src/Makefile.qttest.include
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ if ENABLE_WALLET
TEST_QT_MOC_CPP += \
qt/test/moc_addressbooktests.cpp \
qt/test/moc_providertransactiontests.cpp \
qt/test/moc_masternodewidgettests.cpp \
qt/test/moc_masternodemaintenancetests.cpp \
qt/test/moc_wallettests.cpp
endif # ENABLE_WALLET

TEST_QT_H = \
qt/test/addressbooktests.h \
qt/test/apptests.h \
qt/test/masternodemaintenancetests.h \
qt/test/masternodewidgettests.h \
qt/test/optiontests.h \
qt/test/providertransactiontests.h \
qt/test/rpcnestedtests.h \
Expand All @@ -48,6 +52,8 @@ if ENABLE_WALLET
qt_test_test_dash_qt_SOURCES += \
qt/test/addressbooktests.cpp \
qt/test/providertransactiontests.cpp \
qt/test/masternodewidgettests.cpp \
qt/test/masternodemaintenancetests.cpp \
qt/test/wallettests.cpp \
wallet/test/wallet_test_fixture.cpp
endif # ENABLE_WALLET
Expand Down
2 changes: 2 additions & 0 deletions src/interfaces/providertx.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ struct ProviderNetInfo {
};

struct ProviderPayout {
static constexpr uint16_t MAX_REWARD{10000};

CTxDestination destination;
uint16_t reward{0};
};
Expand Down
10 changes: 10 additions & 0 deletions src/qt/forms/masternodelist.ui
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,16 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnRegisterMasternode">
<property name="toolTip">
<string>Register a new masternode or evonode using this wallet</string>
</property>
<property name="text">
<string>Register Masternode…</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
Expand Down
Loading