Snapshot QMINE shares in all SC

Author: mundusakhan

src/contracts/qRWA.h

@@ -1288,6 +1288,8 @@ struct QRWA : public ContractBase
         AssetPossessionIterator iter;
         uint64 balance;
         qRWALogger logger;
+        id holder;
+        uint64 existingBalance;
     };
     BEGIN_EPOCH_WITH_LOCALS()
     {
@@ -1311,18 +1313,27 @@ struct QRWA : public ContractBase
                     continue;
                 }
                 locals.balance = locals.iter.numberOfPossessedShares();
+                locals.holder = locals.iter.possessor();
+
                 if (locals.balance > 0)
                 {
-                    if (state.mBeginEpochBalances.set(locals.iter.possessor(), locals.balance) != NULL_INDEX)
+                    // Check if holder already exists in the map (e.g. from a different manager)
+                    // If so, add to existing balance.
+                    locals.existingBalance = 0;
+                    state.mBeginEpochBalances.get(locals.holder, locals.existingBalance);
+
+                    locals.balance = sadd(locals.existingBalance, locals.balance);
+
+                    if (state.mBeginEpochBalances.set(locals.holder, locals.balance) != NULL_INDEX)
                     {
-                        state.mTotalQmineBeginEpoch = sadd(state.mTotalQmineBeginEpoch, locals.balance);
+                        state.mTotalQmineBeginEpoch = sadd(state.mTotalQmineBeginEpoch, (uint64)locals.iter.numberOfPossessedShares());
                     }
                     else
                     {
                         // Log error - Max holders reached for snapshot
                         locals.logger.contractId = CONTRACT_INDEX;
                         locals.logger.logType = QRWA_LOG_TYPE_ERROR;
-                        locals.logger.primaryId = locals.iter.possessor();
+                        locals.logger.primaryId = locals.holder;
                         locals.logger.valueA = 11; // Error code: Begin Epoch Snapshot full
                         locals.logger.valueB = state.mBeginEpochBalances.population();
                         LOG_INFO(locals.logger);
@@ -1387,6 +1398,9 @@ struct QRWA : public ContractBase
         qRWAAsset wrapper;
 
         qRWAGovProposal govPoll;
+
+        id holder;
+        uint64 existingBalance;
     };
     END_EPOCH_WITH_LOCALS()
     {
@@ -1403,14 +1417,22 @@ struct QRWA : public ContractBase
                     continue;
                 }
                 locals.balance = locals.iter.numberOfPossessedShares();
+                locals.holder = locals.iter.possessor();
+
                 if (locals.balance > 0)
                 {
-                    if (state.mEndEpochBalances.set(locals.iter.possessor(), locals.balance) == NULL_INDEX)
+                    // Check if holder already exists (multiple SC management)
+                    locals.existingBalance = 0;
+                    state.mEndEpochBalances.get(locals.holder, locals.existingBalance);
+
+                    locals.balance = sadd(locals.existingBalance, locals.balance);
+
+                    if (state.mEndEpochBalances.set(locals.holder, locals.balance) == NULL_INDEX)
                     {
                         // Log error - Max holders reached for snapshot
                         locals.logger.contractId = CONTRACT_INDEX;
                         locals.logger.logType = QRWA_LOG_TYPE_ERROR;
-                        locals.logger.primaryId = locals.iter.possessor();
+                        locals.logger.primaryId = locals.holder;
                         locals.logger.valueA = 12; // Error code: End Epoch Snapshot full
                         locals.logger.valueB = state.mEndEpochBalances.population();
                         LOG_INFO(locals.logger);

test/contract_qrwa.cpp

@@ -98,6 +98,8 @@ class ContractTestingQRWA : protected ContractTesting
         callSystemProcedure(QX_CONTRACT_INDEX, INITIALIZE);
         INIT_CONTRACT(QUTIL);
         callSystemProcedure(QUTIL_CONTRACT_INDEX, INITIALIZE);
+        INIT_CONTRACT(QSWAP);
+        callSystemProcedure(QSWAP_CONTRACT_INDEX, INITIALIZE);
 
         // Custom Initialization for qRWA State
         // (Overrides defaults from INITIALIZE() for testing purposes)
@@ -1679,3 +1681,70 @@ TEST(ContractQRWA, FullScenario_DividendsAndGovernance)
     EXPECT_EQ(getBalance(Q1), prevBalances[Q1] + divQQ1);
     EXPECT_EQ(getBalance(Q2), prevBalances[Q2] + divQQ2);
 }
+
+TEST(ContractQRWA, Payout_MultiContractManagement)
+{
+    ContractTestingQRWA qrwa;
+
+    const sint64 totalShares = 1000000;
+    const sint64 qxManagedShares = 700000;
+    const sint64 qswapManagedShares = 300000; // 30% moved to QSWAP management
+
+    // Issue QMINE and give to HOLDER_A
+    // Initially, all 1M shares are managed by QX (default for transfers via QX)
+    increaseEnergy(QMINE_ISSUER, 1000000000);
+    increaseEnergy(HOLDER_A, 1000000); // For fees
+
+    qrwa.issueAsset(QMINE_ISSUER, QMINE_ASSET.assetName, totalShares);
+    qrwa.transferAsset(QMINE_ISSUER, HOLDER_A, QMINE_ASSET, totalShares);
+
+    // Verify initial state managed by QX
+    EXPECT_EQ(numberOfPossessedShares(QMINE_ASSET.assetName, QMINE_ASSET.issuer, HOLDER_A, HOLDER_A, QX_CONTRACT_INDEX, QX_CONTRACT_INDEX), totalShares);
+    EXPECT_EQ(numberOfPossessedShares(QMINE_ASSET.assetName, QMINE_ASSET.issuer, HOLDER_A, HOLDER_A, QSWAP_CONTRACT_INDEX, QSWAP_CONTRACT_INDEX), 0);
+
+    // Transfer management rights of 300k shares to QSWAP
+    // The user (HOLDER_A) remains the Possessor.
+    qrwa.transferManagementRights(HOLDER_A, QMINE_ASSET, qswapManagedShares, QSWAP_CONTRACT_INDEX);
+
+    // Verify the split in management rights
+    // 700k should remain under QX
+    EXPECT_EQ(numberOfPossessedShares(QMINE_ASSET.assetName, QMINE_ASSET.issuer, HOLDER_A, HOLDER_A, QX_CONTRACT_INDEX, QX_CONTRACT_INDEX), qxManagedShares);
+    // 300k should now be under QSWAP
+    EXPECT_EQ(numberOfPossessedShares(QMINE_ASSET.assetName, QMINE_ASSET.issuer, HOLDER_A, HOLDER_A, QSWAP_CONTRACT_INDEX, QSWAP_CONTRACT_INDEX), qswapManagedShares);
+
+    qrwa.beginEpoch();
+
+    // Generate Revenue
+    // pool A revenue: 1,000,000 QUs
+    // fees (50%): 500,000
+    // net revenue: 500,000
+    // QMINE pool (90%): 450,000
+    qrwa.sendToMany(ADMIN_ADDRESS, id(QRWA_CONTRACT_INDEX, 0, 0, 0), 1000000);
+
+    qrwa.endEpoch();
+
+    // trigger Payout
+    etalonTick.year = 25; etalonTick.month = 11; etalonTick.day = 7; // Friday
+    etalonTick.hour = 12; etalonTick.minute = 1; etalonTick.second = 0;
+    qrwa.resetPayoutTime();
+
+    // snapshot balances for check
+    sint64 balanceBefore = getBalance(HOLDER_A);
+
+    qrwa.endTick();
+
+    // Calculate Expected Payout
+    // Payout = (UserTotalShares * PoolAmount) / TotalSupply
+    // UserTotalShares = 1,000,000 (regardless of manager)
+    // PoolAmount = 450,000
+    // TotalSupply = 1,000,000
+    // Expected = 450,000
+    sint64 expectedPayout = (totalShares * 450000) / totalShares;
+
+    sint64 balanceAfter = getBalance(HOLDER_A);
+
+    // If qRWA only counted QX shares, the payout would be (700k/1M * 450k) = 315,000.
+    // If qRWA counts ALL shares, the payout is 450,000.
+    EXPECT_EQ(balanceAfter - balanceBefore, expectedPayout);
+    EXPECT_EQ(balanceAfter - balanceBefore, 450000);
+}