Merge branch 'develop' into feature/2025-07-21-mempool-clean-2

Author: Franziska-Mueller

src/assets/assets.h

@@ -245,6 +245,7 @@ static long long issueAsset(const m256i& issuerPublicKey, const char name[7], ch
                 AssetIssuance assetIssuance;
                 assetIssuance.issuerPublicKey = issuerPublicKey;
                 assetIssuance.numberOfShares = numberOfShares;
+                assetIssuance.managingContractIndex = managingContractIndex; // any SC can call issueAsset now (eg: QBOND) not just QX
                 *((unsigned long long*) assetIssuance.name) = *((unsigned long long*) name); // Order must be preserved!
                 assetIssuance.numberOfDecimalPlaces = numberOfDecimalPlaces; // Order must be preserved!
                 *((unsigned long long*) assetIssuance.unitOfMeasurement) = *((unsigned long long*) unitOfMeasurement); // Order must be preserved!

src/contract_core/qpi_asset_impl.h

@@ -486,6 +486,13 @@ bool QPI::QpiContextProcedureCall::distributeDividends(long long amountPerShare)
         return false;
     }
 
+    // this part of code doesn't perform completed QuTransfers, instead it `decreaseEnergy` all QUs at once and `increaseEnergy` multiple times.
+    // Meanwhile, a QUTransfer requires a pair of both decrease & increase calls.
+    // This behavior will produce different numberOfOutgoingTransfers for the SC index.
+    // 3rd party software needs to catch the HINT message to know the distribute dividends operation
+    DummyCustomMessage dcm{ CUSTOM_MESSAGE_OP_START_DISTRIBUTE_DIVIDENDS };
+    logger.logCustomMessage(dcm);
+
     if (decreaseEnergy(index, amountPerShare * NUMBER_OF_COMPUTORS))
     {
         ACQUIRE(universeLock);
@@ -523,7 +530,8 @@ bool QPI::QpiContextProcedureCall::distributeDividends(long long amountPerShare)
 
         RELEASE(universeLock);
     }
-
+    dcm = DummyCustomMessage{ CUSTOM_MESSAGE_OP_END_DISTRIBUTE_DIVIDENDS };
+    logger.logCustomMessage(dcm);
     return true;
 }
 

src/contracts/MsVault.h

@@ -594,8 +594,7 @@ struct MSVAULT : public ContractBase
         isValidVaultId_input iv_in;
         isValidVaultId_output iv_out;
         isValidVaultId_locals iv_locals;
-        QX::TransferShareOwnershipAndPossession_input qx_in;
-        QX::TransferShareOwnershipAndPossession_output qx_out;
+        sint64 remainingShares;
         sint64 releaseResult;
     };
 
@@ -1482,15 +1481,15 @@ struct MSVAULT : public ContractBase
             // Re-check balance before transfer
             if (locals.assetVault.assetBalances.get(locals.assetIndex).balance >= input.amount)
             {
-                locals.qx_out.transferredNumberOfShares = qpi.transferShareOwnershipAndPossession(
+                locals.remainingShares = qpi.transferShareOwnershipAndPossession(
                     input.asset.assetName,
                     input.asset.issuer,
                     SELF, // owner
                     SELF, // possessor
                     input.amount,
                     input.destination // new owner & possessor
                 );
-                if (locals.qx_out.transferredNumberOfShares > 0)
+                if (locals.remainingShares >= 0)
                 {
                     // Update internal asset balance
                     locals.ab = locals.assetVault.assetBalances.get(locals.assetIndex);

src/contracts/QBond.h

@@ -193,6 +193,8 @@ struct QBOND : public ContractBase
         struct TableEntry
         {
             sint64 epoch;
+            sint64 totalStakedQBond;
+            sint64 totalStakedQEarn;
             uint64 apy;
         };
         Array<TableEntry, 512> info;
@@ -1093,6 +1095,8 @@ struct QBOND : public ContractBase
                 locals.tempInput.Epoch = (uint32) locals.epoch;
                 CALL_OTHER_CONTRACT_FUNCTION(QEARN, getLockInfoPerEpoch, locals.tempInput, locals.tempOutput);
                 locals.tempTableEntry.epoch = locals.epoch;
+                locals.tempTableEntry.totalStakedQBond = locals.tempMBondInfo.totalStaked * QBOND_MBOND_PRICE;
+                locals.tempTableEntry.totalStakedQEarn = locals.tempOutput.currentLockedAmount;
                 locals.tempTableEntry.apy = locals.tempOutput.yield;
                 output.info.set(locals.index, locals.tempTableEntry);
                 locals.index++;

src/contracts/QUtil.h

@@ -472,12 +472,7 @@ struct QUTIL : public ContractBase
             github_link.get(15) == 99 && // 'c'
             github_link.get(16) == 111 && // 'o'
             github_link.get(17) == 109 && // 'm'
-            github_link.get(18) == 47 && // '/'
-            github_link.get(19) == 113 && // 'q'
-            github_link.get(20) == 117 && // 'u'
-            github_link.get(21) == 98 && // 'b'
-            github_link.get(22) == 105 && // 'i'
-            github_link.get(23) == 99; // 'c'
+            github_link.get(18) == 47; // '/'
     }
 
     /**************************************/
@@ -1177,7 +1172,7 @@ struct QUTIL : public ContractBase
         output.count = 0;
         for (locals.idx = 0; locals.idx < QUTIL_MAX_POLL; locals.idx++)
         {
-            if (state.polls.get(locals.idx).is_active != 0 && state.polls.get(locals.idx).creator == input.creator)
+            if (state.polls.get(locals.idx).creator != NULL_ID && state.polls.get(locals.idx).creator == input.creator)
             {
                 output.poll_ids.set(output.count, state.poll_ids.get(locals.idx));
                 output.count++;

src/contracts/RandomLottery.h

@@ -368,13 +368,17 @@ struct RL : public ContractBase
 		if (state.players.contains(qpi.invocator()))
 		{
 			output.returnCode = static_cast<uint8>(EReturnCode::TICKET_ALREADY_PURCHASED);
+			qpi.transfer(qpi.invocator(), qpi.invocationReward());
+
 			return;
 		}
 
 		// Capacity full
 		if (state.players.add(qpi.invocator()) == NULL_INDEX)
 		{
 			output.returnCode = static_cast<uint8>(EReturnCode::TICKET_ALL_SOLD_OUT);
+			qpi.transfer(qpi.invocator(), qpi.invocationReward());
+
 			return;
 		}
 

src/logging/logging.h

@@ -58,6 +58,9 @@ struct Peer;
 #define ASSET_POSSESSION_MANAGING_CONTRACT_CHANGE 12
 #define CUSTOM_MESSAGE 255
 
+#define CUSTOM_MESSAGE_OP_START_DISTRIBUTE_DIVIDENDS 6217575821008262227ULL // STA_DDIV
+#define CUSTOM_MESSAGE_OP_END_DISTRIBUTE_DIVIDENDS 6217575821008457285ULL //END_DDIV
+
 /*
 * STRUCTS FOR LOGGING
 */
@@ -73,6 +76,7 @@ struct AssetIssuance
 {
     m256i issuerPublicKey;
     long long numberOfShares;
+    long long managingContractIndex;
     char name[7];
     char numberOfDecimalPlaces;
     char unitOfMeasurement[7];