Merge pull request #348 from duality-solutions/v2.4.20-Last

v2.4.20 Last Changes Before New Privatenet

Author: AmirAbrams

src/bdap/bdap.h

@@ -55,7 +55,7 @@ static constexpr unsigned int MAX_BDAP_SIGNATURE_PROOF    = 90; // TODO (bdap):
 static constexpr unsigned int MAX_BDAP_LINK_DATA_SIZE     = 1592;
 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 constexpr bool ENFORCE_BDAP_FEES                   = true;
 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/vgpmessage.cpp

@@ -283,11 +283,7 @@ bool CVGPMessage::IsNull() const
 
 uint256 CVGPMessage::GetHash() const
 {
-    CUnsignedVGPMessage unsignedMessage(vchMsg);
-    if (unsignedMessage.nVersion == 1)
-        return Hash(this->vchMsg.begin(), this->vchMsg.end());
-
-    return unsignedMessage.GetHash();
+    return CUnsignedVGPMessage(vchMsg).GetHash();
 }
 
 bool CVGPMessage::IsInEffect() const
@@ -391,9 +387,9 @@ int CVGPMessage::ProcessMessage(std::string& strErrorMessage) const
         strErrorMessage = "VGP message has an invalid signature. Adding 100 to ban score.";
         return 100; // this will add 100 to the peer's ban score
     }
-    if (unsignedMessage.nVersion > 1 && UintToArith256(unsignedMessage.GetHash()) > UintToArith256(VGP_MESSAGE_MIN_HASH_TARGET))
+    if (UintToArith256(unsignedMessage.GetHash()) > UintToArith256(VGP_MESSAGE_MIN_HASH_TARGET))
     {
-        LogPrintf("%s -- message %s\n", __func__, unsignedMessage.ToString());
+        LogPrintf("%s -- message proof hash failed to meet target %s\n", __func__, unsignedMessage.ToString());
         strErrorMessage = "Message proof of work is invalid and under the target.";
         return 100; // this will add 100 to the peer's ban score
     }

src/bdap/vgpmessage.h

@@ -41,7 +41,7 @@ static const uint256 VGP_MESSAGE_MIN_HASH_TARGET = uint256S("00fffffffffffffffff
 class CUnsignedVGPMessage
 {
 public:
-    static const int CURRENT_VERSION = 2;
+    static const int CURRENT_VERSION = 1;
     int nVersion;
     uint256 SubjectID;
     uint256 MessageID; // derived by hashing the public key + nTimestamp

src/chainparams.cpp

@@ -614,15 +614,15 @@ class CPrivateNetParams : public CChainParams
         nPruneAfterHeight = 100;
         startNewChain = false;
 
-        genesis = CreateGenesisBlock(1549926519, 32244, UintToArith256(consensus.powLimit).GetCompact(), 1, (1 * COIN));
+        genesis = CreateGenesisBlock(1559867972, 60883, UintToArith256(consensus.powLimit).GetCompact(), 1, (1 * COIN));
         if (startNewChain == true) {
             MineGenesis(genesis, consensus.powLimit, true);
         }
 
         consensus.hashGenesisBlock = genesis.GetHash();
 
         if (!startNewChain) {
-            assert(consensus.hashGenesisBlock == uint256S("0x0000f8b156a85be050a1304d3101bcc7018c1b32909a81abd6ab1d17c5090d63"));
+            assert(consensus.hashGenesisBlock == uint256S("0x000055a9348d53bed51996102ad11d129207e85dc197d01a5a69d5fd10af0e8a"));
             assert(genesis.hashMerkleRoot == uint256S("0xfa0e753db5a853ebbc52594eb62fa8219155547b426fba8789fa96dbf07e6ed5"));
         }
         vFixedSeeds.clear();

src/version.h

@@ -12,7 +12,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 71200;
+static const int PROTOCOL_VERSION = 71300; // TODO (BDAP): ***** Revert to 71000
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -21,7 +21,7 @@ static const int INIT_PROTO_VERSION = 209;
 static const int GETHEADERS_VERSION = 60800;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 70900; // Only connect to v2.3 Nodes and newer
+static const int MIN_PEER_PROTO_VERSION = 71300; // TODO (BDAP): ***** Revert to 70900 Only connect to v2.3 Nodes and newer
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this