Skip to content

Commit

Permalink
Merge pull request #103 from carsenk/v2.5
Browse files Browse the repository at this point in the history 
V2.5
  • Loading branch information
@metaspartan
metaspartan committed Apr 20, 2018
2 parents 6f3c944 + 9ffd1b1 commit 8ded250
Show file tree
Hide file tree
Showing 124 changed files with 2,333 additions and 14,846 deletions.
24 changes: 24 additions & 0 deletions .qmake.stash
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
QMAKE_CXX.INCDIRS = \
/usr/include/c++/7 \
/usr/include/x86_64-linux-gnu/c++/7 \
/usr/include/c++/7/backward \
/usr/lib/gcc/x86_64-linux-gnu/7/include \
/usr/local/include \
/usr/lib/gcc/x86_64-linux-gnu/7/include-fixed \
/usr/include/x86_64-linux-gnu \
/usr/include
QMAKE_CXX.LIBDIRS = \
/usr/lib/gcc/x86_64-linux-gnu/7 \
/usr/lib/x86_64-linux-gnu \
/usr/lib \
/lib/x86_64-linux-gnu \
/lib
QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7
QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 2
QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
QMAKE_CXX.COMPILER_MACROS = \
QT_COMPILER_STDCXX \
QMAKE_GCC_MAJOR_VERSION \
QMAKE_GCC_MINOR_VERSION \
QMAKE_GCC_PATCH_VERSION
29 changes: 6 additions & 23 deletions denarius-qt.pro
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = Denarius
VERSION = 2.0.5.0
VERSION = 2.5.0.0
INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd
Expand All @@ -17,13 +17,13 @@ greaterThan(QT_MAJOR_VERSION, 4) {
}

