From a63a7c6ceae0901d34ac0fe53ae635123440f025 Mon Sep 17 00:00:00 2001 From: Bytecoin Developer Date: Thu, 2 Aug 2018 20:00:01 +0300 Subject: [PATCH] Add the batch of release v3.2.0 commits --- ReleaseNotes.md | 9 +++++++-- Windows Installer/Installer.vdproj | 14 +++++++------- Windows Installer/Installer32.vdproj | 14 +++++++------- src/aboutdialog.cpp | 4 ++-- src/application.cpp | 2 +- src/bytecoin-gui.pro | 2 +- src/mainwindow.ui | 8 ++++---- src/rpcapi.cpp | 4 ++-- src/rpcapi.h | 8 ++++---- src/settings.cpp | 6 ++++++ src/settings.h | 1 + src/version.h | 4 ++-- src/walletdparamsdialog.ui | 2 +- 13 files changed, 45 insertions(+), 33 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index d60201d..2b43964 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,8 +1,13 @@ ## Release Notes +### v3.2.0 + +- Updated the Bytecoin daemons and API bindings. +- Fix minor bugs found in the beta release. + ### 3.2.0-beta-20180723 -- Remove logging wallet file names on Windows. +- Removed logging wallet file names on Windows. - Made minor UI improvements. - Updated the Bytecoin daemons. @@ -13,7 +18,7 @@ ### v3.1.0 -- Increment the major version to conform with the daemon versioning. +- Incremented the major version to conform with the daemon versioning. - Updated the Bytecoin daemons. ### v2.0.4 diff --git a/Windows Installer/Installer.vdproj b/Windows Installer/Installer.vdproj index cbbf704..474fb7d 100644 --- a/Windows Installer/Installer.vdproj +++ b/Windows Installer/Installer.vdproj @@ -1483,23 +1483,23 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Bytecoin" - "ProductCode" = "8:{166F594E-FBE1-4ABB-9DC2-2867A614F0F3}" - "PackageCode" = "8:{E0CC9A05-B7F0-4E68-9E19-AEA81C7C2ED6}" + "ProductCode" = "8:{D783D4B5-ED95-4FF0-AFC3-0C020E155860}" + "PackageCode" = "8:{63406163-BCD7-46DD-8D89-B2AF7AB833A8}" "UpgradeCode" = "8:{DC5C7D60-BB08-4B97-B634-E87679CCEB3C}" "AspNetVersion" = "8:" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:18.5.24" + "ProductVersion" = "8:18.8.2" "Manufacturer" = "8:Bytecoin Developers" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" - "Title" = "8:Bytecoin 3.1.1 Installer" + "Title" = "8:Bytecoin 3.2.0 Installer" "Subject" = "8:" "ARPCONTACT" = "8:Bytecoin Developers" "Keywords" = "8:" - "ARPCOMMENTS" = "8:Release version of bytecoin from 24 May 2018" + "ARPCOMMENTS" = "8:Release version of bytecoin from 2 Aug 2018" "ARPURLINFOABOUT" = "8:https://bytecoin.org" "ARPPRODUCTICON" = "8:_ABCF8F071D16461785EDF6D56ED2ABCE" "ARPIconIndex" = "3:0" @@ -1706,7 +1706,7 @@ "ContextData" = "8:" "Attributes" = "3:0" "Setting" = "3:2" - "Value" = "8:Release version 3.1.1 of bytecoin core and GUI wallet from 2018/05/24." + "Value" = "8:Release version 3.2.0 of bytecoin core and GUI wallet from 2018/08/02." "DefaultValue" = "8:#1202" "UsePlugInResources" = "11:TRUE" } @@ -1945,7 +1945,7 @@ "ContextData" = "8:" "Attributes" = "3:0" "Setting" = "3:2" - "Value" = "8:Release version 3.1.1 of bytecoin core and GUI wallet from 2018/05/24." + "Value" = "8:Release version 3.2.0 of bytecoin core and GUI wallet from 2018/08/02." "DefaultValue" = "8:#1202" "UsePlugInResources" = "11:TRUE" } diff --git a/Windows Installer/Installer32.vdproj b/Windows Installer/Installer32.vdproj index bd093d7..6327fde 100644 --- a/Windows Installer/Installer32.vdproj +++ b/Windows Installer/Installer32.vdproj @@ -1483,23 +1483,23 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Bytecoin" - "ProductCode" = "8:{9D5A4439-BBE7-4110-9CE2-EF8A9F74098D}" - "PackageCode" = "8:{05D6CC19-FEEF-41D8-ACC4-4E1160C8B5B7}" + "ProductCode" = "8:{E1D3C81F-3062-47AA-953D-C067A40B4789}" + "PackageCode" = "8:{83F7EC5F-0FD5-4BE1-804B-2B0DBC773D35}" "UpgradeCode" = "8:{DC5C7D60-BB08-4B97-B634-E87679CCEB3C}" "AspNetVersion" = "8:" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:18.5.24" + "ProductVersion" = "8:18.8.2" "Manufacturer" = "8:Bytecoin Developers" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" - "Title" = "8:32-bit Bytecoin 3.1.1 Installer" + "Title" = "8:32-bit Bytecoin 3.2.0 Installer" "Subject" = "8:" "ARPCONTACT" = "8:Bytecoin Developers" "Keywords" = "8:" - "ARPCOMMENTS" = "8:32-bit release version of bytecoin from 24 May 2018" + "ARPCOMMENTS" = "8:32-bit release version of bytecoin from 2 Aug 2018" "ARPURLINFOABOUT" = "8:https://bytecoin.org" "ARPPRODUCTICON" = "8:_A84FAE3CB14C4108B5D13DF9AD54E661" "ARPIconIndex" = "3:0" @@ -1706,7 +1706,7 @@ "ContextData" = "8:" "Attributes" = "3:0" "Setting" = "3:2" - "Value" = "8:32-bit release version 3.1.1 of bytecoin core and GUI wallet from 2018/05/24." + "Value" = "8:32-bit release version 3.2.0 of bytecoin core and GUI wallet from 2018/08/02." "DefaultValue" = "8:#1202" "UsePlugInResources" = "11:TRUE" } @@ -1945,7 +1945,7 @@ "ContextData" = "8:" "Attributes" = "3:0" "Setting" = "3:2" - "Value" = "8:32-bit release version 3.1.1 of bytecoin core and GUI wallet from 2018/05/24." + "Value" = "8:32-bit release version 3.2.0 of bytecoin core and GUI wallet from 2018/08/02." "DefaultValue" = "8:#1202" "UsePlugInResources" = "11:TRUE" } diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp index ac5895e..aa2d549 100644 --- a/src/aboutdialog.cpp +++ b/src/aboutdialog.cpp @@ -19,8 +19,8 @@ AboutDialog::AboutDialog(QWidget* parent) m_ui->m_aboutLabel->setText( aboutText .arg(Settings::getVersion()) - .arg(Settings::getVersionSuffix()) - .arg(Settings::getRevision()) + .arg(Settings::isStableVersion() ? "" : Settings::getVersionSuffix()) + .arg(Settings::isStableVersion() ? "" : Settings::getRevision()) .arg(QDateTime::currentDateTime().date().year())); } diff --git a/src/application.cpp b/src/application.cpp index 0fea211..8eff4af 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -534,7 +534,7 @@ void WalletApplication::createProof(const QString& txHash, bool needToFind) &dlg, [&dlg](const RpcApi::Proofs& proofs) { - dlg.addProofs(proofs.send_proofs); + dlg.addProofs(proofs.sendproofs); }); dlg.exec(); diff --git a/src/bytecoin-gui.pro b/src/bytecoin-gui.pro index a59e54c..f5706a9 100644 --- a/src/bytecoin-gui.pro +++ b/src/bytecoin-gui.pro @@ -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.7.23 +win32: VERSION = 3.18.8.2 #QMAKE_CXXFLAGS += -fno-omit-frame-pointer -fsanitize=address,undefined #LIBS += -lasan -lubsan diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 73a5303..4206982 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -685,7 +685,7 @@ 0 0 1273 - 19 + 23 @@ -804,7 +804,7 @@ - &Check send proof + &Check SendProof @@ -814,12 +814,12 @@ - Export view only wallet + &Export view only wallet - Export keys + Ex&port keys diff --git a/src/rpcapi.cpp b/src/rpcapi.cpp index 822f9ab..4ca0a34 100644 --- a/src/rpcapi.cpp +++ b/src/rpcapi.cpp @@ -469,7 +469,7 @@ CreateSendProof::Response::fromJson(const QVariantMap& json) { CreateSendProof::Response value; - RPCAPI_DESERIALIZE_FIELD(value, json, send_proofs); + RPCAPI_DESERIALIZE_FIELD(value, json, sendproofs); return value; } @@ -504,7 +504,7 @@ CheckSendProof::Request::toJson() const const CheckSendProof::Request& value = *this; QVariantMap json; - RPCAPI_SERIALIZE_FIELD(value, json, send_proof); + RPCAPI_SERIALIZE_FIELD(value, json, sendproof); return json; } diff --git a/src/rpcapi.h b/src/rpcapi.h index 72df1c2..8fc63d1 100644 --- a/src/rpcapi.h +++ b/src/rpcapi.h @@ -430,7 +430,7 @@ struct SendTransaction struct CreateSendProof { - static constexpr char METHOD[] = "create_send_proof"; + static constexpr char METHOD[] = "create_sendproof"; struct Request { @@ -443,7 +443,7 @@ struct CreateSendProof struct Response { - QStringList send_proofs; + QStringList sendproofs; static Response fromJson(const QVariantMap& json); }; @@ -451,11 +451,11 @@ struct CreateSendProof struct CheckSendProof { - static constexpr char METHOD[] = "check_send_proof"; + static constexpr char METHOD[] = "check_sendproof"; struct Request { - QString send_proof; + QString sendproof; QVariantMap toJson() const; }; diff --git a/src/settings.cpp b/src/settings.cpp index 5d158f6..52edef0 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -309,6 +309,12 @@ QString Settings::getRevision() return REVISION; } +/*static*/ +bool Settings::isStableVersion() +{ + return getVersionSuffix() == "stable"; +} + void Settings::restoreDefaultPoolList() { const auto defaultPoolList = getDefaultMiningPoolList(); diff --git a/src/settings.h b/src/settings.h index d3406eb..d5aafeb 100644 --- a/src/settings.h +++ b/src/settings.h @@ -39,6 +39,7 @@ class Settings : public QObject static QString getVersion(); static QString getVersionSuffix(); static QString getRevision(); + static bool isStableVersion(); QSettings::Format getFormat() const; diff --git a/src/version.h b/src/version.h index 233b751..5e1d415 100644 --- a/src/version.h +++ b/src/version.h @@ -4,8 +4,8 @@ namespace WalletGUI { constexpr char VERSION[] = "3.2.0"; -constexpr char VERSION_SUFFIX[] = "beta"; -constexpr char REVISION[] = "20180723"; +constexpr char VERSION_SUFFIX[] = "stable"; +constexpr char REVISION[] = "20180802"; } diff --git a/src/walletdparamsdialog.ui b/src/walletdparamsdialog.ui index cd1f72d..70ac2ae 100644 --- a/src/walletdparamsdialog.ui +++ b/src/walletdparamsdialog.ui @@ -34,7 +34,7 @@ IBeamCursor - <html><head/><body><p>Options:<br/>--data-folder=&lt;fullpath&gt; Folder for wallet cache, blockchain, logs and peer DB. [default: see documentation]<br/>--bytecoind-remote-address=&lt;ip:port&gt; Connect to remote bytecoind and suppress running built-in bytecoind.<br/>--bytecoind-authorization=&lt;usr:pass&gt; HTTP basic authentication credentials for RPC API.</span><br/>--testnet Configure for testnet.</p><p>Options for built-in bytecoind (run when no --bytecoind-remote-address specified):<br/>--allow-local-ip Allow local IPs to be added to peer list (mostly for debug purposes).</span><br/>--p2p-bind-address=&lt;ip:port&gt; IP and port for P2P network protocol [default: 0.0.0.0:8080].</span><br/>--p2p-external-port=&lt;port&gt; External port for P2P network protocol, if port forwarding used with NAT [default: 8080].<br/>--bytecoind-bind-address=&lt;ip:port&gt; IP and port for bytecoind RPC [default: 127.0.0.1:8081].</span><br/>--seed-node-address=&lt;ip:port&gt; Specify list (one or more) of nodes to start connecting to.<br/>--priority-node-address=&lt;ip:port&gt; Specify list (one or more) of nodes to connect to and attempt to keep the connection open.<br/>--exclusive-node-address=&lt;ip:port&gt; Specify list (one or more) of nodes to connect to only. All other nodes including seed nodes will be ignored.</p></body></html> + <html><head/><body><p>Options:<br/>--data-folder=&lt;fullpath&gt; Folder for wallet cache, blockchain, logs and peer DB. [default: see documentation]<br/>--bytecoind-remote-address=&lt;ip:port&gt; Connect to remote bytecoind and suppress running built-in bytecoind.<br/>--bytecoind-authorization=&lt;usr:pass&gt; HTTP basic authentication credentials for RPC API.<br/>--testnet Configure for testnet.</p><p>Options for built-in bytecoind (run when no --bytecoind-remote-address specified):<br/>--p2p-bind-address=&lt;ip:port&gt; IP and port for P2P network protocol [default: 0.0.0.0:8080].<br/>--p2p-external-port=&lt;port&gt; External port for P2P network protocol, if port forwarding used with NAT [default: 8080].<br/>--bytecoind-bind-address=&lt;ip:port&gt; IP and port for bytecoind RPC [default: 127.0.0.1:8081].<br/>--seed-node-address=&lt;ip:port&gt; Specify list (one or more) of nodes to start connecting to.<br/>--priority-node-address=&lt;ip:port&gt; Specify list (one or more) of nodes to connect to and attempt to keep the connection open.<br/>--exclusive-node-address=&lt;ip:port&gt; Specify list (one or more) of nodes to connect to only. All other nodes including seed nodes will be ignored.</p></body></html> Qt::TextSelectableByMouse