merged

dashpay · Sep 30, 2014 · e81a47a · e81a47a
2 parents ac4afe6 + 213325e
commit e81a47a
Show file tree

Hide file tree

Showing 73 changed files with 5,643 additions and 846 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ DarkCoin is a lite version of Bitcoin using X11 as a proof-of-work algorithm.
  - Block generation: 2.5 minutes
  - Difficulty Retargets every block using Dark Gravity Wave
  - Est. ~7M Coins in 2015, ~13M in 2020, ~23M in 2030
- - Anonymous blockchain using DarkSend technology (Based on CoinJoin): Beta Testing
+ - Anonymous blockchain using DarkSend technology
 
 For more information, as well as an immediately useable, binary version of
 the DarkCoin client sofware, see http://www.darkcoin.io.

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
@@ -1,3 +1,6 @@
+# Hack around https://bugreports.qt-project.org/browse/QTBUG-22829
+QMAKE_MOC = $$QMAKE_MOC -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+
 TEMPLATE = app
 TARGET = darkcoin-qt
 macx:TARGET = "DarkCoin-Qt"
@@ -160,6 +163,7 @@ HEADERS += src/qt/bitcoingui.h \
     src/uint256.h \
     src/serialize.h \
     src/main.h \
+    src/darksend.h \
     src/net.h \
     src/key.h \
     src/db.h \
@@ -187,6 +191,7 @@ HEADERS += src/qt/bitcoingui.h \
     src/qt/transactiondesc.h \
     src/qt/transactiondescdialog.h \
     src/qt/bitcoinamountfield.h \
+    src/qt/termsofuse.h \
     src/wallet.h \
     src/keystore.h \
     src/qt/transactionfilterproxy.h \
@@ -204,6 +209,7 @@ HEADERS += src/qt/bitcoingui.h \
     src/qt/bitcoinunits.h \
     src/qt/qvaluecombobox.h \
     src/qt/askpassphrasedialog.h \
+    src/qt/darksendconfig.h \
     src/protocol.h \
     src/qt/notificator.h \
     src/qt/paymentserver.h \
@@ -255,6 +261,7 @@ SOURCES += src/qt/bitcoin.cpp \
     src/key.cpp \
     src/script.cpp \
     src/main.cpp \
+    src/darksend.cpp \
     src/init.cpp \
     src/net.cpp \
     src/bloom.cpp \
@@ -271,6 +278,7 @@ SOURCES += src/qt/bitcoin.cpp \
     src/qt/transactiondescdialog.cpp \
     src/qt/bitcoinstrings.cpp \
     src/qt/bitcoinamountfield.cpp \
+    src/qt/termsofuse.cpp \
     src/wallet.cpp \
     src/keystore.cpp \
     src/qt/transactionfilterproxy.cpp \
@@ -280,11 +288,11 @@ SOURCES += src/qt/bitcoin.cpp \
     src/qt/walletstack.cpp \
     src/qt/walletframe.cpp \
     src/bitcoinrpc.cpp \
+    src/rpcdarksend.cpp \
     src/rpcdump.cpp \
     src/rpcnet.cpp \
     src/rpcmining.cpp \
     src/rpcwallet.cpp \
-    src/rpcdarksend.cpp \
     src/rpcblockchain.cpp \
     src/rpcrawtransaction.cpp \
     src/qt/overviewpage.cpp \
@@ -295,6 +303,7 @@ SOURCES += src/qt/bitcoin.cpp \
     src/qt/bitcoinunits.cpp \
     src/qt/qvaluecombobox.cpp \
     src/qt/askpassphrasedialog.cpp \
+    src/qt/darksendconfig.cpp \
     src/protocol.cpp \
     src/qt/notificator.cpp \
     src/qt/paymentserver.cpp \
@@ -328,8 +337,10 @@ FORMS += src/qt/forms/sendcoinsdialog.ui \
     src/qt/forms/overviewpage.ui \
     src/qt/forms/sendcoinsentry.ui \
     src/qt/forms/askpassphrasedialog.ui \
+    src/qt/forms/darksendconfig.ui \
     src/qt/forms/rpcconsole.ui \
