duality-solutions · AmirAbrams · Nov 22, 2021 · Nov 27, 2021 · Nov 27, 2021 · Nov 27, 2021
diff --git a/README.md b/README.md
@@ -14,18 +14,11 @@ What is [Dynamic](https://duality.solutions/dynamic)?
 * PoW Mining Algorithm: Argon2d
 * PoW Difficulty Algorithm: Digishield V3
 * PoW Period: Unlimited
-* PoW Target Spacing: 128 Seconds
+* PoW Target Spacing: 75 Seconds
 * PoW Reward per Block: Controlled via Fluid Protocol
 * PoW Reward Start Height: Block 5,137
-* PoS Mining Algorithm: Blake2b
-* PoS Period: Unlimited
-* PoS Target Spacing: 128 Seconds
-* PoS Reward per Block: Controlled via Fluid Protocol
-* PoS Reward Start Height: Controlled via SPORK activation
 * Maturity: 10 Blocks
-* PoW Blocks: ~675 per day
-* PoS Blocks: ~675 per day
-* Total Blocks Per Day: ~1350
+* PoW Blocks: ~1152 per day
 * Dynode Collateral Amount: 1000 DYN
 * Dynode Min Confirmation: 17 Blocks
 * Dynode Reward: Controlled via Fluid Protocol

diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 5)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2021)
 AC_INIT([Dynamic],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/duality-solutions/dynamic/issues],[dynamic])

diff --git a/contrib/gitian-descriptors/gitian-arm.yml b/contrib/gitian-descriptors/gitian-arm.yml
@@ -1,5 +1,5 @@
 ---
-name: "dynamic-arm-2.5.0.0"
+name: "dynamic-arm-2.5.0.1"
 enable_cache: true
 suites:
 - "trusty"

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "dynamic-linux-2.5.0.0"
+name: "dynamic-linux-2.5.0.1"
 enable_cache: true
 suites:
 - "trusty"

diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
@@ -1,5 +1,5 @@
 ---
-name: "dynamic-osx-2.5.0.0"
+name: "dynamic-osx-2.5.0.1"
 enable_cache: true
 suites:
 - "trusty"

diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
@@ -1,5 +1,5 @@
 ---
-name: "dynamic-2.5.0.0"
+name: "dynamic-2.5.0.1"
 enable_cache: true
 suites:
 - "trusty"

diff --git a/dynamic-qt.pro b/dynamic-qt.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = dynamic
-VERSION = 2.5.0.0
+VERSION = 2.5.0.1
 INCLUDEPATH += src \
                src/crypto \
                src/crypto/heavyhash \
@@ -309,6 +309,7 @@ HEADERS += \
     src/qt/askpassphrasedialog.h \
     src/qt/addresstablemodel.h \
     src/qt/addressbookpage.h \
+    src/qt/swapdialog.h \
     src/compat/byteswap.h \
     src/compat/sanity.h \
     src/consensus/consensus.h \
@@ -485,6 +486,7 @@ SOURCES += \
     src/qt/sendcoinsentry.cpp \
     src/qt/signverifymessagedialog.cpp \
     src/qt/splashscreen.cpp \
+    src/qt/swapdialog.cpp \
     src/qt/dynodelist.cpp \
     src/qt/trafficgraphwidget.cpp \
     src/qt/transactiondesc.cpp \
@@ -652,4 +654,5 @@ FORMS += \
     src/qt/forms/sendcoinsdialog.ui \
     src/qt/forms/sendcoinsentry.ui \
     src/qt/forms/signverifymessagedialog.ui \
+    src/qt/forms/swapdialog.ui \
     src/qt/forms/transactiondescdialog.ui
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -208,6 +208,9 @@ DYNAMIC_CORE_H = \
   support/cleanse.h \
   support/lockedpool.h \
   support/events.h \
+  swap/ss58.h \
+  swap/swapdata.h \
+  swap/swapdb.h \
   sync.h \
   threadinterrupt.h \
   threadsafety.h \
@@ -350,9 +353,13 @@ libdynamic_server_a_SOURCES = \
   rpc/rawbdap.cpp \
   rpc/rawtransaction.cpp \
   rpc/server.cpp \
+  rpc/swap.cpp \
   script/sigcache.cpp \
   sendalert.cpp \
   spork.cpp \
