Merge remote-tracking branch 'cryptonotewallet/master'

AlbertWerner · Apr 30, 2015 · b4afaa6 · b4afaa6
2 parents cd97952 + 5a886fd
commit b4afaa6
Show file tree

Hide file tree

Showing 63 changed files with 88 additions and 115 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,33 @@
+**1. Clone wallet sources**
+
+```
+git clone https://github.com/cryptonotefoundation/cryptonotewallet.git
+```
+
+**2. Modify `CryptoNoteWallet.cmake`**
+
+```
+set(CN_PROJECT_NAME "furiouscoin")
+set(CN_CURRENCY_DISPLAY_NAME "FuriousCoin")
+set(CN_CURRENCY_TICKER "XFC")
+```
+
+**3. Set symbolic link to coin sources at the same level as `src`. For example:**
+
+```
+ln -s ../cryptonote cryptonote
+```
+
+Alternative way is to create git submodule:
+
+```
+git submodule add https://github.com/cryptonotefoundation/cryptonote.git cryptonote
+```
+
+Replace URL with git remote repository of your coin.
+
+**4. Build**
+
+```
+mkdir build && cd build && cmake .. && make
+```
diff --git a/src/CommandLineParser.cpp b/src/CommandLineParser.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QCoreApplication>
 
 #include <common/util.h>

diff --git a/src/CommandLineParser.h b/src/CommandLineParser.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QCommandLineParser>

diff --git a/src/CryptoNote.cpp b/src/CryptoNote.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "CryptoNote.h"
 #include "cryptonote_core/cryptonote_basic_impl.h"
 #include "cryptonote_core/cryptonote_format_utils.h"

diff --git a/src/CryptoNote.h b/src/CryptoNote.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <functional>

diff --git a/src/CurrencyAdapter.cpp b/src/CurrencyAdapter.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "CurrencyAdapter.h"
 #include "CryptoNoteWalletConfig.h"
 
@@ -39,6 +38,10 @@ QString CurrencyAdapter::getCurrencyTicker() const {
   return WALLET_CURRENCY_TICKER;
 }
 
