Skip to content

Commit

Permalink
Add the batch of release v3.4.0 commits
Browse files Browse the repository at this point in the history
  • Loading branch information
@developer-at-bcn
developer-at-bcn committed Feb 7, 2019
1 parent 5b7717f commit 5490fb4
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 22 deletions.
4 changes: 4 additions & 0 deletions ReleaseNotes.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## Release Notes

### v3.4.0

- Updated the Bytecoin daemons.

### v3.4.0-beta-20181218

- Made minor improvements and bug fixes.
Expand Down
14 changes: 7 additions & 7 deletions Windows Installer/Installer.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1509,23 +1509,23 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Bytecoin"
"ProductCode" = "8:{AD7075D8-0981-41CE-9A19-B850FA051BF5}"
"PackageCode" = "8:{DAA1AE8C-CA31-404D-9A33-E71C6B6C7170}"
"ProductCode" = "8:{D9F64938-1870-4947-B9C0-0A3A3543D4C1}"
"PackageCode" = "8:{E196DC0A-E9C1-4999-B8B9-EB0E847C0C7E}"
"UpgradeCode" = "8:{DC5C7D60-BB08-4B97-B634-E87679CCEB3C}"
"AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:18.12.18"
"ProductVersion" = "8:19.2.7"
"Manufacturer" = "8:Bytecoin Developers"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
"Title" = "8:Bytecoin 3.4.0-beta-20181218 Installer"
"Title" = "8:Bytecoin 3.4.0 Installer"
"Subject" = "8:"
"ARPCONTACT" = "8:Bytecoin Developers"
"Keywords" = "8:"
"ARPCOMMENTS" = "8:Release version of bytecoin from 18 Dec 2018"
"ARPCOMMENTS" = "8:Release version of bytecoin from 07 Feb 2019"
"ARPURLINFOABOUT" = "8:https://bytecoin.org"
"ARPPRODUCTICON" = "8:_ABCF8F071D16461785EDF6D56ED2ABCE"
"ARPIconIndex" = "3:0"
Expand Down Expand Up @@ -1732,7 +1732,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:Release version 3.4.0-beta-20181218 of bytecoin core and GUI wallet from 2018/12/18."
"Value" = "8:Release version 3.4.0 of bytecoin core and GUI wallet from 2019/02/07."
"DefaultValue" = "8:#1202"
"UsePlugInResources" = "11:TRUE"
}
Expand Down Expand Up @@ -1971,7 +1971,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:Release version 3.4.0-beta-20181218 of bytecoin core and GUI wallet from 2018/12/18."
"Value" = "8:Release version 3.4.0 of bytecoin core and GUI wallet from 2019/02/07."
"DefaultValue" = "8:#1202"
"UsePlugInResources" = "11:TRUE"
}
Expand Down
14 changes: 7 additions & 7 deletions Windows Installer/Installer32.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1509,23 +1509,23 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Bytecoin"
"ProductCode" = "8:{CE0A1D62-C7C1-4F62-98B5-EEE140327FDC}"
"PackageCode" = "8:{C8EA6418-2964-448E-B534-462E70607D16}"
"ProductCode" = "8:{DA38A8D0-775E-44E3-99E3-49E710DC16DF}"
"PackageCode" = "8:{2403EAD2-3C56-444C-818F-C137F08B6276}"
"UpgradeCode" = "8:{DC5C7D60-BB08-4B97-B634-E87679CCEB3C}"
"AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:18.12.18"
"ProductVersion" = "8:19.2.7"
"Manufacturer" = "8:Bytecoin Developers"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
"Title" = "8:32-bit Bytecoin 3.4.0-beta-20181218 Installer"
"Title" = "8:32-bit Bytecoin 3.4.0 Installer"
"Subject" = "8:"
"ARPCONTACT" = "8:Bytecoin Developers"
"Keywords" = "8:"
"ARPCOMMENTS" = "8:32-bit release version of bytecoin from 18 Dec 2018"
"ARPCOMMENTS" = "8:32-bit release version of bytecoin from 07 Feb 2019"
"ARPURLINFOABOUT" = "8:https://bytecoin.org"
"ARPPRODUCTICON" = "8:_A84FAE3CB14C4108B5D13DF9AD54E661"
"ARPIconIndex" = "3:0"
Expand Down Expand Up @@ -1732,7 +1732,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:32-bit release version 3.4.0-beta-20181218 of bytecoin core and GUI wallet from 2018/12/18."
"Value" = "8:32-bit release version 3.4.0 of bytecoin core and GUI wallet from 2019/02/07."
"DefaultValue" = "8:#1202"
"UsePlugInResources" = "11:TRUE"
}
Expand Down Expand Up @@ -1971,7 +1971,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:32-bit release version 3.4.0-beta-20181218 of bytecoin core and GUI wallet from 2018/12/18."
"Value" = "8:32-bit release version 3.4.0 of bytecoin core and GUI wallet from 2019/02/07."
"DefaultValue" = "8:#1202"
"UsePlugInResources" = "11:TRUE"
}
Expand Down
2 changes: 1 addition & 1 deletion src/bytecoin-gui.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ TEMPLATE = app
macx: QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
macx: ICON = images/bytecoin.icns
win32: RC_ICONS = images/bytecoin.ico
win32: VERSION = 3.18.12.18
win32: VERSION = 3.19.2.7

