Merge pull request KomodoPlatform#488 from VerusCoin/dev

v0.9.9-3
who-biz · Mar 21, 2023 · 0f93a0a · 0f93a0a
2 parents 69628ef + e80cc51
commit 0f93a0a
Show file tree

Hide file tree

Showing 25 changed files with 550 additions and 455 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 ########################################################################################################################
 variables:
 
-  VERSION: 0.9.9-2
+  VERSION: 0.9.9-3
 
   VERUS_CLI_ARM64_LINUX: Verus-CLI-Linux-v${VERSION}-arm64.tar.gz
   VERUS_CLI_LINUX_X86_64: Verus-CLI-Linux-v${VERSION}-x86_64.tar.gz

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 
-## VerusCoin version 0.9.9-2
+## VerusCoin version 0.9.9-3
 
 Arguably the world's most advanced technology, zero knowledge privacy-centric blockchain, Verus Coin brings Sapling performance and zero knowledge features to an intelligent system with interchain smart contracts and a completely original, combined proof of stake/proof of work consensus algorithm that solves the nothing at stake problem. With this and its approach towards CPU mining and ASICs, Verus Coin strives to be one of the most naturally decentralizing and attack resistant blockchains in existence.
 

diff --git a/doc/man/verus-cli/linux/README.txt b/doc/man/verus-cli/linux/README.txt
@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v0.9.9-2
+VerusCoin Command Line Tools v0.9.9-3
 
 Contents:
 verusd - VerusCoin daemon

diff --git a/doc/man/verus-cli/mac/README.txt b/doc/man/verus-cli/mac/README.txt
@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v0.9.9-2
+VerusCoin Command Line Tools v0.9.9-3
 
 Contents:
 verusd - VerusCoin daemon.

diff --git a/doc/man/verus-cli/windows/README.txt b/doc/man/verus-cli/windows/README.txt
@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v0.9.9-2
+VerusCoin Command Line Tools v0.9.9-3
 
 Contents:
 verusd.exe - VerusCoin daemon

diff --git a/src/deprecation.h b/src/deprecation.h
@@ -9,7 +9,7 @@
 // * Shut down 20 weeks' worth of blocks after the estimated release block height.
 // * A warning is shown during the 2 weeks' worth of blocks prior to shut down.
 
-static const int APPROX_RELEASE_HEIGHT = 2451000;
+static const int APPROX_RELEASE_HEIGHT = 2462000;
 
 static const int WEEKS_UNTIL_DEPRECATION = 20;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 60 * 24);

diff --git a/src/key_io.cpp b/src/key_io.cpp
@@ -120,6 +120,12 @@ UniValue getvdxfid_internal(const UniValue& params)
         cleanName = CleanName(vdxfName, parentID);
         vdxfID = GetDestinationID(idDest);
     }
