IPO QThirtyFour

src/Qubic.vcxproj

@@ -47,6 +47,8 @@
     <ClInclude Include="contracts\QBond.h" />
     <ClInclude Include="contracts\QIP.h" />
     <ClInclude Include="contracts\SupplyWatcher_old.h" />
+    <ClInclude Include="contracts\QReservePool.h" />
+    <ClInclude Include="contracts\QThirtyFour.h" />
     <ClInclude Include="contracts\TestExampleA.h" />
     <ClInclude Include="contracts\TestExampleB.h" />
     <ClInclude Include="contracts\TestExampleC.h" />

src/Qubic.vcxproj.filters

@@ -303,6 +303,12 @@
     <ClInclude Include="contracts\RandomLottery.h">
       <Filter>contracts</Filter>
     </ClInclude>
+    <ClInclude Include="contracts\QReservePool.h">
+      <Filter>contracts</Filter>
+    </ClInclude>
+    <ClInclude Include="contracts\QThirtyFour.h">
+      <Filter>contracts</Filter>
+    </ClInclude>
     <ClInclude Include="contracts\QDuel.h">
       <Filter>contracts</Filter>
     </ClInclude>

src/contract_core/contract_def.h

@@ -215,19 +215,37 @@
 #define CONTRACT_STATE2_TYPE QRWA2
 #include "contracts/qRWA.h"
 
-#ifndef NO_QDUEL
+#undef CONTRACT_INDEX
+#undef CONTRACT_STATE_TYPE
+#undef CONTRACT_STATE2_TYPE
+
+#define QRP_CONTRACT_INDEX 21
+#define CONTRACT_INDEX QRP_CONTRACT_INDEX
+#define CONTRACT_STATE_TYPE QRP
+#define CONTRACT_STATE2_TYPE QRP2
+#include "contracts/QReservePool.h"
 
 #undef CONTRACT_INDEX
 #undef CONTRACT_STATE_TYPE
 #undef CONTRACT_STATE2_TYPE
 
-#define QDUEL_CONTRACT_INDEX 21
+#define QTF_CONTRACT_INDEX 22
+#define CONTRACT_INDEX QTF_CONTRACT_INDEX
+#define CONTRACT_STATE_TYPE QTF
+#define CONTRACT_STATE2_TYPE QTF2
+#include "contracts/QThirtyFour.h"
+
+#ifndef NO_QDUEL
+#undef CONTRACT_INDEX
+#undef CONTRACT_STATE_TYPE
+#undef CONTRACT_STATE2_TYPE
+
+#define QDUEL_CONTRACT_INDEX 23
 #define CONTRACT_INDEX QDUEL_CONTRACT_INDEX
 #define CONTRACT_STATE_TYPE QDUEL
 #define CONTRACT_STATE2_TYPE QDUEL2
 #include "contracts/QDuel.h"
-
-#endif
+#endif // NO_QDUEL
 
 // new contracts should be added above this line
 
@@ -337,6 +355,8 @@ constexpr struct ContractDescription
     {"QIP", 189, 10000, sizeof(QIP)}, // proposal in epoch 187, IPO in 188, construction and first use in 189
     {"QRAFFLE", 192, 10000, sizeof(QRAFFLE)}, // proposal in epoch 190, IPO in 191, construction and first use in 192
     {"QRWA", 197, 10000, sizeof(QRWA)}, // proposal in epoch 195, IPO in 196, construction and first use in 197
+	{"QRP", 199, 10000, sizeof(IPO)}, // proposal in epoch 197, IPO in 198, construction and first use in 199
+	{"QTF", 199, 10000, sizeof(QTF)}, // proposal in epoch 197, IPO in 198, construction and first use in 199
 #ifndef NO_QDUEL
     {"QDUEL", 199, 10000, sizeof(QDUEL)}, // proposal in epoch 197, IPO in 198, construction and first use in 199
 #endif
@@ -459,6 +479,8 @@ static void initializeContracts()
 #ifndef NO_QDUEL
     REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QDUEL);
 #endif
+    REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QRP);
+    REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QTF);
     // new contracts should be added above this line
 #ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
     REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);

src/contracts/QDuel.h

@@ -1,15 +1,15 @@
 using namespace QPI;
 
-constexpr uint32 QDUEL_MAX_NUMBER_OF_ROOMS = 512;
-constexpr uint64 QDUEL_MINIMUM_DUEL_AMOUNT = 10000;
+constexpr uint16 QDUEL_MAX_NUMBER_OF_ROOMS = 512;
+constexpr uint16 QDUEL_MINIMUM_DUEL_AMOUNT = 10000;
 constexpr uint8 QDUEL_DEV_FEE_PERCENT_BPS = 15;          // 0.15% * QDUEL_PERCENT_SCALE
 constexpr uint8 QDUEL_BURN_FEE_PERCENT_BPS = 30;         // 0.3% * QDUEL_PERCENT_SCALE
 constexpr uint8 QDUEL_SHAREHOLDERS_FEE_PERCENT_BPS = 55; // 0.55% * QDUEL_PERCENT_SCALE
-constexpr uint8 QDUEL_PERCENT_SCALE = 1000;
+constexpr uint16 QDUEL_PERCENT_SCALE = 1000;
 constexpr uint8 QDUEL_TTL_HOURS = 3;
 constexpr uint8 QDUEL_TICK_UPDATE_PERIOD = 100;           // Process TICK logic once per this many ticks
