From 1de4b2cd8f31de6ea417c49aeadc83a0ef935baa Mon Sep 17 00:00:00 2001 From: Lefteris Karapetsas Date: Tue, 11 Aug 2015 13:54:43 +0200 Subject: [PATCH 1/5] Wording for MIT license and external contributors --- LICENSE => GPLV3_LICENSE | 0 LICENCE | 21 +++++++++++++++++++++ README.md | 12 +++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) rename LICENSE => GPLV3_LICENSE (100%) create mode 100644 LICENCE diff --git a/LICENSE b/GPLV3_LICENSE similarity index 100% rename from LICENSE rename to GPLV3_LICENSE diff --git a/LICENCE b/LICENCE new file mode 100644 index 000000000..c42a6c8e9 --- /dev/null +++ b/LICENCE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md index 1446e14da..f79257a15 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,20 @@ See [TODO](https://github.com/ethereum/cpp-ethereum/wiki/TODO) ### License -See [LICENSE](LICENSE) +All new contributions are under the [MIT license](http://opensource.org/licenses/MIT). +See [LICENSE](LICENSE). Some old contributions are under the [GPLv3 license](http://www.gnu.org/licenses/gpl-3.0.en.html). See [GPLV3_LICENSE](GPLV3_LICENSE). ### Contributing +All new contributions are added under the MIT License. Please refer to the `LICENCSE` file in the root directory. +To state that you accept this fact for all of your PRs please add yourself to the list of external contributors +like in the example below. + +#### External Contributors +- *Name Surname* (**email@domain**) + +#### Contribution guideline + All development goes in develop branch - please don't submit pull requests to master. Please read [CodingStandards.txt](CodingStandards.txt) thoroughly before making alterations to the code base. Please do *NOT* use an editor that automatically reformats whitespace away from astylerc or the formatting guidelines as described in [CodingStandards.txt](CodingStandards.txt). From 7d37d302f601cbd6239acb61deb4c72037025a60 Mon Sep 17 00:00:00 2001 From: Lefteris Karapetsas Date: Tue, 11 Aug 2015 14:12:09 +0200 Subject: [PATCH 2/5] Remind contributors to add to @author --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index f79257a15..fc1effcec 100644 --- a/README.md +++ b/README.md @@ -53,10 +53,15 @@ To state that you accept this fact for all of your PRs please add yourself to th like in the example below. #### External Contributors +I hereby place all my contributions in this file under an MIT +licence, as specified [here](http://opensource.org/licenses/MIT). - *Name Surname* (**email@domain**) #### Contribution guideline +Please add yourself in the `@author` section of the file your are adding/editing +with the same wording as the one you listed yourself in the external contributors section above. + All development goes in develop branch - please don't submit pull requests to master. Please read [CodingStandards.txt](CodingStandards.txt) thoroughly before making alterations to the code base. Please do *NOT* use an editor that automatically reformats whitespace away from astylerc or the formatting guidelines as described in [CodingStandards.txt](CodingStandards.txt). From 0e2753319b0354b7561fcc9a672b4ef9a150482c Mon Sep 17 00:00:00 2001 From: Lefteris Karapetsas Date: Tue, 11 Aug 2015 15:03:57 +0200 Subject: [PATCH 3/5] Some readme disambiguations --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index fc1effcec..09e2ccb39 100644 --- a/README.md +++ b/README.md @@ -48,19 +48,19 @@ See [LICENSE](LICENSE). Some old contributions are under the [GPLv3 license](htt ### Contributing -All new contributions are added under the MIT License. Please refer to the `LICENCSE` file in the root directory. -To state that you accept this fact for all of your PRs please add yourself to the list of external contributors -like in the example below. +All new contributions are added under the MIT License. Please refer to the `LICENSE` file in the root directory. +To state that you accept this fact for all of your contributions please add yourself to the list of external contributors like in the example below. #### External Contributors -I hereby place all my contributions in this file under an MIT +I hereby place all my contributions in this codebase under an MIT licence, as specified [here](http://opensource.org/licenses/MIT). - *Name Surname* (**email@domain**) #### Contribution guideline -Please add yourself in the `@author` section of the file your are adding/editing -with the same wording as the one you listed yourself in the external contributors section above. +Please add yourself in the `@author` doxygen section of the file your are adding/editing +with the same wording as the one you listed yourself in the external contributors section above, +only replacing the word **contribution** by **file** All development goes in develop branch - please don't submit pull requests to master. From e9840bdfaf788f1dcb497817a081433a9cdd130e Mon Sep 17 00:00:00 2001 From: Lefteris Karapetsas Date: Wed, 12 Aug 2015 14:40:53 +0200 Subject: [PATCH 4/5] typo in LICENSE file name --- LICENCE => LICENSE | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENCE => LICENSE (100%) diff --git a/LICENCE b/LICENSE similarity index 100% rename from LICENCE rename to LICENSE From bc5196445a09c5eb092e800be8b0ef789ca2f5de Mon Sep 17 00:00:00 2001 From: arkpar Date: Wed, 12 Aug 2015 16:14:51 +0200 Subject: [PATCH 5/5] fixed transaction creating for a new state --- libethereum/EthereumPeer.cpp | 2 +- mix/ClientModel.cpp | 3 +++ mix/qml/BlockChain.qml | 4 ++-- mix/qml/ScenarioLoader.qml | 3 ++- mix/qml/StructView.qml | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libethereum/EthereumPeer.cpp b/libethereum/EthereumPeer.cpp index 4450a3d56..947041db9 100644 --- a/libethereum/EthereumPeer.cpp +++ b/libethereum/EthereumPeer.cpp @@ -63,7 +63,7 @@ EthereumPeer::~EthereumPeer() { if (m_asking != Asking::Nothing) { - cnote << "Peer aborting while being asked for " << ::toString(m_asking); + clog(NetAllDetail) << "Peer aborting while being asked for " << ::toString(m_asking); setRude(); } abortSync(); diff --git a/mix/ClientModel.cpp b/mix/ClientModel.cpp index 7a51c99f7..7ab6c5858 100644 --- a/mix/ClientModel.cpp +++ b/mix/ClientModel.cpp @@ -444,7 +444,10 @@ void ClientModel::executeSequence(vector const& _sequence) { auto contractAddressIter = m_contractAddresses.find(ctrInstance); if (contractAddressIter == m_contractAddresses.end()) + { emit runFailed("Contract '" + transaction.contractId + tr(" not deployed.") + "' " + tr(" Cannot call ") + transaction.functionId); + break; + } callAddress(contractAddressIter->second, encoder.encodedData(), transaction); } m_gasCosts.append(m_client->lastExecution().gasUsed); diff --git a/mix/qml/BlockChain.qml b/mix/qml/BlockChain.qml index 69d42799c..e13b871dd 100644 --- a/mix/qml/BlockChain.qml +++ b/mix/qml/BlockChain.qml @@ -492,7 +492,7 @@ ColumnLayout { ScenarioButton { id: addBlockBtn - text: qsTr("Add Block..") + text: qsTr("Add Block...") anchors.left: addTransaction.right roundLeft: false roundRight: true @@ -609,7 +609,7 @@ ColumnLayout { ScenarioButton { id: newAccount - text: qsTr("New Account..") + text: qsTr("New Account...") onClicked: { var ac = projectModel.stateListModel.newAccount("O", QEther.Wei) model.accounts.push(ac) diff --git a/mix/qml/ScenarioLoader.qml b/mix/qml/ScenarioLoader.qml index c4ce19af0..f47296514 100644 --- a/mix/qml/ScenarioLoader.qml +++ b/mix/qml/ScenarioLoader.qml @@ -294,8 +294,9 @@ ColumnLayout projectModel.stateListModel.appendState(item) projectModel.stateListModel.save() scenarioList.currentIndex = projectModel.stateListModel.count - 1 + clientModel.setupScenario(item); } - text: qsTr("New..") + text: qsTr("New...") roundRight: true roundLeft: false } diff --git a/mix/qml/StructView.qml b/mix/qml/StructView.qml index bc3f9499e..97c2d27b8 100644 --- a/mix/qml/StructView.qml +++ b/mix/qml/StructView.qml @@ -12,6 +12,7 @@ Column property int blockIndex property int transactionIndex property string context + property bool readOnly Layout.fillWidth: true spacing: 0 property int colHeight @@ -26,7 +27,7 @@ Column Repeater { id: repeater - visible: model.length > 0 + visible: members.length > 0 RowLayout { id: row