Перевести донаты на Stars и обновить Devnet

This commit is contained in:
AidarKC
2026-11-14 00:55:02 +03:00
parent c972a975fd
commit 97db033eb8
39 changed files with 1020 additions and 198 deletions
+23 -13
View File
@@ -4,8 +4,9 @@ import { readShineUserPda, supportShineUserOnSolana, supportShineDaoOnSolana } f
import { loadEncryptedUserSecrets } from '../services/key-vault.js';
import { getWalletFromStoredBlockchainKey, transferSolLamports, solanaAddressFromPublicKeyBase64 } from '../services/solana-wallet-service.js';
import { bytesToBase58 } from '../services/crypto-utils.js';
import { parseSolLamports, formatLamportsSol } from '../services/shine-support-amount.js';
import { parseStarCents, formatStars, splitStarCents, starCentsToLamports, formatLamportsSol } from '../services/shine-support-amount.js';
import { toUserMessage } from '../services/ui-error-texts.js';
import { getStarsQuoteFromRpc } from '../services/shine-stars-pyth.js';
/** One shared payment dialog for profiles, posts and donations to the SHiNE economy. */
export function openShineSupportDialog({ recipientLogin = '', target = { type: 0 }, onSuccess = () => {} } = {}) {
@@ -33,7 +34,7 @@ export function openShineSupportDialog({ recipientLogin = '', target = { type: 0
input.type = 'text';
input.inputMode = 'decimal';
input.autocomplete = 'off';
input.placeholder = '0.01';
input.placeholder = '0.10';
const details = document.createElement('p');
details.className = 'meta-muted';
const status = document.createElement('p');
@@ -52,38 +53,45 @@ export function openShineSupportDialog({ recipientLogin = '', target = { type: 0
cancel.className = 'text-btn';
cancel.textContent = t('screens.support_phase2.close');
panel.append(header, description, amountLabel, input, details, status, donate);
if (!dao) panel.append(direct);
// Direct transfers bypass Stars accounting and must not appear in the support dialog.
panel.append(cancel);
overlay.append(panel);
document.body.append(overlay);
let quote = null;
let busy = false;
let closed = false;
const close = () => { if (busy) return; closed = true; overlay.remove(); };
cancel.addEventListener('click', close);
overlay.addEventListener('click', (event) => { if (event.target === overlay) close(); });
const update = () => {
if (dao) { details.textContent = t('screens.support_phase2.dao_info'); return; }
try {
const amount = parseSolLamports(input.value);
details.textContent = amount % 10n === 0n
? `${t('screens.support_phase2.recipient')}: ${formatLamportsSol(amount * 9n / 10n)} SOL · ${t('screens.support_phase2.fund')}: ${formatLamportsSol(amount / 10n)} SOL`
: t('screens.support_phase2.divisible');
} catch { details.textContent = t('screens.support_phase2.explanation'); }
const cents = parseStarCents(input.value);
const split = splitStarCents(cents);
const sol = quote ? ` · ≈ ${formatLamportsSol(starCentsToLamports(cents, quote.solUsdE8, quote.usdtUsdE8))} SOL` : '';
details.textContent = dao ? `${formatStars(cents)}${sol}` :
`${t('screens.support_phase2.recipient')}: ${formatStars(split.author)} · ${t('screens.support_phase2.fund')}: ${formatStars(split.dao)}${sol}`;
} catch { details.textContent = 'Минимум 0,10 ⭐'; }
};
input.addEventListener('input', update);
amountLabel.textContent = 'Сумма поддержки, ⭐';
update();
void getStarsQuoteFromRpc({ solanaEndpoint: state.entrySettings.solanaServer }).then((value) => { quote = value; if (!closed) update(); })
.catch(() => { if (!closed) details.textContent = 'Курс недоступен. Повторите попытку позднее.'; });
const send = async (isDirect) => {
if (busy || closed) return;
let amount;
let amount, cents;
try {
amount = parseSolLamports(input.value);
if (!dao && !isDirect && amount % 10n !== 0n) throw new Error(t('screens.support_phase2.divisible'));
cents = parseStarCents(input.value);
if (isDirect) throw new Error('Прямой перевод не учитывается в Stars');
} catch (error) { status.textContent = error.message; return; }
if (isDirect && !window.confirm(t('screens.support_phase2.direct_warning'))) return;
busy = true;
donate.disabled = direct.disabled = cancel.disabled = input.disabled = true;
status.textContent = t('screens.support_phase2.sending');
try {
// Fetch a fresh quote immediately before signing; Pyth on-chain check is authoritative.
quote = await getStarsQuoteFromRpc({ solanaEndpoint: state.entrySettings.solanaServer });
amount = starCentsToLamports(cents, quote.solUsdE8, quote.usdtUsdE8);
const { storagePwdInMemory: password } = state.session;
const endpoint = state.entrySettings.solanaServer;
let result;
@@ -102,7 +110,9 @@ export function openShineSupportDialog({ recipientLogin = '', target = { type: 0
} else {
const secrets = await loadEncryptedUserSecrets(login, password);
if (!secrets?.blockchainKey || !secrets?.clientKey) throw new Error(t('screens.support_phase2.keys_required'));
const args = { senderLogin: login, amountLamports: amount, solanaEndpoint: endpoint, blockchainPrivatePkcs8B64: secrets.blockchainKey, clientPrivatePkcs8B64: secrets.clientKey };
const args = { senderLogin: login, amountLamports: amount, starCents: cents,
oracleAccounts: { solUsd: quote.solOracleAccount, usdtUsd: quote.usdtOracleAccount },
solanaEndpoint: endpoint, blockchainPrivatePkcs8B64: secrets.blockchainKey, clientPrivatePkcs8B64: secrets.clientKey };
result = dao ? await supportShineDaoOnSolana(args) : await supportShineUserOnSolana({ ...args, recipientLogin, target });
}
status.textContent = `${t('screens.support_phase2.success')} ${result.signature || ''}`;