Merge pull request #384 from duality-solutions/v2.4.1.0-WIP

v2.4.1.0

CHANGELOG.md

@@ -1,6 +1,22 @@
 **Dynamic CHANGELOG**
 -------------------------
 
+**Dynamic v2.4.1.0**
+
+* [Qt] Update/Add Languages
+* [BDAP] Fix send BDAP transaction after removing credits from wallet GetBalance() method
+* [Wallet] Prevent transactions that require Ed25519 keys if wallet needs upgrading. Notify user.
+* [Wallet] Prevent ed25519 keypool crash when trying to erase from an empty set
+* [FIX] Fix locked wallet upgrade issues.
+* [RPC] Refactor all RPC code files in a seperate directory
+* [LOG] Silence LogPrint when not finding Dynodes with votes
+* [DHT] Return an empty JSON array when the denylink record is not found
+* [HD] Move mnemonic wordlists to separate directory
+* [FIX] Correct versioning for alert max version
+* [Wallet] Remove BDAP credits from GetBalance method
+* [BDAP] Fix send BDAP transaction after removing credits from wallet GetBalance() method
+
+
 **Dynamic v2.4.0.0**
 
 * [DHT] Add more UDP ports and fix saving key in wallet

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/duality-solutions/Dynamic.png?branch=master)](https://travis-ci.org/duality-solutions/Dynamic)
 
-# **Dynamic (DYN) v2.4.0.0**
+# **Dynamic (DYN) v2.4.1.0**
 
 ![DYN logo](https://github.com/duality-solutions/Dynamic/blob/master/src/qt/res/icons/drk/about.png)
 

configure.ac

@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 4)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_REVISION, 1)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)

contrib/gitian-descriptors/gitian-arm.yml

@@ -1,5 +1,5 @@
 ---
-name: "dynamic-arm-2.4.0.0"
+name: "dynamic-arm-2.4.1.0"
 enable_cache: true
 suites:
 - "trusty"

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "dynamic-linux-2.4.0.0"
+name: "dynamic-linux-2.4.1.0"
 enable_cache: true
 suites:
 - "trusty"

contrib/gitian-descriptors/gitian-osx.yml

@@ -1,5 +1,5 @@
 ---
-name: "dynamic-osx-2.4.0.0"
+name: "dynamic-osx-2.4.1.0"
 enable_cache: true
 suites:
 - "trusty"

contrib/gitian-descriptors/gitian-win.yml

@@ -1,5 +1,5 @@
 ---
-name: "dynamic-2.4.0.0"
+name: "dynamic-2.4.1.0"
 enable_cache: true
 suites:
 - "trusty"

src/Makefile.am

@@ -87,17 +87,6 @@ DYNAMIC_CORE_H = \
   bdap/stealth.h \
   bdap/utils.h \
   bdap/vgpmessage.h \
-  bip39_chinese_simplified.h \
-  bip39_chinese_traditional.h \
-  bip39_english.h \
-  bip39_french.h \
-  bip39_german.h \
-  bip39_italian.h \
-  bip39_japanese.h \
-  bip39_korean.h \
-  bip39_russian.h \
-  bip39_spanish.h \
-  bip39_ukrainian.h \
   bip39.h \
   blockencodings.h \
   bloom.h \
@@ -198,10 +187,11 @@ DYNAMIC_CORE_H = \
   random.h \
   reverselock.h \
   reverse_iterator.h \
-  rpcclient.h \
-  rpcprotocol.h \
-  rpcregister.h \
-  rpcserver.h \
+  rpc/client.h \
+  rpc/protocol.h \
+  rpc/register.h \
+  rpc/server.h \
+  rpc/wallet.h \
   scheduler.h \
   script/sigcache.h \
   script/sign.h \
@@ -233,10 +223,20 @@ DYNAMIC_CORE_H = \
   wallet/coincontrol.h \
   wallet/crypter.h \
   wallet/db.h \
-  wallet/rpcwallet.h \
   wallet/wallet.h \
   wallet/wallet_ismine.h \
   wallet/walletdb.h \
+  wordlists/chinese_simplified.h \
+  wordlists/chinese_traditional.h \
+  wordlists/english.h \
+  wordlists/french.h \
+  wordlists/german.h \
+  wordlists/italian.h \
+  wordlists/japanese.h \
+  wordlists/korean.h \
+  wordlists/russian.h \
+  wordlists/spanish.h \
+  wordlists/ukrainian.h \
   warnings.h \
   zmq/zmqabstractnotifier.h \
   zmq/zmqconfig.h\
@@ -268,9 +268,6 @@ libdynamic_server_a_SOURCES = \
   bdap/linkingdb.cpp \
   bdap/linkmanager.cpp \
   bdap/linkstorage.cpp \
-  bdap/rpcdomainentry.cpp \
-  bdap/rpclinking.cpp \
-  bdap/rpcrawbdap.cpp \
   bdap/utils.cpp \
   bdap/vgpmessage.cpp \
   dbwrapper.cpp \
@@ -281,7 +278,6 @@ libdynamic_server_a_SOURCES = \
   dht/limits.cpp \
   dht/mutable.cpp \
   dht/mutabledb.cpp \
