Set mainnet and testnet arbitrage activation

VerusCoin · Dec 24, 2023 · c00b14b · c00b14b
1 parent ddcbbf0
commit c00b14b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/pbaas/crosschainrpc.cpp b/src/pbaas/crosschainrpc.cpp
@@ -59,7 +59,7 @@ uint32_t PBAAS_TESTFORK6_TIME = 1687994100;
 uint32_t PBAAS_TESTFORK7_TIME = 1688799600;
 uint32_t PBAAS_TESTFORK8_TIME = 1690304400;
 uint32_t PBAAS_TESTFORK9_TIME = 1701240000;
-uint32_t PBAAS_TESTFORK10_TIME = 1703178000;
+uint32_t PBAAS_TESTFORK10_TIME = 1703844000;
 
 uint32_t PBAAS_MAINDEFI3_HEIGHT = 2553500;
 uint32_t PBAAS_CLEARCONVERT_HEIGHT = 2588590;

diff --git a/src/pbaas/pbaas.cpp b/src/pbaas/pbaas.cpp
@@ -6446,12 +6446,12 @@ bool CConnectedChains::IsUpgradeActive(const uint160 &upgradeID, uint32_t blockH
 
 uint32_t CConnectedChains::GetZeroViaHeight(bool getVerusHeight) const
 {
-    return (getVerusHeight || IsVerusActive()) ? (PBAAS_TESTMODE ? 1 : 2578653) : 0;
+    return (getVerusHeight || IsVerusActive()) ? (PBAAS_TESTMODE ? 69013 : 2578653) : 0;
 }
 
 uint32_t CConnectedChains::GetOptimizedETHProofHeight(bool getVerusHeight) const
 {
-    return (getVerusHeight || _IsVerusActive()) ? (PBAAS_TESTMODE && PBAAS_OPTIMIZE_ETH_HEIGHT > 1 ? 1 : PBAAS_OPTIMIZE_ETH_HEIGHT) : 0;
+    return (getVerusHeight || _IsVerusActive()) ? (PBAAS_TESTMODE && PBAAS_OPTIMIZE_ETH_HEIGHT > 285700 ? 285700 : PBAAS_OPTIMIZE_ETH_HEIGHT) : 0;
 }
 
 bool CConnectedChains::ShouldOptimizeETHProof() const
@@ -6466,7 +6466,7 @@ bool CConnectedChains::CheckZeroViaOnlyPostLaunch(uint32_t height) const
 
 uint32_t CConnectedChains::IncludePostLaunchFeeHeight(bool getVerusHeight) const
 {
-    return (getVerusHeight || IsVerusActive()) ? (PBAAS_TESTMODE ? 1 : 2606532) : 0;
+    return (getVerusHeight || IsVerusActive()) ? (PBAAS_TESTMODE ? 94091 : 2606532) : 0;
 }
 
 bool CConnectedChains::IncludePostLaunchFees(uint32_t height) const
@@ -6484,7 +6484,7 @@ bool CConnectedChains::IncludePostLaunchFees(uint32_t height) const
 
 uint32_t CConnectedChains::StrictCheckIDExportHeight(bool getVerusHeight) const
 {
-    return (getVerusHeight || IsVerusActive()) ? (PBAAS_TESTMODE ? 1 : 2634460) : 0;
+    return (getVerusHeight || IsVerusActive()) ? (PBAAS_TESTMODE ? 187000 : 2634460) : 0;
 }
 
 bool CConnectedChains::StrictCheckIDExport(uint32_t height) const
@@ -6502,7 +6502,7 @@ bool CConnectedChains::StrictCheckIDExport(uint32_t height) const
 
 uint32_t CConnectedChains::DiscernBlockOneLaunchInfoHeight(bool getVerusHeight) const
 {
-    return (getVerusHeight || IsVerusActive()) ? (PBAAS_TESTMODE ? 1 : 2824790) : 0;
+    return (getVerusHeight || IsVerusActive()) ? (PBAAS_TESTMODE ? 302170 : 2824790) : 0;
 }
 
 bool CConnectedChains::DiscernBlockOneLaunchInfo(uint32_t height) const
@@ -6519,7 +6519,7 @@ bool CConnectedChains::CheckClearConvert(uint32_t height) const
 
 uint32_t CConnectedChains::AutoArbitrageEnabledHeight(bool getVerusHeight) const
 {
-    return (getVerusHeight || IsVerusActive()) ? (PBAAS_TESTMODE ? 1 : 2870202) : 2;
+    return (getVerusHeight || IsVerusActive()) ? (PBAAS_TESTMODE ? 350468 : 2873057) : 2;
 }
 
 bool CConnectedChains::AutoArbitrageEnabled(uint32_t height) const