Skip to content

Commit

Permalink
Add a batch of release v2.0.0 commits
Browse files Browse the repository at this point in the history
  • Loading branch information
developer-at-bcn committed Mar 21, 2018
1 parent fc372cc commit b95927f
Show file tree
Hide file tree
Showing 131 changed files with 2,109 additions and 1,549 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ set(SOURCES
src/MinerModel.cpp
src/MiningFrame.cpp
src/MiningManager.cpp
src/PoolHeaderView.cpp
src/connectselectiondialog.cpp
src/walletd.cpp
src/rpcapi.cpp
Expand All @@ -76,6 +75,9 @@ set(SOURCES
src/importkeydialog.cpp
src/questiondialog.cpp
src/PoolTreeView.cpp
src/createproofdialog.cpp
src/checkproofdialog.cpp
src/walletdparamsdialog.cpp

)

Expand Down
9 changes: 8 additions & 1 deletion ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
## Release Notes

### v.2.0.0-beta-20180219
### v2.0.0

- Added creating send proofs.
- Added checking send proofs.
- Added wallet daemon parameters window.
- Added bytecoind status in the status bar.

### v2.0.0-beta-20180219

- Added importing keys.
- Fixed stealing focus.
Expand Down
16 changes: 8 additions & 8 deletions Windows Installer/Installer.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -1391,7 +1391,7 @@
}
"{3C67513D-01DD-4637-8A68-80971EB9504F}:_BB6FE95E6903428FBAEC9FE62CB0FE39"
{
"DefaultLocation" = "8:[ProgramFilesFolder][ProductName]"
"DefaultLocation" = "8:[ProgramFiles64Folder][ProductName]"
"Name" = "8:#1925"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
Expand Down Expand Up @@ -1483,23 +1483,23 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Bytecoin"
"ProductCode" = "8:{8589E67D-599D-4959-B521-1F10908FA3F5}"
"PackageCode" = "8:{97B81D4E-0610-41F0-9D01-CDECD35E90F1}"
"ProductCode" = "8:{0D485391-2605-4122-9735-D21D26FCD025}"
"PackageCode" = "8:{1BB8055F-FB3F-411B-8DEF-18C6BF9D8BE1}"
"UpgradeCode" = "8:{DC5C7D60-BB08-4B97-B634-E87679CCEB3C}"
"AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:2.0.0"
"ProductVersion" = "8:18.3.20"
"Manufacturer" = "8:Bytecoin Developers"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
"Title" = "8:Bytecoin Beta Installer"
"Title" = "8:Bytecoin 3.0.0 Installer"
"Subject" = "8:"
"ARPCONTACT" = "8:Bytecoin Developers"
"Keywords" = "8:"
"ARPCOMMENTS" = "8:Beta version of new bytecoin from 19 February 2018"
"ARPCOMMENTS" = "8:Release version of bytecoin from 20 March 2018"
"ARPURLINFOABOUT" = "8:https://bytecoin.org"
"ARPPRODUCTICON" = "8:_ABCF8F071D16461785EDF6D56ED2ABCE"
"ARPIconIndex" = "3:0"
Expand Down Expand Up @@ -1706,7 +1706,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:WARNING: This is Beta (pre-release) version of new bytecoin core and GUI wallet from 2018/02/19. Proceed with caution."
"Value" = "8:Release version 3.0.0 of bytecoin core and GUI wallet from 2018/03/20."
"DefaultValue" = "8:#1202"
"UsePlugInResources" = "11:TRUE"
}
Expand Down Expand Up @@ -1945,7 +1945,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:WARNING: This is Beta (pre-release) version of new bytecoin core and GUI wallet from 2018/02/19. Proceed with caution."
"Value" = "8:Release version 3.0.0 of bytecoin core and GUI wallet from 2018/03/20."
"DefaultValue" = "8:#1202"
"UsePlugInResources" = "11:TRUE"
}
Expand Down
12 changes: 6 additions & 6 deletions Windows Installer/Installer32.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -1483,23 +1483,23 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Bytecoin"
"ProductCode" = "8:{8589E67D-599D-4959-B521-1F10908FA3F5}"
"PackageCode" = "8:{27B3D69D-6186-4724-84CD-2C5627792B8D}"
"ProductCode" = "8:{C7A0F50F-34A0-45A7-9271-53017B6C61AB}"
"PackageCode" = "8:{3136530C-C2B2-41C4-86BD-FCDA2B0B2AFB}"
"UpgradeCode" = "8:{DC5C7D60-BB08-4B97-B634-E87679CCEB3C}"
"AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:2.0.0"
"ProductVersion" = "8:18.3.15"
"Manufacturer" = "8:Bytecoin Developers"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
"Title" = "8:Bytecoin Beta Installer"
"Subject" = "8:"
"ARPCONTACT" = "8:Bytecoin Developers"
"Keywords" = "8:"
"ARPCOMMENTS" = "8:Beta version of new bytecoin from 19 February 2018"
"ARPCOMMENTS" = "8:Beta version of new bytecoin from 15 March 2018"
"ARPURLINFOABOUT" = "8:https://bytecoin.org"
"ARPPRODUCTICON" = "8:_ABCF8F071D16461785EDF6D56ED2ABCE"
"ARPIconIndex" = "3:0"
Expand Down Expand Up @@ -1706,7 +1706,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:WARNING: This is Beta (pre-release) version of new bytecoin core and GUI wallet from 2018/02/19. Proceed with caution."
"Value" = "8:WARNING: This is Beta (pre-release) version of new bytecoin core and GUI wallet from 2018/03/15. Proceed with caution."
"DefaultValue" = "8:#1202"
"UsePlugInResources" = "11:TRUE"
}
Expand Down Expand Up @@ -1945,7 +1945,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:WARNING: This is Beta (pre-release) version of new bytecoin core and GUI wallet from 2018/02/19. Proceed with caution."
"Value" = "8:WARNING: This is Beta (pre-release) version of new bytecoin core and GUI wallet from 2018/03/15. Proceed with caution."
"DefaultValue" = "8:#1202"
"UsePlugInResources" = "11:TRUE"
}
Expand Down
18 changes: 2 additions & 16 deletions src/IMinerWorker.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
// Copyright (c) 2015-2017, The Bytecoin developers
//
// This file is part of Bytecoin.
//
// Bytecoin is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Bytecoin is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with Bytecoin. If not, see <http://www.gnu.org/licenses/>.
// Copyright (c) 2015-2018, The Bytecoin developers.
// Licensed under the GNU Lesser General Public License. See LICENSE for details.

