diff --git a/backend/src/controllers/shareCardController.ts b/backend/src/controllers/shareCardController.ts index 48d18320..38eae550 100644 --- a/backend/src/controllers/shareCardController.ts +++ b/backend/src/controllers/shareCardController.ts @@ -75,6 +75,7 @@ export async function updateAdminSettings(req: AuthRequest, res: Response): Prom allowDeposit?: boolean; allowWithdrawal?: boolean; allowTransfer?: boolean; + testWalletShareRequiresRealDeposit?: boolean; }; const settings = await shareCardService.updateSettings(body); res.json(settings); diff --git a/backend/src/db/schema.sql b/backend/src/db/schema.sql index 529af42d..2b9a419e 100644 --- a/backend/src/db/schema.sql +++ b/backend/src/db/schema.sql @@ -2706,6 +2706,7 @@ CREATE TABLE IF NOT EXISTS share_card_settings ( allow_deposit BOOLEAN NOT NULL DEFAULT TRUE, allow_withdrawal BOOLEAN NOT NULL DEFAULT TRUE, allow_transfer BOOLEAN NOT NULL DEFAULT TRUE, + test_wallet_share_requires_real_deposit BOOLEAN NOT NULL DEFAULT TRUE, updated_at TIMESTAMPTZ DEFAULT NOW() ); @@ -2726,6 +2727,14 @@ BEGIN ADD COLUMN allow_withdrawal BOOLEAN NOT NULL DEFAULT TRUE, ADD COLUMN allow_transfer BOOLEAN NOT NULL DEFAULT TRUE; END IF; + IF NOT EXISTS ( + SELECT 1 FROM information_schema.columns + WHERE table_schema = 'public' AND table_name = 'share_card_settings' + AND column_name = 'test_wallet_share_requires_real_deposit' + ) THEN + ALTER TABLE share_card_settings + ADD COLUMN test_wallet_share_requires_real_deposit BOOLEAN NOT NULL DEFAULT TRUE; + END IF; END $$; -- Tamper trigger for share_card_settings (created after the table exists) diff --git a/backend/src/repositories/shareCardRepository.ts b/backend/src/repositories/shareCardRepository.ts index e7186507..1377b91f 100644 --- a/backend/src/repositories/shareCardRepository.ts +++ b/backend/src/repositories/shareCardRepository.ts @@ -17,12 +17,14 @@ export type ShareCardSettingsRow = { allow_deposit: boolean; allow_withdrawal: boolean; allow_transfer: boolean; + test_wallet_share_requires_real_deposit: boolean; updated_at: Date; }; const SELECT_COLS = `id, enabled, allow_main_wallet, allow_bonus_wallet, allow_test_wallet, allow_won, allow_lost, allow_refunded, wallet_ops_enabled, allow_deposit, allow_withdrawal, allow_transfer, + test_wallet_share_requires_real_deposit, updated_at`; export async function getSettings(): Promise { @@ -47,6 +49,7 @@ export async function updateSettings(input: { allowDeposit?: boolean; allowWithdrawal?: boolean; allowTransfer?: boolean; + testWalletShareRequiresRealDeposit?: boolean; }): Promise { const current = await getSettings(); const rows = await query( @@ -62,6 +65,7 @@ export async function updateSettings(input: { allow_deposit = COALESCE($9, allow_deposit), allow_withdrawal = COALESCE($10, allow_withdrawal), allow_transfer = COALESCE($11, allow_transfer), + test_wallet_share_requires_real_deposit = COALESCE($12, test_wallet_share_requires_real_deposit), updated_at = NOW() WHERE id = 1 RETURNING ${SELECT_COLS}`, @@ -77,6 +81,7 @@ export async function updateSettings(input: { input.allowDeposit ?? null, input.allowWithdrawal ?? null, input.allowTransfer ?? null, + input.testWalletShareRequiresRealDeposit ?? null, ] ); return rows[0] ?? current; diff --git a/backend/src/services/shareCardService.ts b/backend/src/services/shareCardService.ts index 5f80beb9..71bb9ea0 100644 --- a/backend/src/services/shareCardService.ts +++ b/backend/src/services/shareCardService.ts @@ -29,10 +29,11 @@ const STAKE_DECIMALS = 6; export function mapSettingsForClient( row: ShareCardSettingsRow, extras?: { - referrerMustHaveDeposited?: boolean; hasDeposited?: boolean; } ) { + const testWalletShareRequiresRealDeposit = + row.test_wallet_share_requires_real_deposit !== false; return { enabled: Boolean(row.enabled), allowMainWallet: Boolean(row.allow_main_wallet), @@ -45,34 +46,44 @@ export function mapSettingsForClient( allowDeposit: row.allow_deposit !== false, allowWithdrawal: row.allow_withdrawal !== false, allowTransfer: row.allow_transfer !== false, - referrerMustHaveDeposited: extras?.referrerMustHaveDeposited === true, + testWalletShareRequiresRealDeposit, + // Alias for clients that still read the old referral-tied field. + referrerMustHaveDeposited: testWalletShareRequiresRealDeposit, hasDeposited: extras?.hasDeposited === true, updatedAt: row.updated_at.toISOString(), }; } -async function userHasRealDeposit(userId: string): Promise { - const rows = await query>( - `SELECT (first_deposit_at IS NOT NULL) AS ok - FROM users - WHERE id = $1 AND deleted_at IS NULL`, - [userId] - ); - return Boolean(rows[0]?.ok); +/** Ledger row used to decide whether a user has ever deposited real funds. */ +export type LedgerActivityRow = { + type: string; + status: string; +}; + +/** + * A real-funds deposit is a ledger `deposit` that reached `completed`. + * Test-wallet credits, bonus grants, admin adjustments, pending/failed + * deposits, and the current Main Wallet balance are ignored. + */ +export function isConfirmedRealDeposit(tx: LedgerActivityRow): boolean { + return tx.type === 'deposit' && tx.status === 'completed'; } -async function referralShareGate(userId: string): Promise<{ - referrerMustHaveDeposited: boolean; - hasDeposited: boolean; -}> { - const [referralSettings, hasDeposited] = await Promise.all([ - referralRepository.getSettings(), - userHasRealDeposit(userId), - ]); - return { - referrerMustHaveDeposited: Boolean(referralSettings.referrer_must_have_deposited), - hasDeposited, - }; +export function hasConfirmedRealDeposit(history: LedgerActivityRow[]): boolean { + return history.some(isConfirmedRealDeposit); +} + +async function userHasConfirmedRealDeposit(userId: string): Promise { + const rows = await query>( + `SELECT 1 AS n + FROM transactions + WHERE user_id = $1 + AND type = 'deposit' + AND status = 'completed' + LIMIT 1`, + [userId] + ); + return Boolean(rows[0]); } export function canSharePredictionResult( @@ -80,7 +91,7 @@ export function canSharePredictionResult( input: { stakeAccountKind: StakeAccountKind; status: string; - referrerMustHaveDeposited?: boolean; + testWalletShareRequiresRealDeposit?: boolean; hasDeposited?: boolean; } ): boolean { @@ -92,8 +103,11 @@ export function canSharePredictionResult( if (input.stakeAccountKind === 'bonus' && !settings.allow_bonus_wallet) return false; if (input.stakeAccountKind === 'test') { if (!settings.allow_test_wallet) return false; - // Block test-wallet promo when referral requires a real deposit and user has none. - if (input.referrerMustHaveDeposited && !input.hasDeposited) return false; + const requiresDeposit = + input.testWalletShareRequiresRealDeposit ?? + settings.test_wallet_share_requires_real_deposit !== false; + // Public verify omits hasDeposited — do not revoke an already-issued card. + if (requiresDeposit && input.hasDeposited === false) return false; } if (input.status === 'won' && !settings.allow_won) return false; if (input.status === 'lost' && !settings.allow_lost) return false; @@ -367,11 +381,11 @@ async function buildWalletOpCardPayload( } export async function getConfigForUser(userId: string) { - const [settings, gate] = await Promise.all([ + const [settings, hasDeposited] = await Promise.all([ shareCardRepository.getSettings(), - referralShareGate(userId), + userHasConfirmedRealDeposit(userId), ]); - return mapSettingsForClient(settings, gate); + return mapSettingsForClient(settings, { hasDeposited }); } export async function getSettingsForAdmin() { @@ -391,6 +405,7 @@ export async function updateSettings(input: { allowDeposit?: boolean; allowWithdrawal?: boolean; allowTransfer?: boolean; + testWalletShareRequiresRealDeposit?: boolean; }) { const row = await shareCardRepository.updateSettings(input); return mapSettingsForClient(row); @@ -411,19 +426,20 @@ export async function getSharePayloadForOwner(userId: string, betId: string) { if (!bet || bet.user_id !== userId) { throw new ShareCardError('Prediction not found', 404); } - const gate = await referralShareGate(userId); + const hasDeposited = await userHasConfirmedRealDeposit(userId); if ( !canSharePredictionResult(settings, { stakeAccountKind: bet.stake_account_kind, status: bet.status, - referrerMustHaveDeposited: gate.referrerMustHaveDeposited, - hasDeposited: gate.hasDeposited, + testWalletShareRequiresRealDeposit: + settings.test_wallet_share_requires_real_deposit !== false, + hasDeposited, }) ) { if ( bet.stake_account_kind === 'test' && - gate.referrerMustHaveDeposited && - !gate.hasDeposited + settings.test_wallet_share_requires_real_deposit !== false && + !hasDeposited ) { throw new ShareCardError( 'You must make at least one real-funds deposit before sharing Test Wallet results and using your referral link.', diff --git a/backend/src/tests/shareCardService.test.ts b/backend/src/tests/shareCardService.test.ts index ce593b05..4be254d4 100644 --- a/backend/src/tests/shareCardService.test.ts +++ b/backend/src/tests/shareCardService.test.ts @@ -5,6 +5,7 @@ import { canShareWalletOperation, computeResultAmount, createShareVerifyToken, + hasConfirmedRealDeposit, parseShareVerifyToken, } from '../services/shareCardService'; import type { ShareCardSettingsRow } from '../repositories/shareCardRepository'; @@ -23,6 +24,7 @@ function settings(partial: Partial = {}): ShareCardSetting allow_deposit: true, allow_withdrawal: true, allow_transfer: true, + test_wallet_share_requires_real_deposit: true, updated_at: new Date(), ...partial, }; @@ -70,30 +72,58 @@ describe('share card eligibility', () => { ); }); - test('blocks test wallet when referrer must deposit and has not', () => { + test('blocks test wallet when real deposit is required and user has none', () => { assert.equal( canSharePredictionResult(settings({ allow_test_wallet: true }), { stakeAccountKind: 'test', status: 'won', - referrerMustHaveDeposited: true, + testWalletShareRequiresRealDeposit: true, hasDeposited: false, }), false ); }); - test('allows test wallet when referrer deposit rule is satisfied', () => { + test('allows test wallet when real deposit is required and user has deposited', () => { assert.equal( canSharePredictionResult(settings({ allow_test_wallet: true }), { stakeAccountKind: 'test', status: 'won', - referrerMustHaveDeposited: true, + testWalletShareRequiresRealDeposit: true, hasDeposited: true, }), true ); }); + test('public verify of a test-wallet card does not re-check the owner deposit gate', () => { + assert.equal( + canSharePredictionResult(settings({ allow_test_wallet: true }), { + stakeAccountKind: 'test', + status: 'won', + }), + true + ); + }); + + test('allows test wallet without a deposit when the restriction is disabled', () => { + assert.equal( + canSharePredictionResult( + settings({ + allow_test_wallet: true, + test_wallet_share_requires_real_deposit: false, + }), + { + stakeAccountKind: 'test', + status: 'won', + testWalletShareRequiresRealDeposit: false, + hasDeposited: false, + } + ), + true + ); + }); + test('wallet ops respect global and per-type flags', () => { assert.equal(canShareWalletOperation(settings(), { type: 'deposit' }), true); assert.equal(canShareWalletOperation(settings(), { type: 'bonus' }), true); @@ -114,6 +144,54 @@ describe('share card eligibility', () => { }); }); +describe('confirmed real-funds deposit (ledger history, not balance)', () => { + test('user with no real deposit is not qualified', () => { + assert.equal(hasConfirmedRealDeposit([]), false); + }); + + test('user with one confirmed real deposit is qualified', () => { + assert.equal( + hasConfirmedRealDeposit([{ type: 'deposit', status: 'completed' }]), + true + ); + }); + + test('user with several confirmed real deposits is qualified', () => { + assert.equal( + hasConfirmedRealDeposit([ + { type: 'deposit', status: 'completed' }, + { type: 'deposit', status: 'completed' }, + { type: 'withdrawal', status: 'completed' }, + ]), + true + ); + }); + + test('spent or withdrawn funds do not revoke a confirmed deposit', () => { + assert.equal( + hasConfirmedRealDeposit([ + { type: 'deposit', status: 'completed' }, + { type: 'game_stake', status: 'completed' }, + { type: 'withdrawal', status: 'completed' }, + ]), + true + ); + }); + + test('test-wallet credits and pending deposits do not qualify', () => { + assert.equal( + hasConfirmedRealDeposit([ + { type: 'test_credit', status: 'completed' }, + { type: 'bonus', status: 'completed' }, + { type: 'admin_adjustment', status: 'completed' }, + { type: 'deposit', status: 'pending' }, + { type: 'deposit', status: 'failed' }, + ]), + false + ); + }); +}); + describe('share card result amount', () => { test('won uses full payout including stake', () => { // stake 5 USDT, payout 9.5 USDT → +9.5 (not net +4.5) diff --git a/backend/src/validation/adminResourceSchemas.ts b/backend/src/validation/adminResourceSchemas.ts index f85c85fe..8947fc08 100644 --- a/backend/src/validation/adminResourceSchemas.ts +++ b/backend/src/validation/adminResourceSchemas.ts @@ -216,6 +216,7 @@ export const shareCardSettingsBodySchema = atLeastOneField( allowDeposit: z.boolean().optional(), allowWithdrawal: z.boolean().optional(), allowTransfer: z.boolean().optional(), + testWalletShareRequiresRealDeposit: z.boolean().optional(), }) ); diff --git a/prediqo_mobile/lib/data/models/share_card_models.dart b/prediqo_mobile/lib/data/models/share_card_models.dart index 854d3141..0eb8ca77 100644 --- a/prediqo_mobile/lib/data/models/share_card_models.dart +++ b/prediqo_mobile/lib/data/models/share_card_models.dart @@ -11,7 +11,7 @@ class ShareCardConfig { required this.allowDeposit, required this.allowWithdrawal, required this.allowTransfer, - required this.referrerMustHaveDeposited, + required this.testWalletShareRequiresRealDeposit, required this.hasDeposited, }); @@ -26,7 +26,7 @@ class ShareCardConfig { final bool allowDeposit; final bool allowWithdrawal; final bool allowTransfer; - final bool referrerMustHaveDeposited; + final bool testWalletShareRequiresRealDeposit; final bool hasDeposited; factory ShareCardConfig.fromJson(Map json) { @@ -42,7 +42,9 @@ class ShareCardConfig { allowDeposit: json['allowDeposit'] != false, allowWithdrawal: json['allowWithdrawal'] != false, allowTransfer: json['allowTransfer'] != false, - referrerMustHaveDeposited: json['referrerMustHaveDeposited'] == true, + testWalletShareRequiresRealDeposit: + json['testWalletShareRequiresRealDeposit'] == true || + json['referrerMustHaveDeposited'] == true, hasDeposited: json['hasDeposited'] == true, ); } @@ -58,7 +60,7 @@ class ShareCardConfig { if (kind == 'bonus' && !allowBonusWallet) return false; if (kind == 'test') { if (!allowTestWallet) return false; - if (referrerMustHaveDeposited && !hasDeposited) return false; + if (testWalletShareRequiresRealDeposit && !hasDeposited) return false; } if (status == null || status.isEmpty) return !requireStatus; if (status != 'won' && status != 'lost' && status != 'refunded') return false; @@ -71,7 +73,7 @@ class ShareCardConfig { bool isTestWalletBlockedByDeposit(String? stakeAccountKind) { return stakeAccountKind == 'test' && allowTestWallet && - referrerMustHaveDeposited && + testWalletShareRequiresRealDeposit && !hasDeposited; } diff --git a/prediqo_web/src/features/share-cards/ShareCardsAdminPage.tsx b/prediqo_web/src/features/share-cards/ShareCardsAdminPage.tsx index 7b2f200f..cc7333a3 100644 --- a/prediqo_web/src/features/share-cards/ShareCardsAdminPage.tsx +++ b/prediqo_web/src/features/share-cards/ShareCardsAdminPage.tsx @@ -33,6 +33,7 @@ export type ShareCardSettings = { allowDeposit: boolean; allowWithdrawal: boolean; allowTransfer: boolean; + testWalletShareRequiresRealDeposit: boolean; updatedAt: string; }; @@ -53,6 +54,8 @@ export function ShareCardsAdminPage() { allowDeposit: res.data.allowDeposit !== false, allowWithdrawal: res.data.allowWithdrawal !== false, allowTransfer: res.data.allowTransfer !== false, + testWalletShareRequiresRealDeposit: + res.data.testWalletShareRequiresRealDeposit !== false, }; setForm(data); return data; @@ -157,6 +160,24 @@ export function ShareCardsAdminPage() { } label={t('admin.shareCards.allowTest')} /> + + setForm({ + ...form, + testWalletShareRequiresRealDeposit: e.target.checked, + }) + } + /> + } + label={t('admin.shareCards.requireRealDepositForTest')} + /> + + {t('admin.shareCards.requireRealDepositForTestHelper')} + @@ -268,6 +289,7 @@ export function ShareCardsAdminPage() { allowDeposit: form.allowDeposit, allowWithdrawal: form.allowWithdrawal, allowTransfer: form.allowTransfer, + testWalletShareRequiresRealDeposit: form.testWalletShareRequiresRealDeposit, }) } > diff --git a/prediqo_web/src/features/share-cards/types.ts b/prediqo_web/src/features/share-cards/types.ts index 1c874bd5..f0a69adb 100644 --- a/prediqo_web/src/features/share-cards/types.ts +++ b/prediqo_web/src/features/share-cards/types.ts @@ -10,9 +10,11 @@ export type ShareCardConfig = { allowDeposit: boolean; allowWithdrawal: boolean; allowTransfer: boolean; - /** From referral program: referrer must have deposited. */ + /** Admin: Test Wallet share requires at least one confirmed real deposit. */ + testWalletShareRequiresRealDeposit: boolean; + /** @deprecated alias of testWalletShareRequiresRealDeposit */ referrerMustHaveDeposited: boolean; - /** Whether the current user has a real-funds first deposit. */ + /** Whether the current user has a confirmed ledger deposit (not current balance). */ hasDeposited: boolean; updatedAt?: string; }; @@ -109,7 +111,7 @@ export function isPredictionShareEligible( if (kind === 'bonus' && !c.allowBonusWallet) return false; if (kind === 'test') { if (!c.allowTestWallet) return false; - if (c.referrerMustHaveDeposited && !c.hasDeposited) return false; + if (c.testWalletShareRequiresRealDeposit && !c.hasDeposited) return false; } const status = input.status; @@ -123,14 +125,16 @@ export function isPredictionShareEligible( return true; } -/** True when Test Wallet share is blocked only by the referral deposit rule. */ +/** True when Test Wallet share is blocked only by the real-deposit rule. */ export function isTestWalletShareBlockedByDeposit( config: ShareCardConfig | null | undefined, stakeAccountKind?: string | null ): boolean { const c = normalizeShareCardConfig(config ?? undefined); if (!c || stakeAccountKind !== 'test') return false; - return Boolean(c.allowTestWallet && c.referrerMustHaveDeposited && !c.hasDeposited); + return Boolean( + c.allowTestWallet && c.testWalletShareRequiresRealDeposit && !c.hasDeposited + ); } /** Normalize partial / legacy API payloads so wallet-op flags default to ON. */ @@ -150,7 +154,12 @@ export function normalizeShareCardConfig( allowDeposit: raw.allowDeposit !== false, allowWithdrawal: raw.allowWithdrawal !== false, allowTransfer: raw.allowTransfer !== false, - referrerMustHaveDeposited: raw.referrerMustHaveDeposited === true, + testWalletShareRequiresRealDeposit: + raw.testWalletShareRequiresRealDeposit === true || + raw.referrerMustHaveDeposited === true, + referrerMustHaveDeposited: + raw.testWalletShareRequiresRealDeposit === true || + raw.referrerMustHaveDeposited === true, hasDeposited: raw.hasDeposited === true, updatedAt: raw.updatedAt, }; diff --git a/prediqo_web/src/shared/i18n/locales/en.ts b/prediqo_web/src/shared/i18n/locales/en.ts index 840fb18b..0753f6ac 100644 --- a/prediqo_web/src/shared/i18n/locales/en.ts +++ b/prediqo_web/src/shared/i18n/locales/en.ts @@ -2132,6 +2132,9 @@ export const en = { allowMain: 'Main wallet', allowBonus: 'Bonus wallet', allowTest: 'Test wallet', + requireRealDepositForTest: 'Require a real-funds deposit before sharing Test Wallet results', + requireRealDepositForTestHelper: + 'When on, the user must have at least one confirmed real deposit in the ledger (any network). Current Main Wallet balance is ignored — spent or withdrawn funds still count. When off, Test Wallet results can be shared without a deposit.', outcomesTitle: 'Allowed outcomes', allowWon: 'Won', allowLost: 'Lost', diff --git a/prediqo_web/src/shared/i18n/locales/fr.ts b/prediqo_web/src/shared/i18n/locales/fr.ts index 23324079..aa72e332 100644 --- a/prediqo_web/src/shared/i18n/locales/fr.ts +++ b/prediqo_web/src/shared/i18n/locales/fr.ts @@ -2149,6 +2149,10 @@ export const fr = { allowMain: 'Wallet principal', allowBonus: 'Wallet bonus', allowTest: 'Wallet de test', + requireRealDepositForTest: + 'Exiger un dépôt réel avant de partager un résultat du Test Wallet', + requireRealDepositForTestHelper: + 'Si activé, l’utilisateur doit avoir au moins un dépôt réel confirmé dans le Ledger (tous réseaux). Le solde actuel du Main Wallet n’est pas pris en compte — fonds dépensés ou retirés inclus. Si désactivé, les résultats Test Wallet peuvent être partagés sans dépôt.', outcomesTitle: 'Résultats autorisés', allowWon: 'Gagné', allowLost: 'Perdu',