Skip to content

Commit 5490fb4

Browse files
developer-at-bcndeveloper-at-bcn
committed
Add the batch of release v3.4.0 commits
1 parent 5b7717f commit 5490fb4

8 files changed

Lines changed: 36 additions & 22 deletions

File tree

‎ReleaseNotes.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## Release Notes
22

3+
### v3.4.0
4+
5+
- Updated the Bytecoin daemons.
6+
37
### v3.4.0-beta-20181218
48

59
- Made minor improvements and bug fixes.

‎Windows Installer/Installer.vdproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,23 +1509,23 @@
15091509
{
15101510
"Name" = "8:Microsoft Visual Studio"
15111511
"ProductName" = "8:Bytecoin"
1512-
"ProductCode" = "8:{AD7075D8-0981-41CE-9A19-B850FA051BF5}"
1513-
"PackageCode" = "8:{DAA1AE8C-CA31-404D-9A33-E71C6B6C7170}"
1512+
"ProductCode" = "8:{D9F64938-1870-4947-B9C0-0A3A3543D4C1}"
1513+
"PackageCode" = "8:{E196DC0A-E9C1-4999-B8B9-EB0E847C0C7E}"
15141514
"UpgradeCode" = "8:{DC5C7D60-BB08-4B97-B634-E87679CCEB3C}"
15151515
"AspNetVersion" = "8:"
15161516
"RestartWWWService" = "11:FALSE"
15171517
"RemovePreviousVersions" = "11:TRUE"
15181518
"DetectNewerInstalledVersion" = "11:TRUE"
15191519
"InstallAllUsers" = "11:FALSE"
1520-
"ProductVersion" = "8:18.12.18"
1520+
"ProductVersion" = "8:19.2.7"
15211521
"Manufacturer" = "8:Bytecoin Developers"
15221522
"ARPHELPTELEPHONE" = "8:"
15231523
"ARPHELPLINK" = "8:"
1524-
"Title" = "8:Bytecoin 3.4.0-beta-20181218 Installer"
1524+
"Title" = "8:Bytecoin 3.4.0 Installer"
15251525
"Subject" = "8:"
15261526
"ARPCONTACT" = "8:Bytecoin Developers"
15271527
"Keywords" = "8:"
1528-
"ARPCOMMENTS" = "8:Release version of bytecoin from 18 Dec 2018"
1528+
"ARPCOMMENTS" = "8:Release version of bytecoin from 07 Feb 2019"
15291529
"ARPURLINFOABOUT" = "8:https://bytecoin.org"
15301530
"ARPPRODUCTICON" = "8:_ABCF8F071D16461785EDF6D56ED2ABCE"
15311531
"ARPIconIndex" = "3:0"
@@ -1732,7 +1732,7 @@
17321732
"ContextData" = "8:"
17331733
"Attributes" = "3:0"
17341734
"Setting" = "3:2"
1735-
"Value" = "8:Release version 3.4.0-beta-20181218 of bytecoin core and GUI wallet from 2018/12/18."
1735+
"Value" = "8:Release version 3.4.0 of bytecoin core and GUI wallet from 2019/02/07."
17361736
"DefaultValue" = "8:#1202"
17371737
"UsePlugInResources" = "11:TRUE"
17381738
}
@@ -1971,7 +1971,7 @@
19711971
"ContextData" = "8:"
19721972
"Attributes" = "3:0"
19731973
"Setting" = "3:2"
1974-
"Value" = "8:Release version 3.4.0-beta-20181218 of bytecoin core and GUI wallet from 2018/12/18."
1974+
"Value" = "8:Release version 3.4.0 of bytecoin core and GUI wallet from 2019/02/07."
19751975
"DefaultValue" = "8:#1202"
19761976
"UsePlugInResources" = "11:TRUE"
19771977
}

