Skip to content

Feat/asset raffle #968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
double-k-3033 wants to merge 3 commits into
base: develop
Choose a base branch
from
+244 −26
Open

Feat/asset raffle #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b01d017
fix: remove disallow qraffle SC and qxmr token in asset raffle
double-k-3033 Jul 24, 2026
c28cae2
fix: change the QuRaffle default amount from 10M to 1M
double-k-3033 Jul 27, 2026
618290e
feat: integrate with Random SC. collateral tier = 0, bit = 256
double-k-3033 Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 54 additions & 14 deletions src/contracts/QRaffle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,20 @@ constexpr uint32 QRAFFLE_REGISTER_FEE = 5; // percent
constexpr uint32 QRAFFLE_FEE = 1; // percent
constexpr uint32 QRAFFLE_CHARITY_FEE = 1; // percent
constexpr uint32 QRAFFLE_SHAREHOLDER_FEE = 8; // percent
// Retained in the contract's own balance (never transferred out) to fund RANDOM
// entropy purchases in END_EPOCH; builds a self-sustaining reserve over time.
constexpr uint32 QRAFFLE_ENTROPY_FEE = 1; // percent

// RANDOM smart contract entropy purchase: mixed into the winner-selection seed
// once per END_EPOCH. Mirrors RL_RANDOM_* in RandomLottery.h.
constexpr uint16 QRAFFLE_RANDOM_ENTROPY_BITS = 256;
constexpr uint8 QRAFFLE_RANDOM_COLLATERAL_TIER = 0;
constexpr uint64 QRAFFLE_RANDOM_ENTROPY_FEE = RANDOM_BITFEE * QRAFFLE_RANDOM_ENTROPY_BITS;

constexpr uint32 QRAFFLE_MAX_EPOCH = 65536;
constexpr uint32 QRAFFLE_MAX_PROPOSAL_EPOCH = 128;
constexpr uint32 QRAFFLE_MAX_MEMBER = 65536;
constexpr uint32 QRAFFLE_DEFAULT_QRAFFLE_AMOUNT = 10000000ull;
constexpr uint32 QRAFFLE_DEFAULT_QRAFFLE_AMOUNT = 1000000ull;
constexpr uint32 QRAFFLE_MIN_QRAFFLE_AMOUNT = 1000000ull;
constexpr uint32 QRAFFLE_MAX_QRAFFLE_AMOUNT = 1000000000ull;
// Ended token-raffle ring: 16 384 slots × ~96 B ≈ 1.5 MB.
Expand Down Expand Up @@ -1409,16 +1419,7 @@ struct QRAFFLE : public ContractBase
LOG_INFO(locals.log);
return;
}
// QRAFFLE and QXMR are reserved for dividends/registration; disallow in bundles.
if ((locals.item.asset.assetName == QRAFFLE_ASSET_NAME && locals.item.asset.issuer == NULL_ID)
|| (locals.item.asset.assetName == QRAFFLE_QXMR_ASSET_NAME && locals.item.asset.issuer == state.get().QXMRIssuer))
{
qpi.transfer(qpi.invocator(), qpi.invocationReward());
output.returnCode = QRAFFLE_INVALID_BUNDLE;
locals.log = Logger{ QRAFFLE_CONTRACT_INDEX, QRAFFLE_invalidBundle, 0 };
LOG_INFO(locals.log);
return;
}

// Duplicate-asset check within the bundle; O(N²) acceptable for N ≤ 4.
locals.dupFound = 0;
for (locals.j = 0; locals.j < locals.i; locals.j++)
Expand Down Expand Up @@ -2218,6 +2219,16 @@ struct QRAFFLE : public ContractBase
sint64 transferResult;
uint64 sumOfEntryAmountSubmitted, r, winnerRevenue, burnAmount, charityRevenue, shareholderRevenue, registerRevenue, fee, oneShareholderRev;
uint64 tokenPool;
// RANDOM entropy purchase (winner-selection seed strengthening).
Entity entity;
RANDOM::BuyEntropy_input buyEntropyInput;
RANDOM::BuyEntropy_output buyEntropyOutput;
uint64 entropyReserveAmount; // per-block carve-out, recomputed fresh in each of the 3 fee blocks
struct EntropyMixData
{
id baseSeed;
bit_4096 entropy;
} entropyMixData;
uint64 shareholderPerShareUnit;
uint64 registerPerShareUnit;
uint64 actualShareholderTotal;
Expand Down Expand Up @@ -2281,6 +2292,28 @@ struct QRAFFLE : public ContractBase
locals.digest.u64._2 ^ locals.computerDigest.u64._2,
locals.digest.u64._3 ^ locals.computerDigest.u64._3));