-constexpr uint64 QDUEL_RANDOM_LOTTERY_ASSET_NAME = 19538; // RL
-constexpr uint64 QDUEL_ROOMS_REMOVAL_THRESHOLD_PERCENT = 75;
+constexpr uint16 QDUEL_RANDOM_LOTTERY_ASSET_NAME = 19538; // RL
+constexpr uint16 QDUEL_ROOMS_REMOVAL_THRESHOLD_PERCENT = 75;
 
 struct QDUEL2
 {
@@ -65,7 +65,7 @@ struct QDUEL : public ContractBase
 		id roomId;
 		id owner;
 		id allowedPlayer; // If zero, anyone can join
-		uint64 amount;
+		sint64 amount;
 		uint64 closeTimer;
 		DateAndTime lastUpdate;
 	};
@@ -75,22 +75,22 @@ struct QDUEL : public ContractBase
 		id userId;
 		id roomId;
 		id allowedPlayer;
-		uint64 depositedAmount;
-		uint64 locked;
-		uint64 stake;
-		uint64 raiseStep;
-		uint64 maxStake;
+		sint64 depositedAmount;
+		sint64 locked;
+		sint64 stake;
+		sint64 raiseStep;
+		sint64 maxStake;
 	};
 
 	struct AddUserData_input
 	{
 		id userId;
 		id roomId;
 		id allowedPlayer;
-		uint64 depositedAmount;
-		uint64 stake;
-		uint64 raiseStep;
-		uint64 maxStake;
+		sint64 depositedAmount;
+		sint64 stake;
+		sint64 raiseStep;
+		sint64 maxStake;
 	};
 
 	struct AddUserData_output
@@ -106,9 +106,9 @@ struct QDUEL : public ContractBase
 	struct CreateRoom_input
 	{
 		id allowedPlayer; // If zero, anyone can join
-		uint64 stake;
-		uint64 raiseStep;
-		uint64 maxStake;
+		sint64 stake;
+		sint64 raiseStep;
+		sint64 maxStake;
 	};
 
 	struct CreateRoom_output
@@ -120,7 +120,7 @@ struct QDUEL : public ContractBase
 	{
 		id owner;
 		id allowedPlayer;
-		uint64 amount;
+		sint64 amount;
 	};
 
 	struct CreateRoomRecord_output
@@ -138,14 +138,14 @@ struct QDUEL : public ContractBase
 
 	struct ComputeNextStake_input
 	{
-		uint64 stake;
-		uint64 raiseStep;
-		uint64 maxStake;
+		sint64 stake;
+		sint64 raiseStep;
+		sint64 maxStake;
 	};
 
 	struct ComputeNextStake_output
 	{
-		uint64 nextStake;
+		sint64 nextStake;
 		uint8 returnCode;
 	};
 
@@ -229,7 +229,7 @@ struct QDUEL : public ContractBase
 	struct FinalizeRoom_locals
 	{
 		UserData userData;
-		uint64 availableDeposit;
+		sint64 availableDeposit;
 		CreateRoomRecord_input createRoomInput;
 		CreateRoomRecord_output createRoomOutput;
 		ComputeNextStake_input nextStakeInput;
@@ -272,7 +272,7 @@ struct QDUEL : public ContractBase
 		uint8 devFeePercentBps;
 		uint8 burnFeePercentBps;
 		uint8 shareholdersFeePercentBps;
-		uint8 percentScale;
+		uint16 percentScale;
 		uint64 returnCode;
 	};
 
@@ -366,7 +366,7 @@ struct QDUEL : public ContractBase
 
 	struct Withdraw_input
 	{
-		uint64 amount;
+		sint64 amount;
 	};
 
 	struct Withdraw_output
@@ -377,7 +377,7 @@ struct QDUEL : public ContractBase
 	struct Withdraw_locals
 	{
 		UserData userData;
-		uint64 freeAmount;
+		sint64 freeAmount;
 	};
 
 	struct END_TICK_locals
@@ -703,7 +703,7 @@ struct QDUEL : public ContractBase
 
 		locals.totalPercent = static_cast<uint16>(input.devFeePercentBps) + static_cast<uint16>(input.burnFeePercentBps) +
 		                      static_cast<uint16>(input.shareholdersFeePercentBps);
-		locals.totalPercent = div(locals.totalPercent, static_cast<uint16>(QDUEL_PERCENT_SCALE));
+		locals.totalPercent = div(locals.totalPercent, QDUEL_PERCENT_SCALE);
 
 		if (locals.totalPercent >= 100)
 		{
@@ -838,7 +838,7 @@ struct QDUEL : public ContractBase
 	HashMap<id, RoomInfo, QDUEL_MAX_NUMBER_OF_ROOMS> rooms;
 	HashMap<id, UserData, QDUEL_MAX_NUMBER_OF_ROOMS> users;
 	id teamAddress;
-	uint64 minimumDuelAmount;
+	sint64 minimumDuelAmount;
 	uint8 devFeePercentBps;
 	uint8 burnFeePercentBps;
 	uint8 shareholdersFeePercentBps;
@@ -855,9 +855,9 @@ struct QDUEL : public ContractBase
 	{
 		output.nextStake = input.stake;
 
-		if (input.raiseStep > 1)
+		if (input.raiseStep > 1LL)
 		{
-			if (input.maxStake > 0 && input.stake > 0 && input.raiseStep > div(input.maxStake, input.stake))
+			if (input.maxStake > 0LL && input.stake > 0LL && input.raiseStep > div<sint64>(input.maxStake, input.stake))
 			{
 				output.nextStake = input.maxStake;
 			}