‎Windows Installer/Installer32.vdproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,23 +1509,23 @@
15091509
{
15101510
"Name" = "8:Microsoft Visual Studio"
15111511
"ProductName" = "8:Bytecoin"
1512-
"ProductCode" = "8:{CE0A1D62-C7C1-4F62-98B5-EEE140327FDC}"
1513-
"PackageCode" = "8:{C8EA6418-2964-448E-B534-462E70607D16}"
1512+
"ProductCode" = "8:{DA38A8D0-775E-44E3-99E3-49E710DC16DF}"
1513+
"PackageCode" = "8:{2403EAD2-3C56-444C-818F-C137F08B6276}"
15141514
"UpgradeCode" = "8:{DC5C7D60-BB08-4B97-B634-E87679CCEB3C}"
15151515
"AspNetVersion" = "8:"
15161516
"RestartWWWService" = "11:FALSE"
15171517
"RemovePreviousVersions" = "11:TRUE"
15181518
"DetectNewerInstalledVersion" = "11:TRUE"
15191519
"InstallAllUsers" = "11:FALSE"
1520-
"ProductVersion" = "8:18.12.18"
1520+
"ProductVersion" = "8:19.2.7"
15211521
"Manufacturer" = "8:Bytecoin Developers"
15221522
"ARPHELPTELEPHONE" = "8:"
15231523
"ARPHELPLINK" = "8:"
1524-
"Title" = "8:32-bit Bytecoin 3.4.0-beta-20181218 Installer"
1524+
"Title" = "8:32-bit Bytecoin 3.4.0 Installer"
15251525
"Subject" = "8:"
15261526
"ARPCONTACT" = "8:Bytecoin Developers"
15271527
"Keywords" = "8:"
1528-
"ARPCOMMENTS" = "8:32-bit release version of bytecoin from 18 Dec 2018"
1528+
"ARPCOMMENTS" = "8:32-bit release version of bytecoin from 07 Feb 2019"
15291529
"ARPURLINFOABOUT" = "8:https://bytecoin.org"
15301530
"ARPPRODUCTICON" = "8:_A84FAE3CB14C4108B5D13DF9AD54E661"
15311531
"ARPIconIndex" = "3:0"
@@ -1732,7 +1732,7 @@
17321732
"ContextData" = "8:"
17331733
"Attributes" = "3:0"
17341734
"Setting" = "3:2"
1735-
"Value" = "8:32-bit release version 3.4.0-beta-20181218 of bytecoin core and GUI wallet from 2018/12/18."
1735+
"Value" = "8:32-bit release version 3.4.0 of bytecoin core and GUI wallet from 2019/02/07."
17361736
"DefaultValue" = "8:#1202"
17371737
"UsePlugInResources" = "11:TRUE"
17381738
}
@@ -1971,7 +1971,7 @@
19711971
"ContextData" = "8:"
19721972
"Attributes" = "3:0"
19731973
"Setting" = "3:2"
1974-
"Value" = "8:32-bit release version 3.4.0-beta-20181218 of bytecoin core and GUI wallet from 2018/12/18."
1974+
"Value" = "8:32-bit release version 3.4.0 of bytecoin core and GUI wallet from 2019/02/07."
19751975
"DefaultValue" = "8:#1202"
19761976
"UsePlugInResources" = "11:TRUE"
19771977
}

‎src/bytecoin-gui.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ TEMPLATE = app
1515
macx: QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
1616
macx: ICON = images/bytecoin.icns
1717
win32: RC_ICONS = images/bytecoin.ico
18-
win32: VERSION = 3.18.12.18
18+
win32: VERSION = 3.19.2.7
1919

2020
#QMAKE_CXXFLAGS += -fno-omit-frame-pointer -fsanitize=address,undefined
2121
#LIBS += -lasan -lubsan