-  dht/rpcdht.cpp \
   dht/session.cpp \
   dht/sessionevents.cpp \
   dht/settings.cpp \
@@ -297,7 +293,6 @@ libdynamic_server_a_SOURCES = \
   fluid/fluiddynode.cpp \
   fluid/fluidmining.cpp \
   fluid/fluidmint.cpp \
-  fluid/rpcfluid.cpp \
   fluid/fluidsovereign.cpp \
   fluid/operations.cpp \
   governance.cpp \
@@ -332,14 +327,19 @@ libdynamic_server_a_SOURCES = \
   privatesend-server.cpp \
   psnotificationinterface.cpp \
   rest.cpp \
-  rpcblockchain.cpp \
-  rpcdynode.cpp \
-  rpcgovernance.cpp \
-  rpcmining.cpp \
-  rpcmisc.cpp \
-  rpcnet.cpp \
-  rpcrawtransaction.cpp \
-  rpcserver.cpp \
+  rpc/blockchain.cpp \
+  rpc/dht.cpp \
+  rpc/domainentry.cpp \
+  rpc/dynode.cpp \
+  rpc/fluid.cpp \
+  rpc/governance.cpp \
+  rpc/linking.cpp \
+  rpc/mining.cpp \
+  rpc/misc.cpp \
+  rpc/net.cpp \
+  rpc/rawbdap.cpp \
+  rpc/rawtransaction.cpp \
+  rpc/server.cpp \
   script/sigcache.cpp \
   sendalert.cpp \
   spork.cpp \
@@ -375,10 +375,10 @@ libdynamic_wallet_a_SOURCES = \
   policy/rbf.cpp \
   privatesend-client.cpp \
   privatesend-util.cpp \
+  rpc/wallet.cpp \
+  rpc/walletdump.cpp \
   wallet/crypter.cpp \
   wallet/db.cpp \
-  wallet/rpcdump.cpp \
-  wallet/rpcwallet.cpp \
   wallet/wallet.cpp \
   wallet/wallet_ismine.cpp \
   wallet/walletdb.cpp \
@@ -493,7 +493,7 @@ libdynamic_util_a_SOURCES = \
   compat/glibcxx_sanity.cpp \
   compat/strnlen.cpp \
   random.cpp \
-  rpcprotocol.cpp \
+  rpc/protocol.cpp \
   support/cleanse.cpp \
   support/lockedpool.cpp \
   sync.cpp \
@@ -513,7 +513,7 @@ endif
 libdynamic_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(DYNAMIC_INCLUDES)
 libdynamic_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libdynamic_cli_a_SOURCES = \
-  rpcclient.cpp \
+  rpc/client.cpp \
   $(DYNAMIC_CORE_H)
 
 nodist_libdynamic_util_a_SOURCES = $(srcdir)/obj/build.h

src/bdap/domainentry.cpp

@@ -6,8 +6,8 @@
 
 #include "base58.h"
 #include "bdap/utils.h"
-#include "rpcclient.h"
-#include "rpcserver.h"
+#include "rpc/client.h"
+#include "rpc/server.h"
 #include "primitives/block.h"
 #include "txmempool.h"
 #include "serialize.h"

src/bip39.cpp

@@ -32,17 +32,17 @@
 // https://github.com/trezor/trezor-crypto
 
 #include "bip39.h"
-#include "bip39_english.h"
-#include "bip39_chinese_simplified.h"
-#include "bip39_chinese_traditional.h"
-#include "bip39_french.h"
-//#include "bip39_german.h"  //exclude for now, but include later
-#include "bip39_italian.h"
-#include "bip39_japanese.h"
-#include "bip39_korean.h"
-#include "bip39_russian.h"
-#include "bip39_spanish.h"
-#include "bip39_ukrainian.h"
+#include "wordlists/english.h"
+#include "wordlists/chinese_simplified.h"
+#include "wordlists/chinese_traditional.h"
+#include "wordlists/french.h"
+//#include "wordlists/german.h"  //exclude for now, but include later
+#include "wordlists/italian.h"
+#include "wordlists/japanese.h"
+#include "wordlists/korean.h"
+#include "wordlists/russian.h"
+#include "wordlists/spanish.h"
+#include "wordlists/ukrainian.h"
 #include "crypto/sha256.h"
 #include "random.h"
 

src/clientversion.h

@@ -19,7 +19,7 @@
 //! These need to be macros, as clientversion.cpp's and dynamic*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 2
 #define CLIENT_VERSION_MINOR 4
-#define CLIENT_VERSION_REVISION 0
+#define CLIENT_VERSION_REVISION 1
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build

src/dynamic-cli.cpp

@@ -11,8 +11,8 @@
 
 #include "chainparamsbase.h"
 #include "clientversion.h"
-#include "rpcclient.h"
-#include "rpcprotocol.h"
+#include "rpc/client.h"
+#include "rpc/protocol.h"
 #include "support/events.h"
 #include "util.h"
 #include "utilstrencodings.h"

src/dynamicd.cpp