// Strengthen the seed with entropy from the RANDOM smart contract's independent
// commit-reveal miner pool, on top of the digest-based value above. This is
// additive, not a replacement: if the purchase fails (insufficient reserve, or
// RANDOM's pool is empty this cycle) baseSeed simply stays digest-only and
// raffle settlement proceeds unchanged -- member funds are already committed,
// so degrading gracefully is safer than blocking settlement.
qpi.getEntity(SELF, locals.entity);
if (locals.entity.incomingAmount - locals.entity.outgoingAmount >= (sint64)QRAFFLE_RANDOM_ENTROPY_FEE)
{
locals.buyEntropyInput.collateralTier = QRAFFLE_RANDOM_COLLATERAL_TIER;
locals.buyEntropyInput.numberOfBits = QRAFFLE_RANDOM_ENTROPY_BITS;
locals.buyEntropyInput.trustee = id::zero();
INVOKE_OTHER_CONTRACT_PROCEDURE(RANDOM, BuyEntropy, locals.buyEntropyInput, locals.buyEntropyOutput, QRAFFLE_RANDOM_ENTROPY_FEE);

if (interContractCallError == NoCallError && !(locals.buyEntropyOutput.entropy == BIT4096_ZERO))
{
locals.entropyMixData.baseSeed = locals.baseSeed;
locals.entropyMixData.entropy = locals.buyEntropyOutput.entropy;
locals.baseSeed = qpi.K12(locals.entropyMixData);
}
}

// Asset descriptor reused by the QXMR distribution and per-token-raffle shareholder
// payout loops below; both iterate QRAFFLE_ASSET possessors directly via locals.iter.
locals.QraffleAsset.assetName = QRAFFLE_ASSET_NAME;
Expand All @@ -2301,12 +2334,15 @@ struct QRAFFLE : public ContractBase
locals.shareholderRevenue = div<uint64>(locals.tokenPool * QRAFFLE_SHAREHOLDER_FEE, 100);
locals.registerRevenue = div<uint64>(locals.tokenPool * QRAFFLE_REGISTER_FEE, 100);
locals.fee = div<uint64>(locals.tokenPool * QRAFFLE_FEE, 100);
// Entropy reserve: retained in the contract's own balance (never transferred),
// funding future RANDOM entropy purchases in END_EPOCH.
locals.entropyReserveAmount = div<uint64>(locals.tokenPool * QRAFFLE_ENTROPY_FEE, 100);
// Round down per-share amounts; winner gets the remainder.
locals.shareholderPerShareUnit = div<uint64>(locals.shareholderRevenue, NUMBER_OF_COMPUTORS);
locals.actualShareholderTotal = locals.shareholderPerShareUnit * NUMBER_OF_COMPUTORS;
locals.registerPerShareUnit = div<uint64>(locals.registerRevenue, state.get().numberOfRegisters);
locals.actualRegisterTotal = locals.registerPerShareUnit * state.get().numberOfRegisters;
locals.winnerRevenue = locals.tokenPool - locals.burnAmount - locals.charityRevenue - locals.actualShareholderTotal - locals.actualRegisterTotal - locals.fee;
locals.winnerRevenue = locals.tokenPool - locals.burnAmount - locals.charityRevenue - locals.actualShareholderTotal - locals.actualRegisterTotal - locals.fee - locals.entropyReserveAmount;

locals.revenueLog = RevenueLogger{
QRAFFLE_CONTRACT_INDEX,
Expand Down Expand Up @@ -2566,14 +2602,17 @@ struct QRAFFLE : public ContractBase
}
}

// Qu pool distribution: 80% to creator, 20% to fee buckets.
// Qu pool distribution: 79% to creator, 21% to fee buckets (incl. entropy reserve).
// Always executed when reserve is met, regardless of per-item delivery outcome.
// (Assets already delivered to winner; we cannot recall them from a user's wallet.)
locals.arBurn = div<uint64>(locals.arGross * (uint64)QRAFFLE_BURN_FEE, 100ull);
locals.arCharity = div<uint64>(locals.arGross * (uint64)QRAFFLE_CHARITY_FEE, 100ull);
locals.arShareholderRev = div<uint64>(locals.arGross * (uint64)QRAFFLE_SHAREHOLDER_FEE, 100ull);
locals.arRegisterRev = div<uint64>(locals.arGross * (uint64)QRAFFLE_REGISTER_FEE, 100ull);
locals.arFee = div<uint64>(locals.arGross * (uint64)QRAFFLE_FEE, 100ull);
// Entropy reserve: retained in the contract's own balance (never transferred),
// funding future RANDOM entropy purchases in END_EPOCH.
locals.entropyReserveAmount = div<uint64>(locals.arGross * (uint64)QRAFFLE_ENTROPY_FEE, 100ull);
// Round down per-share amounts; all rounding dust goes to creator.
locals.arShareholderPerShare = div<uint64>(locals.arShareholderRev, (uint64)NUMBER_OF_COMPUTORS);
locals.arRegisterPerShare = (state.get().numberOfRegisters > 0)
Expand All @@ -2586,7 +2625,8 @@ struct QRAFFLE : public ContractBase
- locals.arCharity
- (locals.arShareholderPerShare * (uint64)NUMBER_OF_COMPUTORS)
- locals.arRegisterPerShareActual
- locals.arFee;
- locals.arFee
- locals.entropyReserveAmount;

qpi.transfer(locals.arInfo.creator, locals.arCreatorPay);
qpi.burn(locals.arBurn);
Expand Down
Loading
Loading