#pragma once

Expand Down
18 changes: 2 additions & 16 deletions src/IMiningManager.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
// Copyright (c) 2015-2017, The Bytecoin developers
//
// This file is part of Bytecoin.
//
// Bytecoin is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Bytecoin is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with Bytecoin. If not, see <http://www.gnu.org/licenses/>.
// Copyright (c) 2015-2018, The Bytecoin developers.
// Licensed under the GNU Lesser General Public License. See LICENSE for details.

#pragma once

Expand Down
18 changes: 2 additions & 16 deletions src/IPoolClient.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
// Copyright (c) 2015-2017, The Bytecoin developers
//
// This file is part of Bytecoin.
//
// Bytecoin is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Bytecoin is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with Bytecoin. If not, see <http://www.gnu.org/licenses/>.
// Copyright (c) 2015-2018, The Bytecoin developers.
// Licensed under the GNU Lesser General Public License. See LICENSE for details.

#pragma once

Expand Down
18 changes: 2 additions & 16 deletions src/IPoolMiner.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
// Copyright (c) 2015-2017, The Bytecoin developers
//
// This file is part of Bytecoin.
//
// Bytecoin is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Bytecoin is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with Bytecoin. If not, see <http://www.gnu.org/licenses/>.
// Copyright (c) 2015-2018, The Bytecoin developers.
// Licensed under the GNU Lesser General Public License. See LICENSE for details.

#pragma once

Expand Down
27 changes: 26 additions & 1 deletion src/JsonRpc/JsonRpcClient.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) 2015-2018, The Bytecoin developers.
// Licensed under the GNU Lesser General Public License. See LICENSE for details.

#include <QAuthenticator>

#include "JsonRpcClient.h"
Expand Down Expand Up @@ -141,7 +144,7 @@ void Client::replyFinished(QNetworkReply* reply)
if (!jsonDocument.isObject())
{
qDebug("[JsonRpcClient] JSON document is not an object.");
emit jsonParsingError("JSON document is not an object.");
emit jsonParsingError(tr("JSON document is not an object."));
return;
}
const QJsonObject json = jsonDocument.object();
Expand Down Expand Up @@ -274,6 +277,18 @@ void WalletClient::sendSendTx(const RpcApi::SendTransaction::Request& req)
insertResponseHandler(requestID, std::bind(&WalletClient::sendTxHandler, this, _1));
}

void WalletClient::sendCreateProof(const RpcApi::CreateSendProof::Request& req)
{
const QString requestID = sendRequest(RpcApi::CreateSendProof::METHOD, req.toJson());
insertResponseHandler(requestID, std::bind(&WalletClient::proofsHandler, this, _1));
}