win32 {
BOOST_LIB_SUFFIX=-mgw49-mt-s-1_55
BOOST_INCLUDE_PATH=C:/deps/boost_1_55_0
BOOST_LIB_PATH=C:/deps/boost_1_55_0/stage/lib
BOOST_LIB_SUFFIX=-mgw49-mt-s-1_57
BOOST_INCLUDE_PATH=C:/deps/boost_1_57_0
BOOST_LIB_PATH=C:/deps/boost_1_57_0/stage/lib
BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix
BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix
OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1j/include
OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1j
OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1l/include
OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1l
MINIUPNPC_INCLUDE_PATH=C:/deps/
MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
LIBPNG_INCLUDE_PATH=C:/deps/libpng-1.6.16
Expand Down Expand Up @@ -224,7 +224,6 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/multisigaddressentry.h \
src/qt/multisiginputentry.h \
src/qt/multisigdialog.h \
src/qt/tradingdialog.h \
src/alert.h \
src/addrman.h \
src/base58.h \
Expand All @@ -241,22 +240,18 @@ HEADERS += src/qt/bitcoingui.h \
src/serialize.h \
src/strlcpy.h \
src/smessage.h \
src/richlistdb.h \
src/richlistdata.h \
src/main.h \
src/core.h \
src/miner.h \
src/net.h \
src/key.h \
src/db.h \
src/txdb.h \
src/txmempool.h \
src/walletdb.h \
src/script.h \
src/stealth.h \
src/darksend.h \
src/activemasternode.h \
src/instantx.h \
src/masternode.h \
src/masternodeconfig.h \
src/spork.h \
Expand Down Expand Up @@ -305,8 +300,6 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/statisticspage.h \
src/qt/marketbrowser.h \
src/qt/qcustomplot.h \
src/qt/richlist.h \
src/qt/darksendconfig.h \
src/qt/masternodemanager.h \
src/qt/addeditadrenalinenode.h \
src/qt/adrenalinenodeconfigdialog.h \
Expand Down Expand Up @@ -355,14 +348,11 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/multisigdialog.cpp \
src/qt/proofofimage.cpp \
src/qt/termsofuse.cpp \
src/qt/tradingdialog.cpp \
src/alert.cpp \
src/base58.cpp \
src/version.cpp \
src/sync.cpp \
src/smessage.cpp \
src/richlistdb.cpp \
src/richlistdata.cpp \
src/util.cpp \
src/netbase.cpp \
src/key.cpp \
Expand All @@ -375,7 +365,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/checkpoints.cpp \
src/addrman.cpp \
src/db.cpp \
src/txmempool.cpp \
src/eccryptoverify.cpp \
src/walletdb.cpp \
src/qt/clientmodel.cpp \
Expand Down Expand Up @@ -417,12 +406,10 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/messagepage.cpp \
src/qt/messagemodel.cpp \
src/qt/qcustomplot.cpp \
src/qt/richlist.cpp \
src/qt/sendmessagesdialog.cpp \
src/qt/sendmessagesentry.cpp \
src/qt/qvalidatedtextedit.cpp \
src/qt/plugins/mrichtexteditor/mrichtextedit.cpp \
src/qt/darksendconfig.cpp \
src/qt/masternodemanager.cpp \
src/qt/addeditadrenalinenode.cpp \
src/qt/adrenalinenodeconfigdialog.cpp \
Expand All @@ -436,7 +423,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/stealth.cpp \
src/darksend.cpp \
src/activemasternode.cpp \
src/instantx.cpp \
src/masternode.cpp \
src/masternodeconfig.cpp \
src/spork.cpp
Expand Down Expand Up @@ -465,10 +451,8 @@ FORMS += \
src/qt/forms/statisticspage.ui \
src/qt/forms/blockbrowser.ui \
src/qt/forms/marketbrowser.ui \
src/qt/forms/richlist.ui \
src/qt/forms/proofofimage.ui \
src/qt/forms/termsofuse.ui \
src/qt/forms/darksendconfig.ui \
src/qt/forms/masternodemanager.ui \
src/qt/forms/addeditadrenalinenode.ui \
src/qt/forms/adrenalinenodeconfigdialog.ui \
Expand All @@ -477,7 +461,6 @@ FORMS += \
src/qt/forms/multisigdialog.ui \
src/qt/forms/sendmessagesentry.ui \
src/qt/forms/sendmessagesdialog.ui \
src/qt/forms/tradingdialog.ui \
src/qt/plugins/mrichtexteditor/mrichtextedit.ui

contains(USE_QRCODE, 1) {
Expand Down
23 changes: 8 additions & 15 deletions src/bitcoinrpc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,17 +325,10 @@ static const CRPCCommand vRPCCommands[] =
{ "scanforalltxns", &scanforalltxns, false, false},
{ "scanforstealthtxns", &scanforstealthtxns, false, false},

/* Dark features */
{ "darksend", &darksend, false, false},
/* Masternode features */
{ "getpoolinfo", &getpoolinfo, true, false},
{ "spork", &spork, true, false},
{ "masternode", &masternode, true, false},
{ "denominate", &denominate, false, false},

/* Rich List */
{ "resetrichlist", &resetrichlist, true, false},
{ "updaterichlist", &updaterichlist, true, false},
{ "getrichlist", &getrichlist, true, false},

{ "smsgenable", &smsgenable, false, false},
{ "smsgdisable", &smsgdisable, false, false},
Expand All @@ -350,11 +343,11 @@ static const CRPCCommand vRPCCommands[] =
{ "smsginbox", &smsginbox, false, false},
{ "smsgoutbox", &smsgoutbox, false, false},
{ "smsgbuckets", &smsgbuckets, false, false},





};

CRPCTable::CRPCTable()
Expand Down Expand Up @@ -1301,6 +1294,7 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri
if (strMethod == "sendfrom" && n > 3) ConvertTo<int64_t>(params[3]);
if (strMethod == "listtransactions" && n > 1) ConvertTo<int64_t>(params[1]);
if (strMethod == "listtransactions" && n > 2) ConvertTo<int64_t>(params[2]);
if (strMethod == "listtransactions" && n > 3) ConvertTo<bool>(params[3]);
if (strMethod == "listaccounts" && n > 0) ConvertTo<int64_t>(params[0]);
if (strMethod == "walletpassphrase" && n > 1) ConvertTo<int64_t>(params[1]);
if (strMethod == "walletpassphrase" && n > 2) ConvertTo<bool>(params[2]);
Expand Down Expand Up @@ -1333,9 +1327,8 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri
if (strMethod == "gettxout" && n == 2) ConvertTo<int64_t>(params[1]);
if (strMethod == "gettxout" && n == 3) { ConvertTo<int64_t>(params[1]); ConvertTo<bool>(params[2]); }
if (strMethod == "importaddress" && n > 2) ConvertTo<bool>(params[2]);

if (strMethod == "sendtostealthaddress" && n > 1) ConvertTo<double>(params[1]);
if (strMethod == "darksend" && n > 1) ConvertTo<double>(params[1]);

if (strMethod == "getpoolinfo" && n > 0) ConvertTo<int64_t>(params[0]);

Expand Down
9 changes: 2 additions & 7 deletions src/bitcoinrpc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ extern void EnsureWalletIsUnlocked();
extern uint256 ParseHashV(const json_spirit::Value& v, std::string strName);
extern uint256 ParseHashO(const json_spirit::Object& o, std::string strKey);
extern std::vector<unsigned char> ParseHexV(const json_spirit::Value& v, std::string strName);
extern std::vector<unsigned char> ParseHexO(const json_spirit::Object& o, std::string strKey);
extern std::vector<unsigned char> ParseHexO(const json_spirit::Object& o, std::string strKey);

extern json_spirit::Value getconnectioncount(const json_spirit::Array& params, bool fHelp); // in rpcnet.cpp
extern json_spirit::Value getpeerinfo(const json_spirit::Array& params, bool fHelp);
Expand Down Expand Up @@ -234,7 +234,7 @@ extern json_spirit::Value clearwallettransactions(const json_spirit::Array& para
extern json_spirit::Value scanforalltxns(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value scanforstealthtxns(const json_spirit::Array& params, bool fHelp);

extern json_spirit::Value darksend(const json_spirit::Array& params, bool fHelp); //rpcdarksend.cpp
//rpcdarksend.cpp
extern json_spirit::Value spork(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value getpoolinfo(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value masternode(const json_spirit::Array& params, bool fHelp);
Expand All @@ -253,9 +253,4 @@ extern json_spirit::Value smsginbox(const json_spirit::Array& params, bool fHelp
extern json_spirit::Value smsgoutbox(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value smsgbuckets(const json_spirit::Array& params, bool fHelp);

extern json_spirit::Value resetrichlist(const json_spirit::Array& params, bool fHelp); // in rpcwallet.cpp
extern json_spirit::Value updaterichlist(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value getrichlist(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value denominate(const json_spirit::Array& params, bool fHelp);

#endif
Loading

0 comments on commit 8ded250

Please sign in to comment.