added temporary switch for qearn update

qubic · Jan 13, 2025 · 23fff8d · 23fff8d
1 parent ec507db
commit 23fff8d
Show file tree

Hide file tree

Showing 7 changed files with 1,768 additions and 2 deletions.
diff --git a/src/Qubic.vcxproj b/src/Qubic.vcxproj
@@ -23,6 +23,7 @@
     <ClInclude Include="assets\net_msg_impl.h" />
     <ClInclude Include="common_buffers.h" />
     <ClInclude Include="contracts\ComputorControlledFund.h" />
+    <ClInclude Include="contracts\Qearn_old.h" />
     <ClInclude Include="contracts\SupplyWatcher.h" />
     <ClInclude Include="contracts\EmptyTemplate.h" />
     <ClInclude Include="contracts\GeneralQuorumProposal.h" />

diff --git a/src/Qubic.vcxproj.filters b/src/Qubic.vcxproj.filters
@@ -116,7 +116,7 @@
       <Filter>contracts</Filter>
     </ClInclude>
     <ClInclude Include="contracts\QVAULT.h">
-       <Filter>contracts</Filter>
+      <Filter>contracts</Filter>
     </ClInclude>
     <ClInclude Include="contract_core\contract_def.h">
       <Filter>contract_core</Filter>
@@ -211,6 +211,9 @@
     <ClInclude Include="platform\global_var.h">
       <Filter>platform</Filter>
     </ClInclude>
+    <ClInclude Include="contracts\Qearn_old.h">
+      <Filter>contracts</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="platform">

diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
@@ -149,7 +149,11 @@ struct __FunctionOrProcedureBeginEndGuard
 #define CONTRACT_INDEX QEARN_CONTRACT_INDEX
 #define CONTRACT_STATE_TYPE QEARN
 #define CONTRACT_STATE2_TYPE QEARN2
+#ifdef QEARN_UPDATE
 #include "contracts/Qearn.h"
+#else
+#include "contracts/Qearn_old.h"
+#endif
 
 #undef CONTRACT_INDEX
 #undef CONTRACT_STATE_TYPE

diff --git a/src/contracts/Qearn.h b/src/contracts/Qearn.h
@@ -253,7 +253,7 @@ struct QEARN : public ContractBase
 
     };
 
-    array<StatsInfo, QEARN_MAX_EPOCHS> statsInfo;
+    Array<StatsInfo, QEARN_MAX_EPOCHS> statsInfo;
 
     struct getStateOfRound_locals {
         uint32 firstEpoch;