Merge pull request qubic#815 from qubic/develop (Release v1.285.0)

Release v1.285.0

Author: Franziska-Mueller

src/Qubic.vcxproj

@@ -46,9 +46,9 @@
     <ClInclude Include="contracts\QRaffle.h" />
     <ClInclude Include="contracts\QBond.h" />
     <ClInclude Include="contracts\QIP.h" />
+    <ClInclude Include="contracts\Qusino.h" />
     <ClInclude Include="contracts\QReservePool.h" />
     <ClInclude Include="contracts\QThirtyFour.h" />
-    <ClInclude Include="contracts\QSurv.h" />
     <ClInclude Include="contracts\Pulse.h" />
     <ClInclude Include="contracts\TestExampleA.h" />
     <ClInclude Include="contracts\TestExampleB.h" />
@@ -107,6 +107,7 @@
     <ClInclude Include="oracle_core\oracle_interfaces_def.h" />
     <ClInclude Include="oracle_core\oracle_transactions.h" />
     <ClInclude Include="oracle_core\snapshot_files.h" />
+    <ClInclude Include="oracle_interfaces\DogeShareValidation.h" />
     <ClInclude Include="oracle_interfaces\Mock.h" />
     <ClInclude Include="oracle_interfaces\Price.h" />
     <ClInclude Include="platform\assert.h" />

src/Qubic.vcxproj.filters

@@ -132,6 +132,9 @@
     <ClInclude Include="contracts\QIP.h">
       <Filter>contracts</Filter>
     </ClInclude>
+    <ClInclude Include="contracts\Qusino.h">
+      <Filter>contracts</Filter>
+    </ClInclude>
     <ClInclude Include="contract_core\contract_def.h">
       <Filter>contract_core</Filter>
     </ClInclude>
@@ -305,10 +308,6 @@
     <ClInclude Include="contracts\QDuel.h">
       <Filter>contracts</Filter>
     </ClInclude>
-
-    <ClInclude Include="contracts\QSurv.h">
-      <Filter>contracts</Filter>
-    </ClInclude>
     <ClInclude Include="contracts\Pulse.h">
       <Filter>contracts</Filter>
     </ClInclude>
@@ -369,6 +368,9 @@
     <ClInclude Include="oracle_core\snapshot_files.h">
       <Filter>oracle_core</Filter>
     </ClInclude>
+    <ClInclude Include="oracle_interfaces\DogeShareValidation.h">
+      <Filter>oracle_interfaces</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="platform">

src/contract_core/contract_def.h

@@ -264,17 +264,17 @@
 #define CONTRACT_STATE2_TYPE VOTTUNBRIDGE2
 #include "contracts/VottunBridge.h"
 
-#ifndef NO_QSURV
+#ifndef NO_QUSINO
 
 #undef CONTRACT_INDEX
 #undef CONTRACT_STATE_TYPE
 #undef CONTRACT_STATE2_TYPE
 
-#define QSURV_CONTRACT_INDEX 26
-#define CONTRACT_INDEX QSURV_CONTRACT_INDEX
-#define CONTRACT_STATE_TYPE QSURV
-#define CONTRACT_STATE2_TYPE QSURV2
-#include "contracts/QSurv.h"
+#define QUSINO_CONTRACT_INDEX 26
+#define CONTRACT_INDEX QUSINO_CONTRACT_INDEX
+#define CONTRACT_STATE_TYPE QUSINO
+#define CONTRACT_STATE2_TYPE QUSINO2
+#include "contracts/Qusino.h"
 
 #endif
 
@@ -389,10 +389,9 @@ constexpr struct ContractDescription
     {"QDUEL", 199, 10000, sizeof(QDUEL::StateData)}, // proposal in epoch 197, IPO in 198, construction and first use in 199
 	{"PULSE", 204, 10000, sizeof(PULSE::StateData)}, // proposal in epoch 202, IPO in 203, construction and first use in 204
     {"VOTTUN", 206, 10000, sizeof(VOTTUNBRIDGE::StateData)}, // proposal in epoch 204, IPO in 205, construction and first use in 206
-#ifndef NO_QSURV
-	{"QSURV", 207, 10000, sizeof(QSURV::StateData)}, // proposal in epoch 205, IPO in 206, construction and first use in 207
+#ifndef NO_QUSINO
+    {"QUSINO", 208, 10000, sizeof(QUSINO::StateData)}, // proposal in epoch 206, IPO in 207, construction and first use in 208
 #endif
-
     // new contracts should be added above this line
 #ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
     {"TESTEXA", 138, 10000, sizeof(TESTEXA::StateData)},
@@ -514,8 +513,8 @@ static void initializeContracts()
     REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QDUEL);
 	REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(PULSE);
     REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(VOTTUNBRIDGE);
-#ifndef NO_QSURV
-	REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QSURV);
+#ifndef NO_QUSINO
+    REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QUSINO);
 #endif
     // new contracts should be added above this line
 #ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -526,6 +525,15 @@ static void initializeContracts()
 #endif
 }
 
+// Automatic Contract Padding
+// Contracts whose state struct grew this epoch. Update this list each epoch as needed.
+// When enabling, replace both lines below, e.g.:
+//   constexpr unsigned int paddableContracts[] = { RANDOM_CONTRACT_INDEX };
+//   constexpr unsigned int paddableCount = sizeof(paddableContracts) / sizeof(paddableContracts[0]);
+constexpr const unsigned int* paddableContracts = nullptr;
+constexpr unsigned int paddableCount = 0;
+
+
 // Class for registering and looking up user procedures independently of input type, for example for notifications
 class UserProcedureRegistry
 {