Skip to content

Commit d06c771

Browse files
PastaPastaPastaPastaPastaPasta
authored
Merge pull request #5266 from PastaPastaPasta/v19-rc8
[19.x] backport: backport fix and bump to rc.8
2 parents bfbd912 + 5abc5c5 commit d06c771

File tree

5 files changed

+125
-104
lines changed

5 files changed

+125
-104
lines changed

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 19)
33
define(_CLIENT_VERSION_MINOR, 0)
44
define(_CLIENT_VERSION_BUILD, 0)
5-
define(_CLIENT_VERSION_RC, 7)
5+
define(_CLIENT_VERSION_RC, 8)
66
define(_CLIENT_VERSION_IS_RELEASE, false)
77
define(_COPYRIGHT_YEAR, 2023)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])

‎contrib/containers/deploy/Dockerfile.GitHubActions.Gitian

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LABEL description="Dockerised DashCore"
55

66
ARG USER_ID
77
ARG GROUP_ID
8-
ARG BRANCH
8+
ARG TAG
99

1010
ENV HOME /home/dash
1111

@@ -23,7 +23,7 @@ RUN apt-get update && \
2323
ca-certificates \
2424
&& rm -rf /var/lib/apt/lists/*
2525

26-
COPY dashcore-binaries/${BRANCH}/dashcore* /home/dash
26+
COPY dashcore-binaries/${TAG}/dashcore* /home/dash
2727

2828
RUN mach=$(uname -m) \
2929
&& case $mach in aarch64) arch="aarch64-linux-gnu"; ;; x86_64) arch="x86_64-linux-gnu"; ;; *) echo "ERROR: Machine type $mach not supported."; ;; esac \

‎src/evo/deterministicmns.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ void CDeterministicMNList::AddMN(const CDeterministicMNCPtr& dmn, bool fBumpTota
514514
}
515515

516516
if (dmn->nType == MnType::HighPerformance) {
517-
if (!AddUniqueProperty(*dmn, dmn->pdmnState->platformNodeID)) {
517+
if (dmn->pdmnState->platformNodeID != uint160() && !AddUniqueProperty(*dmn, dmn->pdmnState->platformNodeID)) {
518518
mnUniquePropertyMap = mnUniquePropertyMapSaved;
519519
throw(std::runtime_error(strprintf("%s: Can't add a masternode %s with a duplicate platformNodeID=%s", __func__,
520520
dmn->proTxHash.ToString(), dmn->pdmnState->platformNodeID.ToString())));
@@ -615,7 +615,7 @@ void CDeterministicMNList::RemoveMN(const uint256& proTxHash)
615615
}
616616

617617
if (dmn->nType == MnType::HighPerformance) {
618-
if (!DeleteUniqueProperty(*dmn, dmn->pdmnState->platformNodeID)) {
618+
if (dmn->pdmnState->platformNodeID != uint160() && !DeleteUniqueProperty(*dmn, dmn->pdmnState->platformNodeID)) {
619619
mnUniquePropertyMap = mnUniquePropertyMapSaved;
620620
throw(std::runtime_error(strprintf("%s: Can't delete a masternode %s with a duplicate platformNodeID=%s", __func__,
621621
dmn->proTxHash.ToString(), dmn->pdmnState->platformNodeID.ToString())));

‎src/governance/classes.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -677,17 +677,18 @@ bool CSuperblock::IsValid(const CTransaction& txNew, int nBlockHeight, CAmount b
677677
bool CSuperblock::IsExpired(const CGovernanceManager& governanceManager) const
678678
{
679679
int nExpirationBlocks;
680-
// Executed triggers are kept for another superblock cycle (approximately 1 month),
681-
// other valid triggers are kept for ~1 day only, everything else is pruned after ~1h.
680+
// Executed triggers are kept for another superblock cycle (approximately 1 month for mainnet).
681+
// Other valid triggers are kept for ~1 day only (for mainnet, but no longer than a superblock cycle for other networks).
682+
// Everything else is pruned after ~1h (for mainnet, but no longer than a superblock cycle for other networks).
682683
switch (nStatus) {
683684
case SEEN_OBJECT_EXECUTED:
684685
nExpirationBlocks = Params().GetConsensus().nSuperblockCycle;
685686
break;
686687
case SEEN_OBJECT_IS_VALID:
687-
nExpirationBlocks = 576;
688+
nExpirationBlocks = std::min(576, Params().GetConsensus().nSuperblockCycle);
688689
break;
689690
default:
690-
nExpirationBlocks = 24;
691+
nExpirationBlocks = std::min(24, Params().GetConsensus().nSuperblockCycle);
691692
break;
692693
}
693694

‎src/qt/forms/createwalletdialog.ui

+115-95
Original file line numberDiff line numberDiff line change
@@ -6,106 +6,126 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>364</width>
10-
<height>195</height>
9+
<width>407</width>
10+
<height>0</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Create Wallet</string>
1515
</property>
16-
<widget class="QDialogButtonBox" name="buttonBox">
17-
<property name="geometry">
18-
<rect>
19-
<x>10</x>
20-
<y>140</y>
21-
<width>341</width>
22-
<height>40</height>
23-
</rect>
24-
</property>
25-
<property name="orientation">
26-
<enum>Qt::Horizontal</enum>
27-
</property>
28-
<property name="standardButtons">
29-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
30-
</property>
31-
</widget>
32-
<widget class="QLineEdit" name="wallet_name_line_edit">
33-
<property name="geometry">
34-
<rect>
35-
<x>120</x>
36-
<y>20</y>
37-
<width>231</width>
38-
<height>24</height>
39-
</rect>
40-
</property>
41-
</widget>
42-
<widget class="QLabel" name="label">
43-
<property name="geometry">
44-
<rect>
45-
<x>20</x>
46-
<y>20</y>
47-
<width>101</width>
48-
<height>21</height>
49-
</rect>
50-
</property>
51-
<property name="text">
52-
<string>Wallet Name</string>
53-
</property>
54-
</widget>
55-
<widget class="QCheckBox" name="encrypt_wallet_checkbox">
56-
<property name="geometry">
57-
<rect>
58-
<x>20</x>
59-
<y>60</y>
60-
<width>171</width>
61-
<height>22</height>
62-
</rect>
63-
</property>
64-
<property name="toolTip">
65-
<string>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</string>
66-
</property>
67-
<property name="text">
68-
<string>Encrypt Wallet</string>
69-
</property>
70-
<property name="checked">
71-
<bool>true</bool>
72-
</property>
73-
</widget>
74-
<widget class="QCheckBox" name="disable_privkeys_checkbox">
75-
<property name="enabled">
76-
<bool>false</bool>
77-
</property>
78-
<property name="geometry">
79-
<rect>
80-
<x>20</x>
81-
<y>90</y>
82-
<width>171</width>
83-
<height>22</height>
84-
</rect>
85-
</property>
86-
<property name="toolTip">
87-
<string>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</string>
88-
</property>
89-
<property name="text">
90-
<string>Disable Private Keys</string>
91-
</property>
92-
</widget>
93-
<widget class="QCheckBox" name="blank_wallet_checkbox">
94-
<property name="geometry">
95-
<rect>
96-
<x>20</x>
97-
<y>120</y>
98-
<width>171</width>
99-
<height>22</height>
100-
</rect>
101-
</property>
102-
<property name="toolTip">
103-
<string>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</string>
104-
</property>
105-
<property name="text">
106-
<string>Make Blank Wallet</string>
107-
</property>
108-
</widget>
16+
<property name="sizeGripEnabled">
17+
<bool>true</bool>
18+
</property>
19+
<layout class="QVBoxLayout" name="verticalLayout">
20+
<item>
21+
<layout class="QHBoxLayout" name="horizontalLayout">
22+
<item>
23+
<widget class="QLabel" name="wallet_name_label">
24+
<property name="text">
25+
<string>Wallet Name</string>
26+
</property>
27+
</widget>
28+
</item>
29+
<item>
30+
<widget class="QLineEdit" name="wallet_name_line_edit">
31+
<property name="minimumSize">
32+
<size>
33+
<width>262</width>
34+
<height>0</height>
35+
</size>
36+
</property>
37+
<property name="placeholderText">
38+
<string>Wallet</string>
39+
</property>
40+
</widget>
41+
</item>
42+
</layout>
43+
</item>
44+
<item>
45+
<widget class="QCheckBox" name="encrypt_wallet_checkbox">
46+
<property name="toolTip">
47+
<string>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</string>
48+
</property>
49+
<property name="text">
50+
<string>Encrypt Wallet</string>
51+
</property>
52+
<property name="checked">
53+
<bool>false</bool>
54+
</property>
55+
</widget>
56+
</item>
57+
<item>
58+
<spacer name="verticalSpacer_1">
59+
<property name="orientation">
60+
<enum>Qt::Vertical</enum>
61+
</property>
62+
<property name="sizeType">
63+
<enum>QSizePolicy::Fixed</enum>
64+
</property>
65+
<property name="sizeHint" stdset="0">
66+
<size>
67+
<width>20</width>
68+
<height>8</height>
69+
</size>
70+
</property>
71+
</spacer>
72+
</item>
73+
<item>
74+
<widget class="QGroupBox" name="groupBox">
75+
<property name="title">
76+
<string>Advanced Options</string>
77+
</property>
78+
<layout class="QVBoxLayout" name="verticalLayout_groupbox">
79+
<item>
80+
<widget class="QCheckBox" name="disable_privkeys_checkbox">
81+
<property name="enabled">
82+
<bool>true</bool>
83+
</property>
84+
<property name="toolTip">
85+
<string>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</string>
86+
</property>
87+
<property name="text">
88+
<string>Disable Private Keys</string>
89+
</property>
90+
</widget>
91+
</item>
92+
<item>
93+
<widget class="QCheckBox" name="blank_wallet_checkbox">
94+
<property name="toolTip">
95+
<string>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</string>
96+
</property>
97+
<property name="text">
98+
<string>Make Blank Wallet</string>
99+
</property>
100+
</widget>
101+
</item>
102+
</layout>
103+
</widget>
104+
</item>
105+
<item>
106+
<spacer name="verticalSpacer_2">
107+
<property name="orientation">
108+
<enum>Qt::Vertical</enum>
109+
</property>
110+
<property name="sizeHint" stdset="0">
111+
<size>
112+
<width>20</width>
113+
<height>0</height>
114+
</size>
115+
</property>
116+
</spacer>
117+
</item>
118+
<item>
119+
<widget class="QDialogButtonBox" name="buttonBox">
120+
<property name="orientation">
121+
<enum>Qt::Horizontal</enum>
122+
</property>
123+
<property name="standardButtons">
124+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
125+
</property>
126+
</widget>
127+
</item>
128+
</layout>
109129
</widget>
110130
<tabstops>
111131
<tabstop>wallet_name_line_edit</tabstop>

0 commit comments

Comments
 (0)