#QMAKE_CXXFLAGS += -fno-omit-frame-pointer -fsanitize=address,undefined
#LIBS += -lasan -lubsan
Expand Down
6 changes: 6 additions & 0 deletions src/mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,18 +175,24 @@ void MainWindow::netChanged(const QString& net)
netColor_ = MAIN_NET_COLOR;
setWindowIcon(QIcon(WINDOW_MAIN_ICON_PATH));
m_ui->m_logoLabel->setPixmap(QPixmap(QString(LOGO_LABEL_MAIN_ICON_PATH)));
m_ui->m_createNewWalletAction->setEnabled(false);
m_ui->m_restoreWalletFromMnemonicAction->setEnabled(false);
}
else if (net == RpcApi::STAGE_NET_NAME)
{
netColor_ = STAGE_NET_COLOR;
setWindowIcon(QIcon(WINDOW_STAGE_ICON_PATH));
m_ui->m_logoLabel->setPixmap(QPixmap(QString(LOGO_LABEL_STAGE_ICON_PATH)));
m_ui->m_createNewWalletAction->setEnabled(true);
m_ui->m_restoreWalletFromMnemonicAction->setEnabled(true);
}
else if (net == RpcApi::TEST_NET_NAME)
{
netColor_ = TEST_NET_COLOR;
setWindowIcon(QIcon(WINDOW_TEST_ICON_PATH));
m_ui->m_logoLabel->setPixmap(QPixmap(QString(LOGO_LABEL_TEST_ICON_PATH)));
m_ui->m_createNewWalletAction->setEnabled(true);
m_ui->m_restoreWalletFromMnemonicAction->setEnabled(true);
}
m_ui->m_overviewButton->setStyleSheet(QString{BUTTON_STYLE_SHEET}.arg(netColor_.name()));
m_ui->m_sendButton->setStyleSheet(QString{BUTTON_STYLE_SHEET}.arg(netColor_.name()));
Expand Down
4 changes: 2 additions & 2 deletions src/mainwindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -871,12 +871,12 @@
</action>
<action name="m_createNewWalletAction">
<property name="text">
<string>&amp;Create HD (BIP39) wallet file</string>
<string>&amp;Create Amethyst wallet file</string>
</property>
</action>
<action name="m_restoreWalletFromMnemonicAction">
<property name="text">
<string>&amp;Restore HD (BIP39) wallet from mnemonic</string>
<string>&amp;Restore Amethyst wallet from mnemonic</string>
</property>
</action>
</widget>
Expand Down
4 changes: 2 additions & 2 deletions src/version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace WalletGUI {

constexpr char VERSION[] = "3.4.0";
constexpr char CODENAME[] = "Amethyst";
constexpr char VERSION_SUFFIX[] = "beta";
constexpr char REVISION[] = "20181218";
constexpr char VERSION_SUFFIX[] = "stable";
constexpr char REVISION[] = "20190207";

// returns <0, if newVersion is worse than currentVersion, returns >0, if newVersion is better, and returns 0, if versions are equal
int compareVersion(const QString& newVersion, const QString& currentVersion);
Expand Down
10 changes: 7 additions & 3 deletions src/walletd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ void BuiltinWalletd::run()
QStringList args;
args << QString{"--wallet-file=%1"}.arg(pathToWallet_);
if (createLegacy_)
args << "--create-legacy-wallet" << "--launch-after-command";
args << "--create-wallet" << "--wallet-type=legacy" << "--launch-after-command";

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

if (walletd.exitCode() != 0)
return QString{};
QByteArray data = walletd.readAllStandardOutput();
return QString{data}.simplified();
const QByteArray data = walletd.readAllStandardOutput();
const QString dataStr = data;
const QVector<QStringRef> strList = dataStr.splitRef('\n', QString::SkipEmptyParts);
if (strList.empty())
return QString{};
return strList.last().toString().simplified();
}

/*static*/
Expand Down

0 comments on commit 5490fb4

Please sign in to comment.