+quint64 CurrencyAdapter::getMinimumFee() const {
+  return m_currency.minimumFee();
+}
+
 QString CurrencyAdapter::formatAmount(quint64 _amount) const {
   QString result = QString::number(_amount);
   if (result.length() < getNumberOfDecimalPlaces() + 1) {

diff --git a/src/CurrencyAdapter.h b/src/CurrencyAdapter.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QString>
@@ -20,6 +19,7 @@ class CurrencyAdapter {
   QString getCurrencyDisplayName() const;
   QString getCurrencyName() const;
   QString getCurrencyTicker() const;
+  quint64 getMinimumFee() const;
   quintptr getNumberOfDecimalPlaces() const;
   QString formatAmount(quint64 _amount) const;
   quint64 parseAmount(const QString& _amountString) const;

diff --git a/src/NodeAdapter.cpp b/src/NodeAdapter.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QDir>
@@ -111,8 +110,7 @@ CryptoNote::IWallet* NodeAdapter::createWallet() const {
 
 bool NodeAdapter::init() {
   Q_ASSERT(m_node == nullptr);
-  // TODO Insert the right URL for the local daemon
-  QUrl localNodeUrl = QUrl::fromUserInput("127.0.0.1:18999");
+  QUrl localNodeUrl = QUrl::fromUserInput(QString("127.0.0.1:%1").arg(cryptonote::RPC_DEFAULT_PORT));
 
   m_node = createRpcNode(CurrencyAdapter::instance().getCurrency(), *this, localNodeUrl.host().toStdString(), localNodeUrl.port());
 

diff --git a/src/NodeAdapter.h b/src/NodeAdapter.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QObject>

diff --git a/src/Settings.cpp b/src/Settings.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QApplication>
 #include <QFile>
 #include <QJsonDocument>

diff --git a/src/Settings.h b/src/Settings.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDir>

diff --git a/src/SignalHandler.cpp b/src/SignalHandler.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <csignal>
 
 #include "SignalHandler.h"

diff --git a/src/SignalHandler.h b/src/SignalHandler.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QObject>

diff --git a/src/WalletAdapter.cpp b/src/WalletAdapter.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QLocale>

diff --git a/src/WalletAdapter.h b/src/WalletAdapter.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QMutex>

diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "AboutDialog.h"
 #include "CurrencyAdapter.h"
 #include "Settings.h"

diff --git a/src/gui/AboutDialog.h b/src/gui/AboutDialog.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDialog>

diff --git a/src/gui/AddressBookDialog.cpp b/src/gui/AddressBookDialog.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "AddressBookDialog.h"
 #include "AddressBookModel.h"
 

diff --git a/src/gui/AddressBookDialog.h b/src/gui/AddressBookDialog.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDialog>

diff --git a/src/gui/AddressBookFrame.cpp b/src/gui/AddressBookFrame.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QApplication>
 #include <QClipboard>
 

diff --git a/src/gui/AddressBookFrame.h b/src/gui/AddressBookFrame.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QFrame>

diff --git a/src/gui/AddressBookModel.cpp b/src/gui/AddressBookModel.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QFile>
 #include <QJsonDocument>
 #include <QJsonObject>

diff --git a/src/gui/AddressBookModel.h b/src/gui/AddressBookModel.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QAbstractItemModel>

diff --git a/src/gui/AnimatedLabel.cpp b/src/gui/AnimatedLabel.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "AnimatedLabel.h"
 
 namespace WalletGui {

diff --git a/src/gui/AnimatedLabel.h b/src/gui/AnimatedLabel.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QLabel>

diff --git a/src/gui/ChangePasswordDialog.cpp b/src/gui/ChangePasswordDialog.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "ChangePasswordDialog.h"
 
 #include "ui_changepassworddialog.h"

diff --git a/src/gui/ChangePasswordDialog.h b/src/gui/ChangePasswordDialog.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma  once
 
 #include <QDialog>

diff --git a/src/gui/ExitWidget.cpp b/src/gui/ExitWidget.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QMovie>
 
 #include "CurrencyAdapter.h"

diff --git a/src/gui/ExitWidget.h b/src/gui/ExitWidget.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QWidget>

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QCloseEvent>
 #include <QFileDialog>
 #include <QInputDialog>

diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QLabel>

diff --git a/src/gui/MainWindow.mm b/src/gui/MainWindow.mm
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #import <objc/runtime.h>
 #import <Cocoa/Cocoa.h>
 

diff --git a/src/gui/NewAddressDialog.cpp b/src/gui/NewAddressDialog.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "NewAddressDialog.h"
 
 #include "ui_newaddressdialog.h"

diff --git a/src/gui/NewAddressDialog.h b/src/gui/NewAddressDialog.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDialog>

diff --git a/src/gui/NewPasswordDialog.cpp b/src/gui/NewPasswordDialog.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "NewPasswordDialog.h"
 
 #include "ui_newpassworddialog.h"

diff --git a/src/gui/NewPasswordDialog.h b/src/gui/NewPasswordDialog.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDialog>

diff --git a/src/gui/OverviewFrame.cpp b/src/gui/OverviewFrame.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "CurrencyAdapter.h"
 #include "OverviewFrame.h"
 #include "TransactionFrame.h"

diff --git a/src/gui/OverviewFrame.h b/src/gui/OverviewFrame.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QFrame>

diff --git a/src/gui/PasswordDialog.cpp b/src/gui/PasswordDialog.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "PasswordDialog.h"
 
 #include "ui_passworddialog.h"

diff --git a/src/gui/PasswordDialog.h b/src/gui/PasswordDialog.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QDialog>

diff --git a/src/gui/ReceiveFrame.cpp b/src/gui/ReceiveFrame.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include <QClipboard>
 
 #include "ReceiveFrame.h"

diff --git a/src/gui/ReceiveFrame.h b/src/gui/ReceiveFrame.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #pragma once
 
 #include <QFrame>

diff --git a/src/gui/RecentTransactionsModel.cpp b/src/gui/RecentTransactionsModel.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-
 #include "RecentTransactionsModel.h"
 #include "SortedTransactionsModel.h"