+  swap/ss58.cpp \
+  swap/swapdata.cpp \
+  swap/swapdb.cpp \
   timedata.cpp \
   torcontrol.cpp \
   txdb.cpp \

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -49,6 +49,7 @@ QT_FORMS_UI = \
   qt/forms/sendcoinsdialog.ui \
   qt/forms/sendcoinsentry.ui \
   qt/forms/signverifymessagedialog.ui \
+  qt/forms/swapdialog.ui \
   qt/forms/transactiondescdialog.ui
 
 QT_MOC_CPP = \
@@ -100,6 +101,7 @@ QT_MOC_CPP = \
   qt/moc_sendcoinsentry.cpp \
   qt/moc_signverifymessagedialog.cpp \
   qt/moc_splashscreen.cpp \
+  qt/moc_swapdialog.cpp \
   qt/moc_trafficgraphwidget.cpp \
   qt/moc_transactiondesc.cpp \
   qt/moc_transactiondescdialog.cpp \
@@ -179,6 +181,7 @@ DYNAMIC_QT_H = \
   qt/sendcoinsentry.h \
   qt/signverifymessagedialog.h \
   qt/splashscreen.h \
+  qt/swapdialog.h \
   qt/trafficgraphdata.h \
   qt/trafficgraphwidget.h \
   qt/transactiondesc.h \
@@ -242,13 +245,10 @@ RES_ICONS = \
   qt/res/icons/drk/lock_open.png \
   qt/res/icons/drk/notsynced.png \
   qt/res/icons/drk/overview.png \
-  qt/res/icons/drk/pos.png \
   qt/res/icons/drk/quit.png \
   qt/res/icons/drk/receive.png \
   qt/res/icons/drk/remove.png \
   qt/res/icons/drk/send.png \
-  qt/res/icons/drk/staking_active.png \
-  qt/res/icons/drk/staking_inactive.png \
   qt/res/icons/drk/synced.png \
   qt/res/icons/drk/transaction_abandoned.png \
   qt/res/icons/drk/transaction_conflicted.png \
@@ -332,6 +332,7 @@ DYNAMIC_QT_CPP += \
   qt/transactionrecord.cpp \
   qt/transactiontablemodel.cpp \
   qt/transactionview.cpp \
+  qt/swapdialog.cpp \
   qt/walletframe.cpp \
   qt/walletmodel.cpp \
   qt/walletmodeltransaction.cpp \

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
@@ -94,6 +94,7 @@ DYNAMIC_TESTS =\
   test/sighash_tests.cpp \
   test/sigopcount_tests.cpp \
   test/skiplist_tests.cpp \
+  test/ss58_tests.cpp \
   test/streams_tests.cpp \
   test/test_dynamic.cpp \
   test/test_dynamic.h \

diff --git a/src/bdap/audit.cpp b/src/bdap/audit.cpp
@@ -243,7 +243,7 @@ bool BuildAuditJson(const CAudit& audit, UniValue& oAudit)
         oAuditHashes.push_back(Pair("audit_hash" + std::to_string(counter), stringFromVch(vchAudit)));
     }
     oAudit.push_back(Pair("version", std::to_string(audit.Version())));
-    oAudit.push_back(Pair("audit_count", auditData.vAuditData.size()));
+    oAudit.push_back(Pair("audit_count", (int)auditData.vAuditData.size()));
     oAudit.push_back(Pair("audit_hashes", oAuditHashes));
     oAudit.push_back(Pair("timestamp", std::to_string(auditData.nTimeStamp)));
     oAudit.push_back(Pair("owner", stringFromVch(audit.vchOwnerFullObjectPath)));
@@ -268,7 +268,7 @@ bool BuildVerifyAuditJson(const CAudit& audit, UniValue& oAudit)
     CAuditData auditData = audit.GetAuditData();
 
     oAudit.push_back(Pair("version", std::to_string(audit.Version())));
-    oAudit.push_back(Pair("audit_count", auditData.vAuditData.size()));
+    oAudit.push_back(Pair("audit_count", (int)auditData.vAuditData.size()));
     oAudit.push_back(Pair("timestamp", std::to_string(auditData.nTimeStamp)));
     oAudit.push_back(Pair("owner", stringFromVch(audit.vchOwnerFullObjectPath)));
     oAudit.push_back(Pair("signed", audit.IsSigned() ? "True" : "False"));

