Merge pull request #335 from duality-solutions/v2.4.19-WIP

Updates to BDAP v2.4.19 (WIP)

Author: AmirAbrams

README.md

@@ -1,12 +1,6 @@
 [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
 
 [![Build Status](https://travis-ci.org/duality-solutions/Dynamic.png?branch=master)](https://travis-ci.org/duality-solutions/Dynamic)
-[![Stories in Ready](https://badge.waffle.io/duality-solutions/Dynamic.png?label=ready&title=Ready)](https://waffle.io/duality-solutions/Dynamic)
-
-Graph on Pull Request History
-====================================
-
-[![Throughput Graph](https://graphs.waffle.io/duality-solutions/Dynamic/throughput.svg)](https://waffle.io/duality-solutions/Dynamic/metrics/throughput)  
 
 # **Dynamic (DYN) v2.4.0.0**
 

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, 18)
+define(_CLIENT_VERSION_REVISION, 19)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)

src/Makefile.am

@@ -82,6 +82,7 @@ DYNAMIC_CORE_H = \
   bdap/domainentrydb.h \
   bdap/certificate.h \
   bdap/entrycheckpoints.h \
+  bdap/fees.h \
   bdap/identity.h \
   bdap/linking.h \
   bdap/linkingdb.h \
@@ -142,6 +143,7 @@ DYNAMIC_CORE_H = \
   dynodeman.h \
   dynodeconfig.h \
   flat-database.h \
+  fluid/banaccount.h \
   fluid/fluid.h \
   fluid/fluiddb.h \
   fluid/fluiddynode.h \
@@ -268,6 +270,7 @@ libdynamic_server_a_SOURCES = \
   bdap/domainentrydb.cpp \
   bdap/certificate.cpp \
   bdap/entrycheckpoints.cpp \
+  bdap/fees.cpp \
   bdap/identity.cpp \
   bdap/linking.cpp \
   bdap/linkingdb.cpp \
@@ -296,6 +299,7 @@ libdynamic_server_a_SOURCES = \
   dynode-sync.cpp \
   dynodeconfig.cpp \
   dynodeman.cpp \
+  fluid/banaccount.cpp \
   fluid/fluid.cpp \
   fluid/fluiddb.cpp \
   fluid/fluiddynode.cpp \

src/amount.h

@@ -17,6 +17,7 @@ typedef int64_t CAmount;
 
 static const CAmount COIN = 100000000;
 static const CAmount CENT = 1000000;
+static const CAmount BDAP_CREDIT = 100001; //= 0.00100001 DYN. Matches lowest PrivateSend denomination
 
 extern const std::string CURRENCY_UNIT;
 

src/bdap/bdap.h

@@ -18,8 +18,8 @@ namespace BDAP {
         BDAP_ORGANIZATIONAL_UNIT = 5,
         BDAP_CERTIFICATE = 6,
         BDAP_AUDIT = 7,
-        BDAP_CHANNEL = 8,
-        BDAP_CHECKPOINT = 9,
+        BDAP_SIDECHAIN = 8,
+        BDAP_SIDECHAIN_CHECKPOINT = 9,
         BDAP_LINK_REQUEST = 10,
         BDAP_LINK_ACCEPT = 11,
         BDAP_IDENTITY = 12,
@@ -53,7 +53,9 @@ static constexpr unsigned int DHT_HEX_PUBLIC_KEY_LENGTH   = 64; // Ed25519 pubke
 static constexpr unsigned int MAX_BDAP_LINK_MESSAGE       = 256;
 static constexpr unsigned int MAX_BDAP_SIGNATURE_PROOF    = 90; // TODO (bdap): Update to 65 or use MAX_SIGNATURE_LENGTH when you start a new chain.
 static constexpr unsigned int MAX_BDAP_LINK_DATA_SIZE     = 1592;
-static constexpr unsigned int DEFAULT_REGISTRATION_DAYS   = 731; // 2 years
+static constexpr uint64_t DEFAULT_LINK_EXPIRE_TIME        = 1861920000;
+static constexpr int32_t DEFAULT_REGISTRATION_MONTHS      = 24; // 2 years
+static constexpr bool ENFORCE_BDAP_FEES                   = false; // ********** TODO (BDAP): Update to true after a new testnet.
 static const std::string DEFAULT_PUBLIC_DOMAIN            = "bdap.io";
 static const std::string DEFAULT_PUBLIC_OU                = "public";
 static const std::string DEFAULT_ADMIN_OU                 = "admin";

src/bdap/domainentry.h

@@ -6,6 +6,7 @@
 #define DYNAMIC_BDAP_DOMAINENTRY_H
 
 #include "bdap.h"
+#include "bdap/utils.h"
 #include "amount.h"
 #include "consensus/params.h"
 #include "primitives/transaction.h"
@@ -38,12 +39,6 @@ class CTxMemPool;
 
 using namespace BDAP;
 
-namespace BDAP {
-    std::string GetObjectTypeString(unsigned int nObjectType);
-    unsigned int GetObjectTypeInt(BDAP::ObjectType ObjectType);
-    BDAP::ObjectType GetObjectTypeEnum(unsigned int nObjectType);
-}
-
 class CDomainEntryDefaultParameters {
 public:
     void InitialiseAdminOwners(); //DEFAULT_ADMIN_DOMAIN