void WalletClient::sendCheckProof(const RpcApi::CheckSendProof::Request& req)
{
const QString requestID = sendRequest(RpcApi::CheckSendProof::METHOD, req.toJson());
insertResponseHandler(requestID, std::bind(&WalletClient::checkProofHandler, this, _1));
}

void WalletClient::statusHandler(const QVariantMap& result) const
{
emit statusReceived(RpcApi::Status::fromJson(result));
Expand Down Expand Up @@ -313,6 +328,16 @@ void WalletClient::viewKeyHandler(const QVariantMap& result) const
emit viewKeyReceived(RpcApi::ViewKey::fromJson(result));
}

void WalletClient::proofsHandler(const QVariantMap &result) const
{
emit proofsReceived(RpcApi::Proofs::fromJson(result));
}

void WalletClient::checkProofHandler(const QVariantMap& result) const
{
emit checkProofReceived(RpcApi::ProofCheck::fromJson(result));
}


//#undef CHECK_CONVERTIBLE

Expand Down
9 changes: 9 additions & 0 deletions src/JsonRpc/JsonRpcClient.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) 2015-2018, The Bytecoin developers.
// Licensed under the GNU Lesser General Public License. See LICENSE for details.

#pragma once

#include <functional>
Expand Down Expand Up @@ -86,6 +89,8 @@ class WalletClient : public Client
void sendGetViewKey();
void sendCreateTx(const RpcApi::CreateTransaction::Request& req);
void sendSendTx(const RpcApi::SendTransaction::Request& req);
void sendCreateProof(const RpcApi::CreateSendProof::Request& req);
void sendCheckProof(const RpcApi::CheckSendProof::Request& req);

signals:
void statusReceived(const RpcApi::Status& result) const;
Expand All @@ -96,6 +101,8 @@ class WalletClient : public Client
void unspentReceived(const RpcApi::Unspents& result) const;
void createTxReceived(const RpcApi::CreatedTx& result) const;
void sendTxReceived(const RpcApi::SentTx& result) const;
void proofsReceived(const RpcApi::Proofs& result) const;
void checkProofReceived(const RpcApi::ProofCheck& result) const;

private:
void statusHandler(const QVariantMap& result) const;
Expand All @@ -106,6 +113,8 @@ class WalletClient : public Client
// void unspentHandler(const QVariantMap& result) const;
void createTxHandler(const QVariantMap& result) const;
void sendTxHandler(const QVariantMap& result) const;
void proofsHandler(const QVariantMap& result) const;
void checkProofHandler(const QVariantMap& result) const;
};

//class StratumClient : public Client
Expand Down
18 changes: 2 additions & 16 deletions src/JsonRpc/JsonRpcNotification.cpp
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
// Copyright (c) 2015-2017, The Bytecoin developers
//
// This file is part of Bytecoin.
//
// Bytecoin is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Bytecoin is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with Bytecoin. If not, see <http://www.gnu.org/licenses/>.
// Copyright (c) 2015-2018, The Bytecoin developers.
// Licensed under the GNU Lesser General Public License. See LICENSE for details.

#include <QJsonArray>
#include <QJsonDocument>
Expand Down
18 changes: 2 additions & 16 deletions src/JsonRpc/JsonRpcNotification.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
// Copyright (c) 2015-2017, The Bytecoin developers
//
// This file is part of Bytecoin.
//
// Bytecoin is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Bytecoin is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with Bytecoin. If not, see <http://www.gnu.org/licenses/>.
// Copyright (c) 2015-2018, The Bytecoin developers.
// Licensed under the GNU Lesser General Public License. See LICENSE for details.

#pragma once

Expand Down
18 changes: 2 additions & 16 deletions src/JsonRpc/JsonRpcObject.cpp
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
// Copyright (c) 2015-2017, The Bytecoin developers
//
// This file is part of Bytecoin.
//
// Bytecoin is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Bytecoin is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with Bytecoin. If not, see <http://www.gnu.org/licenses/>.
// Copyright (c) 2015-2018, The Bytecoin developers.
// Licensed under the GNU Lesser General Public License. See LICENSE for details.

#include <QJsonDocument>

Expand Down
18 changes: 2 additions & 16 deletions src/JsonRpc/JsonRpcObject.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
// Copyright (c) 2015-2017, The Bytecoin developers
//
// This file is part of Bytecoin.
//
// Bytecoin is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Bytecoin is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with Bytecoin. If not, see <http://www.gnu.org/licenses/>.
// Copyright (c) 2015-2018, The Bytecoin developers.
// Licensed under the GNU Lesser General Public License. See LICENSE for details.

#pragma once

Expand Down
Loading

0 comments on commit b95927f

Please sign in to comment.