Merge pull request #522 from VerusCoin/dev

Dev
VerusCoin · Jun 9, 2023 · 4beede9 · 4beede9
2 parents 8ed3432 + 9051936
commit 4beede9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/pbaas/crosschainrpc.cpp b/src/pbaas/crosschainrpc.cpp
@@ -53,7 +53,7 @@ extern std::string VERUS_CHAINNAME;
 
 uint32_t PBAAS_TESTFORK2_TIME = 1684281600;
 uint32_t PBAAS_TESTFORK3_TIME = 1685379600;
-uint32_t PBAAS_TESTFORK4_TIME = 1686330000;
+uint32_t PBAAS_TESTFORK4_TIME = 1686416400;
 uint32_t PBAAS_MAINDEFI3_HEIGHT = 2553500;
 uint32_t PBAAS_ENFORCE_CORRECT_EVIDENCE_TIME = 1684359650;
 

diff --git a/src/pbaas/notarization.cpp b/src/pbaas/notarization.cpp
@@ -1312,6 +1312,14 @@ bool CPBaaSNotarization::NextNotarizationInfo(const CCurrencyDefinition &sourceS
                 newNotarization.SetLaunchCleared();
                 newNotarization.currencyState.SetLaunchClear();
 
+                forcedRefund = (destCurrency.IsFractional() &&
+                                        PBAAS_TESTMODE &&
+                                        destSystemID == VERUS_CHAINID &&
+                                        lastExportHeight < ConnectedChains.GetZeroViaHeight(true) &&
+                                        GetTime() > PBAAS_TESTFORK4_TIME &&
+                                        newPreConversionReservesIn.valueMap[destSystemID] &&
+                                        !newNotarization.currencyState.reserves[newNotarization.currencyState.GetReserveMap()[destSystemID]]);
+
                 // if we are connected to another currency, make sure it will also start before we confirm that we can
                 CCurrencyDefinition coLaunchCurrency;
                 CCoinbaseCurrencyState coLaunchState;

diff --git a/src/pbaas/pbaas.cpp b/src/pbaas/pbaas.cpp
@@ -4684,6 +4684,7 @@ bool PrecheckReserveTransfer(const CTransaction &tx, int32_t outNum, CValidation
         }
         else if (haveFullChain &&
                  ConnectedChains.CheckZeroViaOnlyPostLaunch(height) &&
+                 (!PBAAS_TESTMODE || chainActive[height - 1]->nTime >= PBAAS_TESTFORK4_TIME) &&
                  !importState.IsLaunchCompleteMarker())
         {
             if (rt.IsCurrencyExport() ||
@@ -5915,7 +5916,7 @@ bool CConnectedChains::IsUpgradeActive(const uint160 &upgradeID, uint32_t blockH
 
 uint32_t CConnectedChains::GetZeroViaHeight(bool getVerusHeight) const
 {
-    return (getVerusHeight || IsVerusActive()) ? (PBAAS_TESTMODE ? 67631 : 2577258) : 0;
+    return (getVerusHeight || IsVerusActive()) ? (PBAAS_TESTMODE ? 69013 : 2578653) : 0;
 }
 
 bool CConnectedChains::CheckZeroViaOnlyPostLaunch(uint32_t height) const