Merge pull request #715 from qubic/develop (Release v1.274.0)

Release v1.274.0

Author: Franziska-Mueller

src/Qubic.vcxproj

@@ -24,6 +24,7 @@
     <ClInclude Include="common_buffers.h" />
     <ClInclude Include="contracts\ComputorControlledFund.h" />
     <ClInclude Include="contracts\Qdraw.h" />
+    <ClInclude Include="contracts\qRWA.h" />
     <ClInclude Include="contracts\Qswap.h" />
     <ClInclude Include="contracts\RandomLottery.h" />
     <ClInclude Include="contracts\SupplyWatcher.h" />

src/Qubic.vcxproj.filters

@@ -312,6 +312,9 @@
     <ClInclude Include="contract_core\execution_time_accumulator.h">
       <Filter>contract_core</Filter>
     </ClInclude>
+    <ClInclude Include="contracts\qRWA.h">
+      <Filter>contracts</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="platform">

src/contract_core/contract_def.h

@@ -201,6 +201,20 @@
 #define CONTRACT_STATE2_TYPE QRAFFLE2
 #include "contracts/QRaffle.h"
 
+#ifndef NO_QRWA
+
+#undef CONTRACT_INDEX
+#undef CONTRACT_STATE_TYPE
+#undef CONTRACT_STATE2_TYPE
+
+#define QRWA_CONTRACT_INDEX 20
+#define CONTRACT_INDEX QRWA_CONTRACT_INDEX
+#define CONTRACT_STATE_TYPE QRWA
+#define CONTRACT_STATE2_TYPE QRWA2
+#include "contracts/qRWA.h"
+
+#endif
+
 // new contracts should be added above this line
 
 #ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -308,6 +322,9 @@ constexpr struct ContractDescription
     {"QBOND", 182, 10000, sizeof(QBOND)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
     {"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
+#ifndef NO_QRWA
+    {"QRWA", 197, 10000, sizeof(QRWA)}, // proposal in epoch 195, IPO in 196, construction and first use in 197
+#endif
     // new contracts should be added above this line
 #ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
     {"TESTEXA", 138, 10000, sizeof(TESTEXA)},
@@ -423,6 +440,9 @@ static void initializeContracts()
     REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBOND);
     REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QIP);
     REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QRAFFLE);
+#ifndef NO_QRWA
+    REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QRWA);
+#endif
     // new contracts should be added above this line
 #ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
     REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);

src/contracts/QIP.h

@@ -464,6 +464,21 @@ struct QIP : public ContractBase
         state.transferRightsFee = 100;
 	}
 
+    struct BEGIN_EPOCH_locals
+    {
+        ICOInfo ico;
+    };
+
+    BEGIN_EPOCH_WITH_LOCALS()
+    {
+        if (qpi.epoch() == 196)
+        {
+            locals.ico = state.icos.get(0);
+            locals.ico.remainingAmountForPhase3 = qpi.numberOfPossessedShares(locals.ico.assetName, locals.ico.issuer, SELF, SELF, SELF_INDEX, SELF_INDEX);
+            state.icos.set(0, locals.ico);
+        }
+    }
+
 	struct END_EPOCH_locals
 	{
         ICOInfo ico;
@@ -477,20 +492,19 @@ struct QIP : public ContractBase
             locals.ico = state.icos.get(locals.idx);
             if (locals.ico.startEpoch == qpi.epoch() && locals.ico.remainingAmountForPhase1 > 0)
             {
+                locals.ico.remainingAmountForPhase2 += locals.ico.remainingAmountForPhase1; 
                 locals.ico.remainingAmountForPhase1 = 0;
-                locals.ico.remainingAmountForPhase2 += locals.ico.remainingAmountForPhase1;
                 state.icos.set(locals.idx, locals.ico);
             }
             if (locals.ico.startEpoch + 1 == qpi.epoch() && locals.ico.remainingAmountForPhase2 > 0)
             {
-                locals.ico.remainingAmountForPhase2 = 0;
                 locals.ico.remainingAmountForPhase3 += locals.ico.remainingAmountForPhase2;
+                locals.ico.remainingAmountForPhase2 = 0;
                 state.icos.set(locals.idx, locals.ico);
             }
             if (locals.ico.startEpoch + 2 == qpi.epoch() && locals.ico.remainingAmountForPhase3 > 0)
             {
                 qpi.transferShareOwnershipAndPossession(locals.ico.assetName, locals.ico.issuer, SELF, SELF, locals.ico.remainingAmountForPhase3, locals.ico.creatorOfICO);
-                locals.ico.remainingAmountForPhase3 = 0;
                 state.icos.set(locals.idx, state.icos.get(state.numberOfICO - 1));
                 state.numberOfICO--;
             }