-    src/qt/forms/optionsdialog.ui
+    src/qt/forms/optionsdialog.ui \
+    src/qt/forms/termsofuse.ui
 
 contains(USE_QRCODE, 1) {
 HEADERS += src/qt/qrcodedialog.h

diff --git a/contrib/gitian-descriptors/linux/gitian-linux-darkcoin.yml b/contrib/gitian-descriptors/linux/gitian-linux-darkcoin.yml
@@ -23,7 +23,7 @@ packages:
 - "libqt4-test"
 reference_datetime: "2014-01-10 00:00:00"
 remotes:
-- "url": "https://github.com/darkcoinproject/darkcoin.git"
+- "url": "https://github.com/schinzelh/darkcoin-rc.git"
   "dir": "darkcoin"
 files:
 - "bitcoin-deps-linux32-gitian-r6.zip"

diff --git a/contrib/gitian-descriptors/osx/gitian-osx-darkcoin.yml b/contrib/gitian-descriptors/osx/gitian-osx-darkcoin.yml
@@ -14,7 +14,7 @@ packages:
 
 reference_datetime: "2014-01-10 00:00:00"
 remotes:
-- "url": "https://github.com/darkcoinproject/darkcoin.git"
+- "url": "https://github.com/schinzelh/darkcoin-rc.git"
   "dir": "darkcoin"
 files:
 - "osx-native-depends-r3.tar.gz"
@@ -80,4 +80,4 @@ script: |
   /usr/bin/install -c contrib/macdeploy/DS_Store dist/.DS_Store
   cd dist; ln -s /Applications Applications; cd ..
   genisoimage -no-cache-inodes -l -probe -V "DarkCoin-Qt" -no-pad -r -apple -o DarkCoin-Qt.dmg dist
-  dmg dmg DarkCoin-Qt.dmg /home/ubuntu/out/DarkCoin-Qt.dmg
+  dmg dmg DarkCoin-Qt.dmg /home/ubuntu/out/DarkCoin-Qt.dmg
diff --git a/contrib/gitian-descriptors/windows/gitian-win-darkcoin.yml b/contrib/gitian-descriptors/windows/gitian-win-darkcoin.yml
@@ -13,7 +13,7 @@ packages:
 - "faketime"
 reference_datetime: "2014-01-10 00:00:00"
 remotes:
-- "url": "https://github.com/darkcoinproject/darkcoin.git"
+- "url": "https://github.com/schinzelh/darkcoin-rc.git"
   "dir": "darkcoin"
 files:
 - "qt-win32-4.8.5-gitian-r5.zip"
@@ -112,4 +112,4 @@ script: |
   rm -rf $TEMPDIR
   mkdir -p $TEMPDIR
   cd $TEMPDIR
-  tar -xvf $HOME/build/darkcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME
+  tar -xvf $HOME/build/darkcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME
diff --git a/contrib/homebrew/makefile.osx.patch b/contrib/homebrew/makefile.osx.patch
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
@@ -205,6 +205,8 @@ static const CRPCCommand vRPCCommands[] =
     { "getconnectioncount",     &getconnectioncount,     true,      false,      false },
     { "getpeerinfo",            &getpeerinfo,            true,      false,      false },
     { "addnode",                &addnode,                true,      true,       false },
+    { "getpoolinfo",            &getpoolinfo,            true,      false,      false },
+    { "darksend",               &darksend,               false,     false,      true },
     { "masternode",             &masternode,             false,     false,      true },
     { "getaddednodeinfo",       &getaddednodeinfo,       true,      true,       false },
     { "getdifficulty",          &getdifficulty,          true,      false,      false },
@@ -261,6 +263,8 @@ static const CRPCCommand vRPCCommands[] =
     { "importprivkey",          &importprivkey,          false,     false,      true },
     { "listunspent",            &listunspent,            false,     false,      true },
     { "getrawtransaction",      &getrawtransaction,      false,     false,      false },
+    { "erasetransaction",       &erasetransaction,       false,     false,      false },
+    { "resendtransaction",      &resendtransaction,      false,     false,      false },
     { "createrawtransaction",   &createrawtransaction,   false,     false,      false },
     { "decoderawtransaction",   &decoderawtransaction,   false,     false,      false },
     { "signrawtransaction",     &signrawtransaction,     false,     false,      false },
@@ -1157,6 +1161,7 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri
     if (strMethod == "getnetworkhashps"       && n > 0) ConvertTo<boost::int64_t>(params[0]);
     if (strMethod == "getnetworkhashps"       && n > 1) ConvertTo<boost::int64_t>(params[1]);
     if (strMethod == "sendtoaddress"          && n > 1) ConvertTo<double>(params[1]);
+    if (strMethod == "darksend"               && n > 1) ConvertTo<double>(params[1]);
     if (strMethod == "settxfee"               && n > 0) ConvertTo<double>(params[0]);
     if (strMethod == "setmininput"            && n > 0) ConvertTo<double>(params[0]);
     if (strMethod == "getreceivedbyaddress"   && n > 1) ConvertTo<boost::int64_t>(params[1]);

diff --git a/src/bitcoinrpc.h b/src/bitcoinrpc.h
@@ -136,6 +136,8 @@ extern std::string HexBits(unsigned int nBits);
 extern std::string HelpRequiringPassphrase();
 extern void EnsureWalletIsUnlocked();
 
+extern json_spirit::Value getpoolinfo(const json_spirit::Array& params, bool fHelp);
+extern json_spirit::Value darksend(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value masternode(const json_spirit::Array& params, bool fHelp);
 
 extern json_spirit::Value getconnectioncount(const json_spirit::Array& params, bool fHelp); // in rpcnet.cpp
@@ -192,6 +194,8 @@ extern json_spirit::Value validateaddress(const json_spirit::Array& params, bool
 extern json_spirit::Value getinfo(const json_spirit::Array& params, bool fHelp);
 
 extern json_spirit::Value getrawtransaction(const json_spirit::Array& params, bool fHelp); // in rcprawtransaction.cpp
+extern json_spirit::Value erasetransaction(const json_spirit::Array& params, bool fHelp); // in rcprawtransaction.cpp
+extern json_spirit::Value resendtransaction(const json_spirit::Array& params, bool fHelp); // in rcprawtransaction.cpp
 extern json_spirit::Value listunspent(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value lockunspent(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value listlockunspent(const json_spirit::Array& params, bool fHelp);

diff --git a/src/checkpointsync.cpp b/src/checkpointsync.cpp
@@ -71,6 +71,7 @@
 #include "main.h"
 #include "txdb.h"
 #include "uint256.h"
+#include "darksend.h"
 
 using namespace json_spirit;
 using namespace std;
@@ -473,7 +474,7 @@ Value getcheckpoint(const Array& params, bool fHelp)
     result.push_back(Pair("subscribemode", IsSyncCheckpointEnforced()? "enforce" : "advisory"));
     if (mapArgs.count("-checkpointkey"))
         result.push_back(Pair("checkpointmaster", true));
-
+    result.push_back(Pair("enforcing", GetAdjustedTime() > enforceMasternodePaymentsTime ? "on" : "off"));
     return result;
 }
 

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -14,7 +14,7 @@
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true
 
-// Copyright year (2009-this)
+// Copyright year (2009-this)		
 // Todo: update this when changing our copyright comments in the source
 #define COPYRIGHT_YEAR 2013