Skip to content

Commit e667094

Browse files
dave-manndave-mann
authored
Merge branch 'v2.4.20-WIP' into v2.4.19-importprivkey
2 parents 75101b1 + b9aa31f commit e667094

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1355
-840
lines changed

‎README.md

-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
22

33
[![Build Status](https://travis-ci.org/duality-solutions/Dynamic.png?branch=master)](https://travis-ci.org/duality-solutions/Dynamic)
4-
[![Stories in Ready](https://badge.waffle.io/duality-solutions/Dynamic.png?label=ready&title=Ready)](https://waffle.io/duality-solutions/Dynamic)
5-
6-
Graph on Pull Request History
7-
====================================
8-
9-
[![Throughput Graph](https://graphs.waffle.io/duality-solutions/Dynamic/throughput.svg)](https://waffle.io/duality-solutions/Dynamic/metrics/throughput)
104

115
# **Dynamic (DYN) v2.4.0.0**
126

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
22
AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 2)
44
define(_CLIENT_VERSION_MINOR, 4)
5-
define(_CLIENT_VERSION_REVISION, 18)
5+
define(_CLIENT_VERSION_REVISION, 19)
66
define(_CLIENT_VERSION_BUILD, 0)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2019)

‎src/Makefile.am

+4
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ DYNAMIC_CORE_H = \
8282
bdap/domainentrydb.h \
8383
bdap/certificate.h \
8484
bdap/entrycheckpoints.h \
85+
bdap/fees.h \
8586
bdap/identity.h \
8687
bdap/linking.h \
8788
bdap/linkingdb.h \
@@ -142,6 +143,7 @@ DYNAMIC_CORE_H = \
142143
dynodeman.h \
143144
dynodeconfig.h \
144145
flat-database.h \
146+
fluid/banaccount.h \
145147
fluid/fluid.h \
146148
fluid/fluiddb.h \
147149
fluid/fluiddynode.h \
@@ -268,6 +270,7 @@ libdynamic_server_a_SOURCES = \
268270
bdap/domainentrydb.cpp \
269271
bdap/certificate.cpp \
270272
bdap/entrycheckpoints.cpp \
273+
bdap/fees.cpp \
271274
bdap/identity.cpp \
272275
bdap/linking.cpp \
273276
bdap/linkingdb.cpp \
@@ -296,6 +299,7 @@ libdynamic_server_a_SOURCES = \
296299
dynode-sync.cpp \
297300
dynodeconfig.cpp \
298301
dynodeman.cpp \
302+
fluid/banaccount.cpp \
299303
fluid/fluid.cpp \
300304
fluid/fluiddb.cpp \
301305
fluid/fluiddynode.cpp \

‎src/amount.h

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ typedef int64_t CAmount;
1717

1818
static const CAmount COIN = 100000000;
1919
static const CAmount CENT = 1000000;
20+
static const CAmount BDAP_CREDIT = 100001; //= 0.00100001 DYN. Matches lowest PrivateSend denomination
2021

2122
extern const std::string CURRENCY_UNIT;
2223

‎src/bdap/bdap.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ namespace BDAP {
1818
BDAP_ORGANIZATIONAL_UNIT = 5,
1919
BDAP_CERTIFICATE = 6,
2020
BDAP_AUDIT = 7,
21-
BDAP_CHANNEL = 8,
22-
BDAP_CHECKPOINT = 9,
21+
BDAP_SIDECHAIN = 8,
22+
BDAP_SIDECHAIN_CHECKPOINT = 9,
2323
BDAP_LINK_REQUEST = 10,
2424
BDAP_LINK_ACCEPT = 11,
2525
BDAP_IDENTITY = 12,
@@ -53,7 +53,9 @@ static constexpr unsigned int DHT_HEX_PUBLIC_KEY_LENGTH = 64; // Ed25519 pubke
5353
static constexpr unsigned int MAX_BDAP_LINK_MESSAGE = 256;
5454
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.
5555
static constexpr unsigned int MAX_BDAP_LINK_DATA_SIZE = 1592;
56-
static constexpr unsigned int DEFAULT_REGISTRATION_DAYS = 731; // 2 years
56+
static constexpr uint64_t DEFAULT_LINK_EXPIRE_TIME = 1861920000;
57+
static constexpr int32_t DEFAULT_REGISTRATION_MONTHS = 24; // 2 years
58+
static constexpr bool ENFORCE_BDAP_FEES = false; // ********** TODO (BDAP): Update to true after a new testnet.
5759
static const std::string DEFAULT_PUBLIC_DOMAIN = "bdap.io";
5860
static const std::string DEFAULT_PUBLIC_OU = "public";
5961
static const std::string DEFAULT_ADMIN_OU = "admin";

‎src/bdap/domainentry.h

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#define DYNAMIC_BDAP_DOMAINENTRY_H
77

88
#include "bdap.h"
9+
#include "bdap/utils.h"
910
#include "amount.h"
1011
#include "consensus/params.h"
1112
#include "primitives/transaction.h"
@@ -38,12 +39,6 @@ class CTxMemPool;
3839

3940
using namespace BDAP;
4041

41-
namespace BDAP {
42-
std::string GetObjectTypeString(unsigned int nObjectType);
43-
unsigned int GetObjectTypeInt(BDAP::ObjectType ObjectType);
44-
BDAP::ObjectType GetObjectTypeEnum(unsigned int nObjectType);
45-
}
46-
4742
class CDomainEntryDefaultParameters {
4843
public:
4944
void InitialiseAdminOwners(); //DEFAULT_ADMIN_DOMAIN

0 commit comments

Comments
 (0)