diff --git a/src/bench/bench_dynamic.cpp b/src/bench/bench_dynamic.cpp
@@ -12,7 +12,6 @@
 int
 main(int argc, char** argv)
 {
-    RandomInit();
     ECC_Start();
     SetupEnvironment();
     fPrintToDebugLog = false; // don't want to write to debug.log file

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -20,7 +20,7 @@
 #define CLIENT_VERSION_MAJOR 2
 #define CLIENT_VERSION_MINOR 5
 #define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 0
+#define CLIENT_VERSION_BUILD 1
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

diff --git a/src/crypto/sha512.h b/src/crypto/sha512.h
@@ -17,7 +17,7 @@ class CSHA512
     uint64_t bytes;
 
 public:
-    static const size_t OUTPUT_SIZE = 64;
+    static constexpr size_t OUTPUT_SIZE = 64;
 
     CSHA512();
     CSHA512& Write(const unsigned char* data, size_t len);

diff --git a/src/fluid/fluid.cpp b/src/fluid/fluid.cpp
@@ -28,8 +28,7 @@ extern CWallet* pwalletMain;
 
 bool IsTransactionFluid(const CScript& txOut)
 {
-    return (txOut.IsProtocolInstruction(MINT_TX) || txOut.IsProtocolInstruction(DYNODE_MODFIY_TX) || txOut.IsProtocolInstruction(MINING_MODIFY_TX) || 
-                txOut.IsProtocolInstruction(BDAP_REVOKE_TX));
+    return txOut.IsFluid();
 }
 
 bool IsTransactionFluid(const CTransaction& tx, CScript& fluidScript)

diff --git a/src/hash.h b/src/hash.h
@@ -396,4 +396,27 @@ inline uint256 hash_Argon2d(const T1 pbegin, const T1 pend, const unsigned int&
     return hashResult;
 }
 
+template<typename T1>
+inline uint256 HashBlake2b_256(const T1 pbegin, const T1 pend)
+{
+    static unsigned char pblank[1];
+    uint256 hash;
+    blake2b_state S[1];
+    blake2b_init( S, OUTPUT_BYTES ); // 32 Bytes -> 256-bit hash
+    blake2b_update( S, (pbegin == pend ? pblank : (unsigned char*)&pbegin[0]), (pend - pbegin) * sizeof(pbegin[0]) );
+    blake2b_final( S, (unsigned char*)&hash, OUTPUT_BYTES );
+    return hash;
+}
+
+template<typename T1>
+inline uint512 HashBlake2b_512(const T1 pbegin, const T1 pend)
+{
+    static unsigned char pblank[1];
+    uint512 hash;
+    blake2b_state S[1];
+    blake2b_init( S, 64 ); // 64 Bytes -> 512-bit hash
+    blake2b_update( S, (pbegin == pend ? pblank : (unsigned char*)&pbegin[0]), (pend - pbegin) * sizeof(pbegin[0]) );
+    blake2b_final( S, (unsigned char*)&hash, 64 );
+    return hash;
+}
 #endif // DYNAMIC_HASH_H
diff --git a/src/init.cpp b/src/init.cpp
@@ -61,6 +61,8 @@
 #include "script/sigcache.h"
 #include "script/standard.h"
 #include "spork.h"
+#include "swap/swapdata.h"
+#include "swap/swapdb.h"
 #include "timedata.h"
 #include "torcontrol.h"
 #include "txdb.h"
@@ -377,6 +379,8 @@ void PrepareShutdown()
         // LibTorrent DHT Netowrk Services
         //delete pMutableDataDB;
         //pMutableDataDB = NULL;
+        delete pSwapDB;
+        pSwapDB = NULL;
     }
 #ifdef ENABLE_WALLET
     if (pwalletMain)
@@ -1739,6 +1743,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                 delete pLinkManager;
                 // LibTorrent DHT Netowrk Services
                 //delete pMutableDataDB;
+                delete pSwapDB;
 
                 pblocktree = new CBlockTreeDB(nBlockTreeDBCache, false, fReindex);
                 pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex || fReindexChainState);
@@ -1760,6 +1765,8 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                 pLinkManager = new CLinkManager();
                 // Init DHT Services DB
                 //pMutableDataDB = new CMutableDataDB(nTotalCache * 35, false, fReindex, obfuscate);