‎src/mainwindow.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,18 +175,24 @@ void MainWindow::netChanged(const QString& net)
175175
netColor_ = MAIN_NET_COLOR;
176176
setWindowIcon(QIcon(WINDOW_MAIN_ICON_PATH));
177177
m_ui->m_logoLabel->setPixmap(QPixmap(QString(LOGO_LABEL_MAIN_ICON_PATH)));
178+
m_ui->m_createNewWalletAction->setEnabled(false);
179+
m_ui->m_restoreWalletFromMnemonicAction->setEnabled(false);
178180
}
179181
else if (net == RpcApi::STAGE_NET_NAME)
180182
{
181183
netColor_ = STAGE_NET_COLOR;
182184
setWindowIcon(QIcon(WINDOW_STAGE_ICON_PATH));
183185
m_ui->m_logoLabel->setPixmap(QPixmap(QString(LOGO_LABEL_STAGE_ICON_PATH)));
186+
m_ui->m_createNewWalletAction->setEnabled(true);
187+
m_ui->m_restoreWalletFromMnemonicAction->setEnabled(true);
184188
}
185189
else if (net == RpcApi::TEST_NET_NAME)
186190
{
187191
netColor_ = TEST_NET_COLOR;
188192
setWindowIcon(QIcon(WINDOW_TEST_ICON_PATH));
189193
m_ui->m_logoLabel->setPixmap(QPixmap(QString(LOGO_LABEL_TEST_ICON_PATH)));
194+
m_ui->m_createNewWalletAction->setEnabled(true);
195+
m_ui->m_restoreWalletFromMnemonicAction->setEnabled(true);
190196
}
191197
m_ui->m_overviewButton->setStyleSheet(QString{BUTTON_STYLE_SHEET}.arg(netColor_.name()));
192198
m_ui->m_sendButton->setStyleSheet(QString{BUTTON_STYLE_SHEET}.arg(netColor_.name()));

‎src/mainwindow.ui‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -871,12 +871,12 @@
871871
</action>
872872
<action name="m_createNewWalletAction">
873873
<property name="text">
874-
<string>&amp;Create HD (BIP39) wallet file</string>
874+
<string>&amp;Create Amethyst wallet file</string>
875875
</property>
876876
</action>
877877
<action name="m_restoreWalletFromMnemonicAction">
878878
<property name="text">
879-
<string>&amp;Restore HD (BIP39) wallet from mnemonic</string>
879+
<string>&amp;Restore Amethyst wallet from mnemonic</string>
880880
</property>
881881
</action>
882882
</widget>

‎src/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ namespace WalletGUI {
77

88
constexpr char VERSION[] = "3.4.0";
99
constexpr char CODENAME[] = "Amethyst";
10-
constexpr char VERSION_SUFFIX[] = "beta";
11-
constexpr char REVISION[] = "20181218";
10+
constexpr char VERSION_SUFFIX[] = "stable";
11+
constexpr char REVISION[] = "20190207";
1212

1313
// returns <0, if newVersion is worse than currentVersion, returns >0, if newVersion is better, and returns 0, if versions are equal
1414
int compareVersion(const QString& newVersion, const QString& currentVersion);

‎src/walletd.cpp‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ void BuiltinWalletd::run()
426426
QStringList args;
427427
args << QString{"--wallet-file=%1"}.arg(pathToWallet_);
428428
if (createLegacy_)
429-
args << "--create-legacy-wallet" << "--launch-after-command";
429+
args << "--create-wallet" << "--wallet-type=legacy" << "--launch-after-command";
430430

431431
const bool restoreFromMnemonic = !mnemonic_.isEmpty();
432432
if (createNew_)
@@ -847,8 +847,12 @@ QString BuiltinWalletd::generateMnemonic(QWidget* parent, std::function<void(QSt
847847

848848
if (walletd.exitCode() != 0)
849849
return QString{};
850-
QByteArray data = walletd.readAllStandardOutput();
851-
return QString{data}.simplified();
850+
const QByteArray data = walletd.readAllStandardOutput();
851+
const QString dataStr = data;
852+
const QVector<QStringRef> strList = dataStr.splitRef('\n', QString::SkipEmptyParts);
853+
if (strList.empty())
854+
return QString{};
855+
return strList.last().toString().simplified();
852856
}
853857

854858
/*static*/

0 commit comments

Comments
 (0)