+    else if (vdxfName.substr(0,2) == "0x" && !(vdxfID = CTransferDestination::DecodeEthDestination(vdxfName)).IsNull())
+    {
+        parentIDName = "currencyaddresstype";
+        parentID = CIdentity::GetID("veth", parentID);
+        cleanName = vdxfName;
+    }
     else
     {
         isIndexKey = true;

diff --git a/src/komodo_globals.h b/src/komodo_globals.h
@@ -64,6 +64,8 @@ uint160 VERUS_CHAINID;
 std::string VERUS_CHAINNAME = "VRSC";
 
 uint32_t PBAAS_TESTFORK_TIME = 1679072400;
+const uint32_t PBAAS_PREMAINNET_ACTIVATION = 1679072400; // already activated, so harden with immutable value
+std::string PBAAS_TEST_ETH_CONTRACT = "0x3fa3a60240ef59460f5b34e2ec5a06ab892a2d00";
 
 bool PARAMS_LOADED = false;
 uint16_t ASSETCHAINS_P2PPORT, ASSETCHAINS_RPCPORT;

diff --git a/src/main.cpp b/src/main.cpp
@@ -1431,7 +1431,7 @@ bool ContextualCheckTransaction(
                 if (isPBaaS &&
                     (!IsVerusActive() ||
                      IsVerusMainnetActive() ||
-                     chainActive[std::min((uint32_t)chainActive.Height(), (uint32_t)nHeight)]->nTime > PBAAS_TESTFORK_TIME) &&
+                     chainActive[std::min((uint32_t)chainActive.Height(), (uint32_t)nHeight)]->nTime > PBAAS_PREMAINNET_ACTIVATION) &&
                     p.AsVector().size() >= CScript::MAX_SCRIPT_ELEMENT_SIZE)
                 {
                     if (LogAcceptCategory("notarization"))

diff --git a/src/pbaas/crosschainrpc.cpp b/src/pbaas/crosschainrpc.cpp
@@ -50,7 +50,6 @@ extern string PBAAS_HOST;
 extern string PBAAS_USERPASS;
 extern int32_t PBAAS_PORT;
 extern std::string VERUS_CHAINNAME;
-extern uint32_t PBAAS_TESTFORK_TIME;
 
 //
 // Exception thrown on connection error.  This error is used to determine

diff --git a/src/pbaas/crosschainrpc.h b/src/pbaas/crosschainrpc.h
@@ -29,6 +29,9 @@ static const uint32_t PBAAS_VERSION = 1;
 static const uint32_t PBAAS_VERSION_INVALID = 0;
 
 extern uint32_t PBAAS_TESTFORK_TIME;
+extern const uint32_t PBAAS_PREMAINNET_ACTIVATION;
+
+extern std::string PBAAS_TEST_ETH_CONTRACT;
 
 class CTransaction;
 class CScript;
@@ -1667,6 +1670,7 @@ class CNativeHashWriter
     }
 
     int GetType() const { return SER_GETHASH; }
+    CCurrencyDefinition::EHashTypes GetHashType() const { return nativeHashType; }
     int GetVersion() const { return PROTOCOL_VERSION; }
 
     template<typename T>

diff --git a/src/pbaas/identity.cpp b/src/pbaas/identity.cpp
@@ -905,7 +905,7 @@ bool HasReferralRequired(const CIdentity &identity, const CTransaction &tx, int3
                     if (checkIdentity.IsValidUnrevoked() &&
                         (checkIdentity.parent == parentID ||
                          idID == parentID ||
-                         (chainActive[height]->nTime >= PBAAS_TESTFORK_TIME && !checkReferralID.IsNull() && idID == checkReferralID)))
+                         (chainActive[height]->nTime >= PBAAS_PREMAINNET_ACTIVATION && !checkReferralID.IsNull() && idID == checkReferralID)))
                     {
                         checkIdentities.push_back(checkIdentity);
                     }
@@ -1240,7 +1240,7 @@ bool ValidateSpendingIdentityReservation(const CTransaction &tx, int32_t outNum,
                 }
                 newIdentity = CIdentity(p.vData[0]);
                 if (newIdentity.parent.IsNull() &&
-                    chainActive[height - 1]->nTime > PBAAS_TESTFORK_TIME &&
+                    chainActive[height - 1]->nTime > PBAAS_PREMAINNET_ACTIVATION &&
                     !HasReferralRequired(newIdentity, tx, outNum, state, height, ConnectedChains.ThisChain()))
                 {
                     return state.Error("Cannot make identity without valid referral");
@@ -1878,7 +1878,7 @@ bool PrecheckIdentityReservation(const CTransaction &tx, int32_t outNum, CValida
                 newIdentity = CIdentity(p.vData[0]);
                 uint160 dummyParent;
                 valid = newIdentity.IsValid() &&
-                        (((chainActive.LastTip()->nTime < PBAAS_TESTFORK_TIME ||
+                        (((chainActive.LastTip()->nTime < PBAAS_PREMAINNET_ACTIVATION ||
                            burnSet.count(newIdentity.GetID())) &&
                           newIdentity.name == CleanName(newIdentity.name, dummyParent)) ||
                          newIdentity.name == CleanName(newIdentity.name, dummyParent, true)) &&