Merge pull request #17 from carsenk/dev

v1.0.4.0

Makefile

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: Denarius
-# Generated by qmake (2.01a) (Qt 4.8.6) on: Mon Jul 17 14:39:05 2017
+# Generated by qmake (2.01a) (Qt 4.8.6) on: Mon Jul 31 14:04:20 2017
 # Project:  denarius-qt.pro
 # Template: app
 # Command: c:\Qt\4.8.6\bin\qmake.exe USE_QRCODE=1 USE_UPNP=- -o Makefile denarius-qt.pro

README.md

@@ -37,7 +37,8 @@ Technology
 LINKS
 ==========================
 * Official Website(https://denarius.io/)
-* My Twitter(https://twitter.com/carsenjk)
+* Official Forums(https://denariustalk.org/)
+* Denarius Twitter(https://twitter.com/denariuscoin)
 
 
 Development process

denarius-qt.pro

@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = Denarius
-VERSION = 1.0.3
-INCLUDEPATH += src src/json src/qt src/tor src/qt/plugins/mrichtexteditor
+VERSION = 1.0.4
+INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
 CONFIG += no_include_pwd
 CONFIG += thread
@@ -30,17 +30,12 @@ greaterThan(QT_MAJOR_VERSION, 4) {
 #LIBPNG_LIB_PATH=C:/deps/libpng-1.6.16/.libs
 #QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4
 #QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs
-#LIBEVENT_INCLUDE_PATH=C:/MinGW/include
-#LIBEVENT_LIB_PATH=C:/MinGW/lib
-#LIBEVENT_LIB_PATH=C:/deps/libevent/.libs
 
 # OSX Dep Libraries, uncomment line 38 through 53 to compile OSX
 #MINIUPNPC_LIB_PATH=/usr/local/opt/miniupnpc/lib
 #MINIUPNPC_INCLUDE_PATH=/usr/local/opt/miniupnpc/include
 #OPENSSL_LIB_PATH=/usr/local/opt/openssl/lib
 #OPENSSL_INCLUDE_PATH=/usr/local/opt/openssl/include
-#LIBEVENT_LIB_PATH=/usr/local/opt/libevent/lib
-#LIBEVENT_INCLUDE_PATH=/usr/local/opt/libevent/include
 #BDB_LIB_PATH=/usr/local/opt/berkeley-db@4/lib
 #BDB_INCLUDE_PATH=/usr/local/opt/berkeley-db@4/include
 #BOOST_LIB_PATH=/usr/local/opt/boost/lib/
@@ -376,87 +371,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/scrypt-x86_64.S \
     src/scrypt.cpp \
     src/pbkdf2.cpp \
-    src/stealth.cpp 
-
-### DNR sources
-SOURCES += src/tor/anonymize.cpp \
-    src/tor/address.c \
-    src/tor/addressmap.c \
-    src/tor/aes.c \
-    src/tor/backtrace.c \
-    src/tor/buffers.c \
-    src/tor/channel.c \
-    src/tor/channeltls.c \
-    src/tor/circpathbias.c \
-    src/tor/circuitbuild.c \
-    src/tor/circuitlist.c \
-    src/tor/circuitmux.c \
-    src/tor/circuitmux_ewma.c \
-    src/tor/circuitstats.c \
-    src/tor/circuituse.c \
-    src/tor/command.c \
-    src/tor/compat.c \
-    src/tor/compat_libevent.c \
-    src/tor/config.c \
-    src/tor/config_codedigest.c \
-    src/tor/confparse.c \
-    src/tor/connection.c \
-    src/tor/connection_edge.c \
-    src/tor/connection_or.c \
-    src/tor/container.c \
-    src/tor/control.c \
-    src/tor/cpuworker.c \
-    src/tor/crypto.c \
-    src/tor/crypto_curve25519.c \
-    src/tor/crypto_format.c \
-    src/tor/curve25519-donna.c \
-    src/tor/di_ops.c \
-    src/tor/directory.c \
-    src/tor/dirserv.c \
-    src/tor/dirvote.c \
-    src/tor/dns.c \
-    src/tor/dnsserv.c \
-    src/tor/entrynodes.c \
-    src/tor/ext_orport.c \
-    src/tor/fp_pair.c \
-    src/tor/geoip.c \
-    src/tor/hibernate.c \
-    src/tor/log.c \
-    src/tor/memarea.c \
-    src/tor/mempool.c \
-    src/tor/microdesc.c \
-    src/tor/networkstatus.c \
-    src/tor/nodelist.c \
-    src/tor/onion.c \
-    src/tor/onion_fast.c \
-    src/tor/onion_main.c \
-    src/tor/onion_ntor.c \
-    src/tor/onion_tap.c \
-    src/tor/policies.c \
-    src/tor/procmon.c \
-    src/tor/reasons.c \
-    src/tor/relay.c \
-    src/tor/rendclient.c \
-    src/tor/rendcommon.c \
-    src/tor/rendmid.c \
-    src/tor/rendservice.c \
-    src/tor/rephist.c \
-    src/tor/replaycache.c \
-    src/tor/router.c \
-    src/tor/routerlist.c \
-    src/tor/routerparse.c \
-    src/tor/routerset.c \
-    src/tor/sandbox.c \
-    src/tor/statefile.c \
-    src/tor/status.c \
-    src/tor/strlcat.c \
-    src/tor/strlcpy.c \
-    src/tor/tor_util.c \
-    src/tor/torgzip.c \
-    src/tor/tortls.c \
-    src/tor/transports.c \
-    src/tor/util_codedigest.c \
-
+    src/stealth.cpp
 
 #### DNR sources
 
@@ -578,10 +493,9 @@ macx:QMAKE_RPATHDIR = @executable_path/../Frameworks
 
 
 # Set libraries and includes at end, to use platform-defined defaults if not overridden
-INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH $$LIBEVENT_INCLUDE_PATH
-LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,) $$join(LIBEVENT_LIB_PATH,,-L,)
+INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
+LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
 LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
-LIBS += -levent -lz
 
 # -lgdi32 has to happen after -lcrypto (see  #681)
 windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32

doc/README

@@ -1,6 +1,6 @@
-ShadowCoin
+Denarius
 
-Copyright (c) 2014 ShadowCoin Developers
+Copyright (c) 2017 Denarius Developers
 Copyright (c) 2014 BlackCoin Developers
 Copyright (c) 2013 NovaCoin Developers
 Copyright (c) 2011-2012 PPCoin Developers
@@ -13,8 +13,8 @@ cryptographic software written by Eric Young ([email protected]).
 
 Intro
 -----
-ShadowCoin is a free open source project derived from Bitcoin, with
-the goal of providing a long-term energy-efficient scrypt-based crypto-currency.
+Denarius is a free open source project derived from Bitcoin, with
+the goal of providing a long-term energy-efficient Tribus-based crypto-currency.
 Built on the foundation of Bitcoin, PPCoin, NovaCoin and BlackCoin, innovations such as proof-of-stake
 help further advance the field of crypto-currency.
 

doc/README_windows.txt

@@ -1,6 +1,6 @@
-ShadowCoin
+Denarius
 
-Copyright (c) 2014 ShadowCoin Developers
+Copyright (c) 2017 Denarius Developers
 Copyright (c) 2014 BlackCoin Developers
 Copyright (c) 2013 NovaCoin Developers
 Copyright (c) 2011-2013 PPCoin Developers
@@ -13,8 +13,8 @@ cryptographic software written by Eric Young ([email protected]).
 
 Intro
 -----
-ShadowCoin is a free open source project derived from Bitcoin, with
-the goal of providing a long-term energy-efficient scrypt-based crypto-currency.
+Denarius is a free open source project derived from Bitcoin, with
+the goal of providing a long-term energy-efficient Tribus-based crypto-currency.
 Built on the foundation of Bitcoin, PPCoin, NovaCoin and BlackCoin, innovations such as proof-of-stake
 help further advance the field of crypto-currency.
 

doc/assets-attribution.txt

@@ -54,5 +54,5 @@ Designer: Crobbo (forum)
 Site: https://bitcointalk.org/index.php?topic=32273.0
 License: Public domain
 
-ShadowCoin Logo
+Denarius Logo
 License: Creative Commons Attribution 4.0 International License

doc/build-msw.txt

@@ -7,7 +7,7 @@ cryptographic software written by Eric Young ([email protected]) and UPnP
 software written by Thomas Bernard.
 
 
-See readme-qt.rst for instructions on building ShadowCoin QT, the
+See readme-qt.rst for instructions on building Denarius QT, the
 graphical user interface.
 
 WINDOWS BUILD NOTES
@@ -76,9 +76,9 @@ make -f Makefile.mingw
 mkdir miniupnpc
 cp *.h miniupnpc/
 
-ShadowCoin
+Denarius
 -------
 DOS prompt:
-cd \shadowcoin\src
+cd \denarius\src
 mingw32-make -f makefile.mingw
-strip shadowcoind.exe
+strip denariusd.exe

doc/build-osx.txt

@@ -7,12 +7,12 @@ software written by Eric Young ([email protected]) and UPnP software written by
 Thomas Bernard.
 
 
-Mac OS X shadowcoind build instructions
+Mac OS X denariusd build instructions
 Laszlo Hanyecz <[email protected]>
 Douglas Huff <[email protected]>
 
 
-See readme-qt.rst for instructions on building ShadowCoin QT, the
+See readme-qt.rst for instructions on building Denarius QT, the
 graphical user interface.
 
 Tested on 10.5 and 10.6 intel.  PPC is not supported because it's big-endian.
@@ -39,14 +39,14 @@ sudo port install boost db48 openssl miniupnpc
 Optionally install qrencode (and set USE_QRCODE=1):
 sudo port install qrencode
 
-4.  Now you should be able to build shadowcoind:
+4.  Now you should be able to build denariusd:
 
-cd shadowcoin/src
+cd denarius/src
 make -f makefile.osx
 
 Run:
-  ./shadowcoind --help  # for a list of command-line options.
+  ./denariusd --help  # for a list of command-line options.
 Run
-  ./shadowcoind -daemon # to start the shadowcoin daemon.
+  ./denariusd -daemon # to start the denarius daemon.
 Run
-  ./shadowcoind help # When the daemon is running, to get a list of RPC commands
+  ./denariusd help # When the daemon is running, to get a list of RPC commands

doc/build-unix.txt

@@ -14,10 +14,10 @@ To Build
 --------
 
 cd src/
-make -f makefile.unix            # Headless shadowcoin
+make -f makefile.unix            # Headless denarius
 
-See readme-qt.rst for instructions on building ShadowCoin QT,
-the graphical shadowcoin.
+See readme-qt.rst for instructions on building Denarius QT,
+the graphical denarius.
 
 Dependencies
 ------------
@@ -27,7 +27,6 @@ Dependencies
  libssl       SSL Support       Secure communications
  libdb        Berkeley DB       Blockchain & wallet storage
  libboost     Boost             C++ Library
- libevent     Libevent          Event notification library
  miniupnpc    UPnP Support      Optional firewall-jumping support
  libqrencode  QRCode generation Optional QRCode generation
 
@@ -66,7 +65,6 @@ sudo apt-get install build-essential
 sudo apt-get install libssl-dev
 sudo apt-get install libdb++-dev
 sudo apt-get install libboost-all-dev
-sudo apt-get install libevent-dev
 sudo apt-get install libminiupnpc-dev
 sudo apt-get install libqrencode-dev
 
@@ -81,12 +79,12 @@ emerge -av1 --noreplace boost openssl sys-libs/db
 Take the following steps to build (no UPnP support):
  cd ${SHADOWCOIN_DIR}/src
  make -f makefile.unix USE_UPNP=
- strip shadowcoind
+ strip denariusd
 
 
 Notes
 -----
-The release is built with GCC and then "strip shadowcoind" to strip the debug
+The release is built with GCC and then "strip denariusd" to strip the debug
 symbols, which reduces the executable size by about 90%.
 
 
@@ -116,7 +114,7 @@ sudo su
 
 Security
 --------
-To help make your shadowcoin installation more secure by making certain attacks impossible to
+To help make your denarius installation more secure by making certain attacks impossible to
 exploit even if a vulnerability is found, you can take the following measures:
 
 * Position Independent Executable
@@ -133,21 +131,21 @@ exploit even if a vulnerability is found, you can take the following measures:
     make -f makefile.unix ... -e PIE=1
 
     To test that you have built PIE executable, install scanelf, part of paxutils, and use:
-    scanelf -e ./shadowcoin
+    scanelf -e ./denarius
 
     The output should contain:
      TYPE
     ET_DYN
 
 * Non-executable Stack
     If the stack is executable then trivial stack based buffer overflow exploits are possible if
-    vulnerable buffers are found. By default, shadowcoin should be built with a non-executable stack
+    vulnerable buffers are found. By default, denarius should be built with a non-executable stack
     but if one of the libraries it uses asks for an executable stack or someone makes a mistake
     and uses a compiler extension which requires an executable stack, it will silently build an
     executable without the non-executable stack protection.
 
     To verify that the stack is non-executable after compiling use:
-    scanelf -e ./shadowcoin
+    scanelf -e ./denarius
 
     the output should contain:
     STK/REL/PTL

doc/readme-qt.rst

@@ -1,4 +1,4 @@
-ShadowCoin-qt: Qt5 GUI for ShadowCoin
+Denarius-qt: Qt5 GUI for Denarius
 ===============================
 
 Build instructions
@@ -24,9 +24,9 @@ then execute the following:
     qmake
     make
 
-Alternatively, install Qt Creator and open the `shadowcoin-qt.pro` file.
+Alternatively, install Qt Creator and open the `denarius-qt.pro` file.
 
-An executable named `shadowcoin-qt` will be built.
+An executable named `denarius-qt` will be built.
 
 
 Windows
@@ -69,7 +69,7 @@ Build configuration options
 UPNnP port forwarding
 ---------------------
 
-To use UPnP for port forwarding behind a NAT router (recommended, as more connections overall allow for a faster and more stable shadowcoin experience), pass the following argument to qmake:
+To use UPnP for port forwarding behind a NAT router (recommended, as more connections overall allow for a faster and more stable denarius experience), pass the following argument to qmake:
 
 ::
 
@@ -117,9 +117,9 @@ flag to qmake to control this:
 Berkely DB version warning
 ==========================
 
-A warning for people using the *static binary* version of ShadowCoin on a Linux/UNIX-ish system (tl;dr: **Berkely DB databases are not forward compatible**).
+A warning for people using the *static binary* version of Denarius on a Linux/UNIX-ish system (tl;dr: **Berkely DB databases are not forward compatible**).
 
-The static binary version of ShadowCoin is linked against libdb 5.0 (see also `this Debian issue`_).
+The static binary version of Denarius is linked against libdb 5.0 (see also `this Debian issue`_).
 
 Now the nasty thing is that databases from 5.X are not compatible with 4.X.
 
@@ -134,7 +134,7 @@ Ubuntu 11.10 warning
 ====================
 
 Ubuntu 11.10 has a package called 'qt-at-spi' installed by default.  At the time of writing, having that package
-installed causes shadowcoin-qt to crash intermittently.  The issue has been reported as `launchpad bug 857790`_, but
+installed causes denarius-qt to crash intermittently.  The issue has been reported as `launchpad bug 857790`_, but
 isn't yet fixed.
 
 Until the bug is fixed, you can remove the qt-at-spi package to work around the problem, though this will presumably

src/bitcoinrpc.cpp

@@ -243,6 +243,7 @@ static const CRPCCommand vRPCCommands[] =
     { "getblockcount",          &getblockcount,          true,   false },
     { "getconnectioncount",     &getconnectioncount,     true,   false },
     { "getpeerinfo",            &getpeerinfo,            true,   false },
+	{ "addnode",                &addnode,                true,   true },
     { "getdifficulty",          &getdifficulty,          true,   false },
     { "getinfo",                &getinfo,                true,   false },
     { "getsubsidy",             &getsubsidy,             true,   false },

src/bitcoinrpc.h

@@ -146,6 +146,7 @@ extern std::vector<unsigned char> ParseHexO(const json_spirit::Object& o, std::s
 
 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);
+extern json_spirit::Value addnode(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value dumpwallet(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value importwallet(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value dumpprivkey(const json_spirit::Array& params, bool fHelp); // in rpcdump.cpp