@@ -12,7 +12,7 @@
 #include "httpserver.h"
 #include "init.h"
 #include "noui.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
 #include "scheduler.h"
 #include "util.h"
 #include "utilstrencodings.h"

src/dynode-payments.cpp

@@ -583,7 +583,7 @@ bool CDynodeBlockPayees::HasPayeeWithVotes(const CScript& payeeIn, int nVotesReq
         }
     }
 
-    LogPrint("dnpayments", "CDynodeBlockPayees::HasPayeeWithVotes -- ERROR: couldn't find any payee with %d+ votes\n", nVotesReq);
+    //LogPrint("dnpayments", "CDynodeBlockPayees::HasPayeeWithVotes -- ERROR: couldn't find any payee with %d+ votes\n", nVotesReq);
     return false;
 }
 

src/dynode.cpp

@@ -632,7 +632,7 @@ uint256 CDynodeBroadcast::GetHash() const
 
 uint256 CDynodeBroadcast::GetSignatureHash() const
 {
-    // TODO: replace with "return SerializeHash(*this);" after migration to 70100
+    // TODO: replace with "return SerializeHash(*this);" after migration to 71000
     CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);
     ss << outpoint;
     ss << addr;
@@ -732,7 +732,7 @@ uint256 CDynodePing::GetHash() const
 {
     CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
-        // TODO: replace with "return SerializeHash(*this);" after migration to 70100
+        // TODO: replace with "return SerializeHash(*this);" after migration to 71000
         ss << dynodeOutpoint;
         ss << blockHash;
         ss << sigTime;

src/dynode.h

@@ -73,7 +73,7 @@ class CDynodePing
             READWRITE(vchSig);
         }
         if (ser_action.ForRead() && s.size() == 0) {
-            // TODO: drop this after migration to 70100
+            // TODO: drop this after migration to 71000
             fSentinelIsCurrent = false;
             nSentinelVersion = DEFAULT_SENTINEL_VERSION;
             nDaemonVersion = DEFAULT_DAEMON_VERSION;
@@ -82,7 +82,7 @@ class CDynodePing
         READWRITE(fSentinelIsCurrent);
         READWRITE(nSentinelVersion);
         if (ser_action.ForRead() && s.size() == 0) {
-            // TODO: drop this after migration to 70100
+            // TODO: drop this after migration to 71000
             nDaemonVersion = DEFAULT_DAEMON_VERSION;
             return;
         }

src/httprpc.cpp

@@ -13,8 +13,8 @@
 #include "chainparams.h"
 #include "httpserver.h"
 #include "random.h"
-#include "rpcprotocol.h"
-#include "rpcserver.h"
+#include "rpc/protocol.h"
+#include "rpc/server.h"
 #include "sync.h"
 #include "ui_interface.h"
 #include "util.h"

src/httpserver.cpp

@@ -8,7 +8,7 @@
 #include "chainparamsbase.h"
 #include "compat.h"
 #include "netbase.h"
-#include "rpcprotocol.h" // For HTTP status codes
+#include "rpc/protocol.h" // For HTTP status codes
 #include "sync.h"
 #include "ui_interface.h"
 #include "util.h"

src/httpserver.h

@@ -12,7 +12,7 @@
 
 
 static const int DEFAULT_HTTP_THREADS = 4;
-static const int DEFAULT_HTTP_WORKQUEUE = 16;
+static const int DEFAULT_HTTP_WORKQUEUE = 24;
 static const int DEFAULT_HTTP_SERVER_TIMEOUT = 30;
 
 struct evhttp_request;

src/init.cpp

@@ -55,8 +55,8 @@
 #include "consensus/validation.h"
 #include "privatesend-server.h"
 #include "psnotificationinterface.h"
-#include "rpcregister.h"
-#include "rpcserver.h"
+#include "rpc/register.h"
+#include "rpc/server.h"
 #include "scheduler.h"
 #include "script/sigcache.h"
 #include "script/standard.h"

src/keepass.cpp

@@ -10,7 +10,7 @@
 #include "clientversion.h"
 #include "protocol.h"
 #include "random.h"
-#include "rpcprotocol.h"
+#include "rpc/protocol.h"
 #include "support/cleanse.h" // for OPENSSL_cleanse()
 #include "wallet/crypter.h"
 

src/qt/bdapaccounttablemodel.cpp

@@ -9,9 +9,9 @@
 #include "guiutil.h"
 #include "sync.h"
 #include "validation.h" // for cs_main
-#include "rpcregister.h"
-#include "rpcserver.h"
-#include "rpcclient.h"
+#include "rpc/register.h"
+#include "rpc/server.h"
+#include "rpc/client.h"
 
 #include <QDebug>
 #include <QList>

src/qt/bdapaddlinkdialog.cpp

@@ -10,9 +10,9 @@
 #include "bdappage.h"
 #include "bdap/fees.h"
 #include "guiutil.h"
-#include "rpcregister.h"
-#include "rpcserver.h"
-#include "rpcclient.h"
+#include "rpc/register.h"
+#include "rpc/server.h"
+#include "rpc/client.h"
 #include "util.h"
 
 #include <boost/algorithm/string.hpp>