+                // Init SwapDB
+                pSwapDB = new CSwapDB(nTotalCache * 35, false, fReindex, obfuscate);
 
                 if (fReindex) {
                     pblocktree->WriteReindexing(true);

diff --git a/src/net.h b/src/net.h
@@ -61,8 +61,8 @@ static const int FEELER_INTERVAL = 120;
 static const unsigned int MAX_INV_SZ = 50000;
 /** The maximum number of new addresses to accumulate before announcing. */
 static const unsigned int MAX_ADDR_TO_SEND = 1000;
-/** Maximum length of incoming protocol messages (no message over 2 MiB is currently acceptable). */
-static const unsigned int MAX_PROTOCOL_MESSAGE_LENGTH = 2 * 1024 * 1024;
+/** Maximum length of incoming protocol messages (no message over 4 MB is currently acceptable). */
+static const unsigned int MAX_PROTOCOL_MESSAGE_LENGTH = (4 * 1024 * 1024) + 100;
 /** Maximum length of strSubVer in `version` message */
 static const unsigned int MAX_SUBVERSION_LENGTH = 256;
 /** Maximum number of outgoing nodes */

diff --git a/src/ntp.cpp b/src/ntp.cpp
@@ -15,7 +15,7 @@
 #include "utiltime.h"
 #include "warnings.h"
 
-extern int GetRandInt(int nMax);
+extern int GetRandInt(int nMax) noexcept;
 
 /*
  * NTP uses two fixed point formats.  The first (l_fp) is the "long"

diff --git a/src/policy/policy.h b/src/policy/policy.h
@@ -62,6 +62,9 @@ static const unsigned int STANDARD_LOCKTIME_VERIFY_FLAGS = LOCKTIME_VERIFY_SEQUE
 /** Used for BDAP transactions. */
 static const int BDAP_TX_VERSION = 0x3500;
 
+/** Used for BDAP transactions. */
+static const int SWAP_TX_VERSION = 0x3600;
+
 bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType);
 /**
      * Check for standard transaction types

diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
@@ -88,6 +88,11 @@ bool CTxOut::GetBDAPOpCodes(int& opCode1, int& opCode2, std::vector<std::vector<
     return DecodeBDAPScript(scriptPubKey, opCode1, opCode2, vvch);
 }
 
+bool CTxOut::IsFluid() const
+{
+    return scriptPubKey.IsFluid();
+}
+
 bool CTxOut::IsData() const
 {
     opcodetype opcode;
@@ -101,6 +106,17 @@ bool CTxOut::IsData() const
     return false;
 }
 
+bool CTxOut::GetData(std::vector<unsigned char>& vchData) const
+{
+    if (!IsData())
+        return false;
+
+    if (GetOpReturnData(scriptPubKey, vchData))
+        return true;
+
+    return false;
+}
+
 std::string CTxOut::ToString() const
 {
     return strprintf("CTxOut(nValue=%d.%08d, scriptPubKey=%s, IsBDAP=%s, IsData=%s)", nValue / COIN, nValue % COIN

diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -220,8 +220,10 @@ class CTxOut
 
     bool IsBDAP() const;
     bool IsData() const;
+    bool GetData(std::vector<unsigned char>& vchData) const;
     bool GetBDAPOpCodes(int& opCode1, int& opCode2) const;
     bool GetBDAPOpCodes(int& opCode1, int& opCode2, std::vector<std::vector<unsigned char>>& vvch) const;
+    bool IsFluid() const;
 
     std::string ToString() const;
 };

diff --git a/src/qt/dynamic.qrc b/src/qt/dynamic.qrc
@@ -35,8 +35,6 @@
         <file alias="key">res/icons/drk/key.png</file>
         <file alias="lock_closed">res/icons/drk/lock_closed.png</file>
         <file alias="lock_open">res/icons/drk/lock_open.png</file>
-        <file alias="staking_active">res/icons/drk/staking_active.png</file>
-        <file alias="staking_inactive">res/icons/drk/staking_inactive.png</file>
         <file alias="options">res/icons/drk/configure.png</file>
         <file alias="history">res/icons/drk/history.png</file>
         <file alias="overview">res/icons/drk/overview.png</file>
@@ -55,7 +53,6 @@
         <file alias="transaction_4">res/icons/drk/clock4.png</file>
         <file alias="transaction_5">res/icons/drk/clock5.png</file>
         <file alias="tx_mined">res/icons/drk/tx_mined.png</file>
-        <file alias="pos">res/icons/drk/pos.png</file>
         <file alias="bdap">res/icons/drk/bdap.png</file>
         <file alias="tx_input">res/icons/drk/tx_input.png</file>
         <file alias="tx_output">res/icons/drk/tx_output.png</file>