SHA256
Сделаны переводы другим пользователям
This commit is contained in:
+2
-2
@@ -39,13 +39,13 @@
|
||||
}());
|
||||
</script>
|
||||
<script>
|
||||
window.__SHINE_BUILD_HASH__ = '20261116-boot-error-ui-v1';
|
||||
window.__SHINE_BUILD_HASH__ = '20261117-jupiter-swap-beta-v1';
|
||||
window.__SHINE_CLIENT_VERSION__ = '1.20.9';
|
||||
</script>
|
||||
<script>
|
||||
(function attachStylesWithBuildHash() {
|
||||
const v = encodeURIComponent(window.__SHINE_BUILD_HASH__ || 'dev');
|
||||
const cssFiles = ['./styles/main.css', './styles/layout.css', './styles/app-shell.css', './styles/buttons-white.css', './styles/components/topbar.css', './styles/components/dropdown-menu.css', './styles/components/primitives.css', './styles/components/feedback.css', './styles/components/tabs.css', './styles/components/chips.css', './styles/components/nav-list.css', './styles/components/palette-editor.css', './styles/components/avatar.css', './styles/components/modal.css', './styles/components/person-note.css', './styles/components/person-row.css', './styles/components/compose.css', './styles/components/attachments.css', './styles/components/media-viewer.css', './styles/components/channel-editor.css', './styles/components/emoji-picker.css', './styles/components/call-ui.css', './styles/components/scroll-to-bottom.css', './styles/components/overflow-dots.css', './styles/components/toolbar.css', './styles/features/preauth.css', './styles/features/messages.css', './styles/features/chat.css', './styles/features/channels-common.css', './styles/features/channels-list.css', './styles/features/channel.css', './styles/features/channel-thread.css', './styles/features/notifications.css', './styles/features/network.css', './styles/features/profile.css', './styles/features/profile-page.css', './styles/features/settings.css', './styles/features/devices.css', './styles/features/developer-tools.css', './styles/network-graph.css', './styles/network-legacy.css'];
|
||||
const cssFiles = ['./styles/main.css', './styles/layout.css', './styles/app-shell.css', './styles/buttons-white.css', './styles/components/topbar.css', './styles/components/dropdown-menu.css', './styles/components/primitives.css', './styles/components/feedback.css', './styles/components/tabs.css', './styles/components/chips.css', './styles/components/nav-list.css', './styles/components/palette-editor.css', './styles/components/avatar.css', './styles/components/modal.css', './styles/components/person-note.css', './styles/components/person-row.css', './styles/components/compose.css', './styles/components/attachments.css', './styles/components/media-viewer.css', './styles/components/channel-editor.css', './styles/components/emoji-picker.css', './styles/components/call-ui.css', './styles/components/scroll-to-bottom.css', './styles/components/overflow-dots.css', './styles/components/toolbar.css', './styles/features/preauth.css', './styles/features/messages.css', './styles/features/chat.css', './styles/features/channels-common.css', './styles/features/channels-list.css', './styles/features/channel.css', './styles/features/channel-thread.css', './styles/features/notifications.css', './styles/features/network.css', './styles/features/profile.css', './styles/features/profile-page.css', './styles/features/settings.css', './styles/features/devices.css', './styles/features/developer-tools.css', './styles/features/wallet-transfer.css', './styles/features/wallet-swap.css', './styles/network-graph.css', './styles/network-legacy.css'];
|
||||
// Стили, добавленные скриптом, браузер не ждёт перед первой отрисовкой: без этого
|
||||
// на долю секунды виден экран без CSS (логотип 640×640), а потом он «прыгает» на место.
|
||||
const root = document.documentElement;
|
||||
|
||||
+6
-2
@@ -86,7 +86,9 @@ import * as publicSupportQueueView from './pages/public-support-queue-view.js';
|
||||
import * as profileView from './pages/profile-view.js?v=20261110-pwa-avatar';
|
||||
import * as profileEditView from './pages/profile-edit-view.js';
|
||||
import * as profilesView from './pages/profiles-view.js';
|
||||
import * as walletView from './pages/wallet-view.js?v=202609260900';
|
||||
import * as walletView from './pages/wallet-view.js?v=202611170124';
|
||||
import * as walletTransferView from './pages/wallet-transfer-view.js';
|
||||
import * as walletSwapView from './pages/wallet-swap-view.js';
|
||||
import * as settingsView from './pages/settings-view.js';
|
||||
import * as accessKeysView from './pages/access-keys-view.js';
|
||||
import * as myBlockchainView from './pages/my-blockchain-view.js';
|
||||
@@ -118,7 +120,7 @@ import * as solanaUsersInitView from './pages/solana-users-init-view.js';
|
||||
import * as solanaRpcCheckView from './pages/solana-rpc-check-view.js';
|
||||
import * as messagesList from './pages/messages-list.js?v=202610130400';
|
||||
import * as contactSearchView from './pages/contact-search-view.js';
|
||||
import * as chatView from './pages/chat-view.js?v=202610130200';
|
||||
import * as chatView from './pages/chat-view.js?v=202611170124';
|
||||
import * as chatMediaView from './pages/chat-media-view.js';
|
||||
import { isDmChatMuted } from './services/dm-chat-prefs.js';
|
||||
import { getDevicePref } from './services/device-prefs.js';
|
||||
@@ -173,6 +175,8 @@ const routes = {
|
||||
'profile-edit-view': profileEditView,
|
||||
'profiles-view': profilesView,
|
||||
'wallet-view': walletView,
|
||||
'wallet-transfer-view': walletTransferView,
|
||||
'wallet-swap-view': walletSwapView,
|
||||
'settings-view': settingsView,
|
||||
'access-keys-view': accessKeysView,
|
||||
'my-blockchain-view': myBlockchainView,
|
||||
|
||||
@@ -7,3 +7,7 @@ export const defaultServerHttp = `https://${defaultServerAddress}`;
|
||||
export const defaultServerWs = `wss://${defaultServerAddress}/ws`;
|
||||
export const defaultSolanaCluster = 'mainnet-beta';
|
||||
export const defaultSolanaEndpoint = `${defaultServerHttp}/solana-rpc`;
|
||||
|
||||
// Devnet ONLY: optional 6-decimal SPL test token representing USDT for UI/transfer tests.
|
||||
// Do not use this in Mainnet; official USDT mint is pinned by solana-usdt-service.js.
|
||||
export const devnetTestUsdtMint = '';
|
||||
|
||||
@@ -1,7 +1,38 @@
|
||||
{
|
||||
"wallet_multi": {
|
||||
"transfer_title": "Send funds",
|
||||
"transfer_to_contact": "Send funds",
|
||||
"asset": "Asset",
|
||||
"amount": "Amount",
|
||||
"recipient": "Recipient Solana address",
|
||||
"contacts": "SHiNE contacts",
|
||||
"search_contacts": "Search by login",
|
||||
"notify": "Send a message after the transfer is confirmed",
|
||||
"other_address": "Use another address",
|
||||
"contact": "Recipient",
|
||||
"resolving": "Looking up blockchainKey…",
|
||||
"no_contacts": "No matching contacts",
|
||||
"no_stars": "Direct transfer: no Stars or DAO fee.",
|
||||
"send": "Send",
|
||||
"sending": "Awaiting Solana confirmation…",
|
||||
"sent": "Transfer completed",
|
||||
"confirm": "Confirm transfer? Check the address and amount:",
|
||||
"success": "Transfer confirmed on Solana",
|
||||
"notice_sent": "Message sent to recipient.",
|
||||
"notice_failed": "Transfer succeeded, but notification failed",
|
||||
"dm_prefix": "💸 You have received a transfer:",
|
||||
"dm_signature": "Solana transaction",
|
||||
"balance_unavailable": "USDT balance unavailable",
|
||||
"test_mint_missing": "Token is not configured on Devnet",
|
||||
"devnet_disclaimer": "Official USDT does not exist on Devnet. Testing requires a separate 6-decimal SPL token.",
|
||||
"jupiter_external": "Swap on Jupiter ↗",
|
||||
"jupiter_warning": "Jupiter opens externally. Your built-in SHiNE wallet is not automatically connected; swapping requires an external compatible wallet. Real USDT swaps are unavailable on Devnet."
|
||||
},
|
||||
"language": {
|
||||
"menu": "Language / Language",
|
||||
"selector": "Interface language / Language"
|
||||
"selector": "Interface language / Language",
|
||||
"uncertain": "Transfer status is uncertain; it may have succeeded. Check Solana history before sending again.",
|
||||
"receive_hint": "This address receives SOL and USDT on Solana. Do not send tokens from other blockchains."
|
||||
},
|
||||
"dialogs": {
|
||||
"app": {
|
||||
@@ -977,10 +1008,7 @@
|
||||
"text_005": "File downloaded",
|
||||
"text_006": "file",
|
||||
"text_007": "Download {value1}",
|
||||
"file_expired": "File no longer available: encrypted attachments are kept for up to 14 days.",
|
||||
"file_expired_short": "Attachment has expired",
|
||||
"remaining_less_day": "Attachment available for less than a day",
|
||||
"remaining_days": "Attachment available for {value1} more days"
|
||||
"file_expired": "File no longer available: encrypted attachments are kept for up to 14 days."
|
||||
},
|
||||
"palette_editor": {
|
||||
"text_001": "Failed to read palette, please make sure the whole text is copied.",
|
||||
@@ -2219,13 +2247,6 @@
|
||||
"text_039": "Who to show"
|
||||
},
|
||||
"chat_view": {
|
||||
"voice_cancel": "Discard recording",
|
||||
"voice_pause": "Pause recording",
|
||||
"voice_resume": "Resume recording",
|
||||
"voice_cancelled": "Recording discarded",
|
||||
"voice_tap_hint": "Tap send or discard the recording",
|
||||
"voice_send": "Send voice message",
|
||||
"file_remove": "Remove file {value1}",
|
||||
"security_notice": {
|
||||
"title": "Private chat security",
|
||||
"encryption": "Messages in this chat are encrypted on the participants' devices.",
|
||||
@@ -4790,5 +4811,37 @@
|
||||
"attachment_error": {
|
||||
"hash_mismatch": "The downloaded file SHA-256 does not match the blockchain: {actual} != {expected} ({url})"
|
||||
}
|
||||
},
|
||||
"wallet_swap": {
|
||||
"title": "Swap · Jupiter",
|
||||
"beta": "🧪 Beta — still in development",
|
||||
"warning": "Automated SOL ↔ USDT swaps via Jupiter have not been fully tested in SHiNE. We do not recommend using this feature yet. Transactions may fail, behave unexpectedly, or cause a loss of funds. If you choose to experiment, you do so at your own risk and should use only tiny amounts. No outcome is guaranteed.\n\nYour private keys remain inside the SHiNE client. Jupiter finds the route, SHiNE signs locally, and Solana RPC broadcasts the transaction. The SHiNE server does not custody your funds or private keys.",
|
||||
"direction": "Swap direction",
|
||||
"amount": "Amount to sell",
|
||||
"get_quote": "Get Jupiter quote",
|
||||
"expected": "Estimated output",
|
||||
"minimum": "Minimum output (0.5% slippage)",
|
||||
"route": "Route",
|
||||
"quote_note": "Quotes expire quickly. Network fees and the market price can change. A small SOL balance is required for fees.",
|
||||
"accept_risk": "I understand this is experimental and may result in loss of funds. I accept the risk.",
|
||||
"execute": "Confirm experimental swap",
|
||||
"check_status": "Check previous swap status",
|
||||
"fetching": "Fetching Jupiter quote…",
|
||||
"review": "Verify the amount and minimum output before proceeding.",
|
||||
"executing": "Simulating, validating, signing and broadcasting…",
|
||||
"final_warning": "WARNING: EXPERIMENTAL SWAP. We do not recommend using this feature with real funds. No guarantees. Do not use large amounts.",
|
||||
"final_question": "Do you want to proceed at your own risk?",
|
||||
"devnet_unavailable": "Jupiter swaps require Mainnet. Devnet has no real USDT liquidity; swaps are disabled.",
|
||||
"success": "Swap confirmed on Solana. Refreshing balances.",
|
||||
"pending": "A previous swap may have landed. Do not retry until its status is verified on Solana Explorer.",
|
||||
"pending_resolved": "Previous swap status was resolved.",
|
||||
"transaction": "Solana transaction",
|
||||
"session_required": "Sign in to SHiNE to access the wallet.",
|
||||
"stale": "Quote is over 30 seconds old. Please fetch it again.",
|
||||
"wallet_changed": "Wallet changed; the quote has been invalidated.",
|
||||
"sol_limit": "Beta limit: up to 0.02 SOL per swap. Keep 0.01 SOL for fees.",
|
||||
"usdt_limit": "Beta limit: up to 5 USDT per swap. Keep SOL available for fees.",
|
||||
"wallet_hint": "🧪 Experimental SOL ↔ USDT swaps via Jupiter. Not recommended for real funds; please review the warnings before trying.",
|
||||
"wallet_button": "Swap · Jupiter β"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,38 @@
|
||||
{
|
||||
"wallet_multi": {
|
||||
"transfer_title": "Перевести деньги",
|
||||
"transfer_to_contact": "Перевести деньги",
|
||||
"asset": "Валюта",
|
||||
"amount": "Сумма",
|
||||
"recipient": "Адрес Solana получателя",
|
||||
"contacts": "Контакты SHiNE",
|
||||
"search_contacts": "Найти контакт по логину",
|
||||
"notify": "Отправить получателю сообщение после успешного перевода",
|
||||
"other_address": "Ввести другой адрес",
|
||||
"contact": "Получатель",
|
||||
"resolving": "Определяем blockchainKey…",
|
||||
"no_contacts": "Контакты не найдены",
|
||||
"no_stars": "Обычный перевод без доната, Stars и комиссии DAO.",
|
||||
"send": "Перевести",
|
||||
"sending": "Проверяем перевод в Solana…",
|
||||
"sent": "Перевод выполнен",
|
||||
"confirm": "Подтвердить перевод? Проверьте адрес и сумму:",
|
||||
"success": "Перевод подтверждён Solana",
|
||||
"notice_sent": "Сообщение получателю отправлено.",
|
||||
"notice_failed": "Перевод выполнен, но сообщение не отправлено",
|
||||
"dm_prefix": "💸 Вам отправлен перевод:",
|
||||
"dm_signature": "Транзакция Solana",
|
||||
"balance_unavailable": "Баланс USDT недоступен",
|
||||
"test_mint_missing": "Токен не настроен в Devnet",
|
||||
"devnet_disclaimer": "На Devnet настоящий USDT отсутствует. Для тестирования нужен отдельный SPL-токен с 6 знаками.",
|
||||
"jupiter_external": "Обменять на Jupiter ↗",
|
||||
"jupiter_warning": "Jupiter откроется на внешнем сайте. Встроенный кошелёк SHiNE там не подключается автоматически: для обмена потребуется совместимый внешний кошелёк. На Devnet реального обмена USDT нет."
|
||||
},
|
||||
"language": {
|
||||
"menu": "Язык / Language",
|
||||
"selector": "Язык интерфейса / Interface language"
|
||||
"selector": "Язык интерфейса / Interface language",
|
||||
"uncertain": "Не удалось однозначно подтвердить перевод. Он мог пройти! Проверьте историю Solana перед повторной отправкой.",
|
||||
"receive_hint": "Этот адрес используется для SOL и USDT в сети Solana. Не отправляйте сюда токены из других блокчейнов."
|
||||
},
|
||||
"dialogs": {
|
||||
"app": {
|
||||
@@ -977,10 +1008,7 @@
|
||||
"text_005": "Файл скачан",
|
||||
"text_006": "файл",
|
||||
"text_007": "Скачать {value1}",
|
||||
"file_expired": "Файл больше недоступен: зашифрованные вложения хранятся не более 14 дней.",
|
||||
"file_expired_short": "Срок хранения вложения истёк",
|
||||
"remaining_less_day": "Вложение доступно ещё менее дня",
|
||||
"remaining_days": "Вложение доступно ещё {value1} дн."
|
||||
"file_expired": "Файл больше недоступен: зашифрованные вложения хранятся не более 14 дней."
|
||||
},
|
||||
"palette_editor": {
|
||||
"text_001": "Не удалось прочитать палитру: проверьте, что текст скопирован целиком.",
|
||||
@@ -2352,13 +2380,6 @@
|
||||
"text_039": "Кого показать"
|
||||
},
|
||||
"chat_view": {
|
||||
"voice_cancel": "Отменить запись",
|
||||
"voice_pause": "Приостановить запись",
|
||||
"voice_resume": "Продолжить запись",
|
||||
"voice_cancelled": "Запись отменена",
|
||||
"voice_tap_hint": "Нажмите кнопку отправки или отмените запись",
|
||||
"voice_send": "Отправить голосовое",
|
||||
"file_remove": "Убрать файл {value1}",
|
||||
"security_notice": {
|
||||
"title": "Безопасность личной переписки",
|
||||
"encryption": "Сообщения в этом чате шифруются на устройствах участников.",
|
||||
@@ -4790,5 +4811,37 @@
|
||||
"attachment_error": {
|
||||
"hash_mismatch": "SHA-256 скачанного файла не совпал с блокчейном: {actual} != {expected} ({url})"
|
||||
}
|
||||
},
|
||||
"wallet_swap": {
|
||||
"title": "Обмен валют · Jupiter",
|
||||
"beta": "🧪 Бета-версия — находится в разработке",
|
||||
"warning": "Обмен SOL ↔ USDT через автоматический обменник Jupiter ещё не прошёл полное тестирование в SHiNE. Мы пока не рекомендуем пользоваться функцией. Возможны ошибки, неудачные транзакции и потеря средств. Если решите попробовать — только на свой риск и на минимальных суммах. Гарантии результата нет.\n\nПриватные ключи остаются в вашем приложении. Jupiter подбирает маршрут обмена, SHiNE подписывает локально, а Solana RPC отправляет транзакцию. Сервер SHiNE не хранит ключи и не принимает средства на свой баланс.",
|
||||
"direction": "Направление обмена",
|
||||
"amount": "Сколько отдать",
|
||||
"get_quote": "Рассчитать через Jupiter",
|
||||
"expected": "Ожидаете получить",
|
||||
"minimum": "Минимум при проскальзывании 0,5%",
|
||||
"route": "Маршрут",
|
||||
"quote_note": "Котировка быстро устаревает. Сумма и комиссии сети могут измениться. Для обмена также нужен SOL на комиссию.",
|
||||
"accept_risk": "Понимаю: функция экспериментальная, возможна потеря средств. Использую на свой риск.",
|
||||
"execute": "Подтвердить тестовый обмен",
|
||||
"check_status": "Проверить статус предыдущего обмена",
|
||||
"fetching": "Запрашиваем котировку Jupiter…",
|
||||
"review": "Проверьте сумму и условия. Прежде чем подтверждать, примите предупреждение.",
|
||||
"executing": "Симулируем, проверяем и отправляем транзакцию в Solana…",
|
||||
"final_warning": "ВНИМАНИЕ: ЭКСПЕРИМЕНТАЛЬНЫЙ ОБМЕН. Мы не рекомендуем использовать его с реальными деньгами, гарантий нет. Не отправляйте большие суммы.",
|
||||
"final_question": "Вы действительно хотите выполнить этот обмен на свой риск?",
|
||||
"devnet_unavailable": "Jupiter Swap работает только в Mainnet. На Devnet нет реальной ликвидности USDT; обмен отключён.",
|
||||
"success": "Обмен подтверждён Solana. Балансы обновляются.",
|
||||
"pending": "У предыдущего обмена неопределённый статус. Не повторяйте операцию, пока не проверите транзакцию в Solana Explorer.",
|
||||
"pending_resolved": "Статус предыдущей транзакции разрешён.",
|
||||
"transaction": "Транзакция в Solana",
|
||||
"session_required": "Для обмена войдите в SHiNE и откройте кошелёк.",
|
||||
"stale": "Котировка старше 30 секунд. Рассчитайте заново.",
|
||||
"wallet_changed": "Ключ кошелька изменился, расчёт отменён.",
|
||||
"sol_limit": "Бета-лимит: до 0,02 SOL за обмен. Оставьте 0,01 SOL на комиссии.",
|
||||
"usdt_limit": "Бета-лимит: до 5 USDT за обмен. Нужен запас SOL на комиссии.",
|
||||
"wallet_hint": "🧪 Тестовый обмен SOL ↔ USDT через Jupiter. Функция не рекомендована для реальных средств: откройте предупреждение перед использованием.",
|
||||
"wallet_button": "Обменять · Jupiter β"
|
||||
}
|
||||
}
|
||||
|
||||
+26
-155
@@ -1292,21 +1292,6 @@ function renderLog(
|
||||
);
|
||||
}
|
||||
bubble.append(attachmentsWrap);
|
||||
const expiresAt = dmAttachments
|
||||
.filter((item) => Number(item?.version || 1) >= 3)
|
||||
.map((item) => Number(item.uploadedAtMs || msg?.timeMs || 0) + 14 * 24 * 60 * 60 * 1000)
|
||||
.filter((value) => value > 14 * 24 * 60 * 60 * 1000);
|
||||
if (expiresAt.length) {
|
||||
const remaining = Math.min(...expiresAt) - Date.now();
|
||||
const expiry = document.createElement('div');
|
||||
expiry.className = 'dm-attachment-expiry';
|
||||
expiry.textContent = remaining <= 0
|
||||
? t('screens.dm_attachments.file_expired_short')
|
||||
: remaining < 24 * 60 * 60 * 1000
|
||||
? t('screens.dm_attachments.remaining_less_day')
|
||||
: t('screens.dm_attachments.remaining_days', { value1: Math.ceil(remaining / (24 * 60 * 60 * 1000)) });
|
||||
bubble.append(expiry);
|
||||
}
|
||||
}
|
||||
|
||||
const textNode = document.createElement('div');
|
||||
@@ -1579,7 +1564,7 @@ export function render({ navigate, route, chrome }) {
|
||||
onClick: () => handleStartCall('video'),
|
||||
},
|
||||
{
|
||||
iconNode: createOverflowDots(),
|
||||
iconNode: createOverflowDots({ className: 'app-overflow-dots--vertical' }),
|
||||
title: t('screens.chat_view.text_013'),
|
||||
ariaLabel: t('screens.chat_view.text_014'),
|
||||
className: 'chat-header-icon-btn chat-header-menu-btn topbar-overflow-action--raised',
|
||||
@@ -1605,6 +1590,7 @@ export function render({ navigate, route, chrome }) {
|
||||
},
|
||||
}
|
||||
: null,
|
||||
{ label: t('wallet_multi.transfer_to_contact'), iconHtml: menuIconSvg('forward'), action: () => navigate(`wallet/transfer/${encodeURIComponent(chatId)}`) },
|
||||
{ divider: true },
|
||||
{
|
||||
label: t('screens.chat_view.text_020'),
|
||||
@@ -1912,11 +1898,9 @@ export function render({ navigate, route, chrome }) {
|
||||
<button class="dm-bar-icon dm-camera-btn" type="button" id="chat-camera-toggle" aria-label="${th('screens.chat_view.text_115')}" title="${th('screens.chat_view.text_116')}"${fileTransferEnabledAtRender ? '' : ' hidden'}>${iconHtml('camera')}</button>
|
||||
<button class="dm-bar-icon dm-file-btn" type="button" id="chat-file-toggle" aria-label="${th('screens.chat_view.text_117')}" title="${th('screens.chat_view.text_118')}"${fileTransferEnabledAtRender ? '' : ' hidden'}>${iconHtml('clip')}</button>
|
||||
<div class="dm-voice-recording-status" id="chat-voice-recording-status" hidden>
|
||||
<button class="dm-voice-cancel" type="button" id="chat-voice-cancel" aria-label="${th('screens.chat_view.voice_cancel')}">✕</button>
|
||||
<span class="dm-voice-recording-dot" aria-hidden="true"></span>
|
||||
<span class="dm-voice-recording-time" id="chat-voice-recording-time">0:00</span>
|
||||
<span class="dm-voice-recording-hint" id="chat-voice-recording-hint">${th('screens.chat_view.text_119')}</span>
|
||||
<button class="dm-voice-pause" type="button" id="chat-voice-pause" hidden></button>
|
||||
</div>
|
||||
<div class="dm-field">
|
||||
<textarea class="input dm-input" name="message" rows="1" placeholder="${th('screens.chat_view.text_120')}" maxlength="12000" enterkeyhint="enter"></textarea>
|
||||
@@ -1924,7 +1908,6 @@ export function render({ navigate, route, chrome }) {
|
||||
<button class="dm-bar-icon dm-emoji-btn" type="button" id="chat-emoji-toggle" aria-label="${th('screens.chat_view.text_121')}" title="${th('screens.chat_view.text_122')}">${iconHtml('emoji')}</button>
|
||||
<button class="dm-send-btn dm-send-icon-btn" type="button" title="${th('screens.chat_view.text_123')}" data-mode="voice" aria-label="${th('screens.chat_view.text_124')}"></button>
|
||||
</div>
|
||||
<div class="dm-file-queue" id="chat-file-queue" hidden></div>
|
||||
<input id="chat-file-input" type="file" multiple hidden />
|
||||
<input id="chat-media-input" type="file" accept="image/*,video/*" multiple hidden />
|
||||
<input id="chat-camera-input" type="file" accept="image/*,video/*" capture="environment" hidden />
|
||||
@@ -1935,7 +1918,6 @@ export function render({ navigate, route, chrome }) {
|
||||
const emojiToggle = form.querySelector('#chat-emoji-toggle');
|
||||
const fileToggle = form.querySelector('#chat-file-toggle');
|
||||
const fileInput = form.querySelector('#chat-file-input');
|
||||
const fileQueue = form.querySelector('#chat-file-queue');
|
||||
// Три входа для вложений: галерея (фото/видео), камера и любой файл – дальше путь один.
|
||||
const attachSources = [
|
||||
[fileToggle, fileInput],
|
||||
@@ -1947,8 +1929,6 @@ export function render({ navigate, route, chrome }) {
|
||||
const voiceStatus = form.querySelector('#chat-voice-recording-status');
|
||||
const voiceTime = form.querySelector('#chat-voice-recording-time');
|
||||
const voiceHint = form.querySelector('#chat-voice-recording-hint');
|
||||
const voicePause = form.querySelector('#chat-voice-pause');
|
||||
const voiceCancel = form.querySelector('#chat-voice-cancel');
|
||||
const fileTransferEnabled = isDmFileTransferEnabled();
|
||||
const editBanner = form.querySelector('#chat-edit-banner');
|
||||
const editBannerText = form.querySelector('#chat-edit-banner-text');
|
||||
@@ -1961,8 +1941,6 @@ export function render({ navigate, route, chrome }) {
|
||||
let emojiLongPressTimer = null;
|
||||
let emojiLongPressTriggered = false;
|
||||
let fileActionVisible = false;
|
||||
let queuedFiles = [];
|
||||
let fileSending = false;
|
||||
let voiceRecorder = null;
|
||||
let voiceStream = null;
|
||||
let voiceChunks = [];
|
||||
@@ -1972,11 +1950,6 @@ export function render({ navigate, route, chrome }) {
|
||||
let voicePointerHeld = false;
|
||||
let voiceReleaseRequested = false;
|
||||
let voiceStartY = 0;
|
||||
let voiceStartX = 0;
|
||||
let voicePressStartedAt = 0;
|
||||
let voiceCancelRequested = false;
|
||||
let voicePausedMs = 0;
|
||||
let voicePausedAt = 0;
|
||||
let voicePointerId = null;
|
||||
let voiceBusy = false;
|
||||
let suppressVoiceClick = false;
|
||||
@@ -2052,7 +2025,7 @@ export function render({ navigate, route, chrome }) {
|
||||
return iconHtml('send');
|
||||
}
|
||||
if (mode === 'stop') {
|
||||
return iconHtml('send');
|
||||
return '<svg viewBox="0 0 24 24" aria-hidden="true"><rect x="7" y="7" width="10" height="10" rx="2" fill="currentColor"/></svg>';
|
||||
}
|
||||
if (mode === 'busy') {
|
||||
return '<span class="dm-send-busy-dot">…</span>';
|
||||
@@ -2060,8 +2033,7 @@ export function render({ navigate, route, chrome }) {
|
||||
return iconHtml('mic');
|
||||
};
|
||||
|
||||
const currentVoiceDurationMs = () => voiceStartedAt > 0
|
||||
? Math.max(0, (voicePausedAt || Date.now()) - voiceStartedAt - voicePausedMs) : 0;
|
||||
const currentVoiceDurationMs = () => voiceStartedAt > 0 ? Math.max(0, Date.now() - voiceStartedAt) : 0;
|
||||
|
||||
const syncVoiceTimer = () => {
|
||||
if (voiceTime) voiceTime.textContent = formatVoiceDuration(currentVoiceDurationMs());
|
||||
@@ -2087,22 +2059,22 @@ export function render({ navigate, route, chrome }) {
|
||||
if (!sendBtn) return;
|
||||
const recording = Boolean(voiceRecorder && voiceRecorder.state !== 'inactive');
|
||||
let mode = 'voice';
|
||||
if (voiceBusy || fileSending) mode = 'busy';
|
||||
if (voiceBusy) mode = 'busy';
|
||||
else if (recording && voiceLocked) mode = 'stop';
|
||||
else if (recording) mode = 'voice';
|
||||
else if (activeEdit || queuedFiles.length || String(input?.value || '').trim()) mode = 'send';
|
||||
else if (activeEdit || String(input?.value || '').trim()) mode = 'send';
|
||||
|
||||
sendBtn.dataset.mode = mode;
|
||||
sendBtn.innerHTML = sendIconMarkup(mode);
|
||||
sendBtn.classList.toggle('is-recording', recording);
|
||||
sendBtn.classList.toggle('is-locked', recording && voiceLocked);
|
||||
sendBtn.disabled = voiceBusy || fileSending || (mode === 'voice' && !recording && !fileTransferEnabled);
|
||||
sendBtn.disabled = voiceBusy || (mode === 'voice' && !recording && !fileTransferEnabled);
|
||||
if (mode === 'send') {
|
||||
sendBtn.title = t('screens.chat_view.text_029');
|
||||
sendBtn.setAttribute('aria-label', t('dialogs.modals.chat_view.label_029'));
|
||||
} else if (mode === 'stop') {
|
||||
sendBtn.title = t('screens.chat_view.voice_send');
|
||||
sendBtn.setAttribute('aria-label', t('screens.chat_view.voice_send'));
|
||||
sendBtn.title = t('screens.chat_view.text_030');
|
||||
sendBtn.setAttribute('aria-label', t('dialogs.modals.chat_view.label_030'));
|
||||
} else if (mode === 'busy') {
|
||||
sendBtn.title = t('screens.chat_view.text_031');
|
||||
sendBtn.setAttribute('aria-label', t('dialogs.modals.chat_view.label_031'));
|
||||
@@ -2112,13 +2084,6 @@ export function render({ navigate, route, chrome }) {
|
||||
}
|
||||
form.classList.toggle('dm-chat-input--recording', recording);
|
||||
if (voiceStatus) voiceStatus.hidden = !recording;
|
||||
if (voicePause) {
|
||||
voicePause.hidden = !recording || !voiceLocked;
|
||||
voicePause.textContent = voiceRecorder?.state === 'paused' ? '▶' : 'Ⅱ';
|
||||
voicePause.setAttribute('aria-label', t(voiceRecorder?.state === 'paused' ? 'screens.chat_view.voice_resume' : 'screens.chat_view.voice_pause'));
|
||||
}
|
||||
form.classList.toggle('dm-chat-input--voice-locked', recording && voiceLocked);
|
||||
form.classList.toggle('dm-chat-input--voice-paused', recording && voiceRecorder?.state === 'paused');
|
||||
if (input) input.hidden = recording;
|
||||
if (emojiToggle) emojiToggle.hidden = recording;
|
||||
attachButtons.forEach((button) => { button.hidden = recording || !fileTransferEnabled; });
|
||||
@@ -2146,10 +2111,7 @@ export function render({ navigate, route, chrome }) {
|
||||
const stopVoiceRecording = ({ send = true } = {}) => {
|
||||
voicePointerHeld = false;
|
||||
voiceReleaseRequested = true;
|
||||
if (!voiceRecorder || voiceRecorder.state === 'inactive') {
|
||||
if (!send) voiceCancelRequested = true;
|
||||
return;
|
||||
}
|
||||
if (!voiceRecorder || voiceRecorder.state === 'inactive') return;
|
||||
voiceRecorder.__shineShouldSend = Boolean(send);
|
||||
try {
|
||||
voiceRecorder.stop();
|
||||
@@ -2158,7 +2120,7 @@ export function render({ navigate, route, chrome }) {
|
||||
}
|
||||
};
|
||||
|
||||
const startVoiceRecording = async ({ pointerY = 0, pointerX = 0, pointerId = null } = {}) => {
|
||||
const startVoiceRecording = async ({ pointerY = 0, pointerId = null } = {}) => {
|
||||
if (voiceBusy || (voiceRecorder && voiceRecorder.state !== 'inactive')) return;
|
||||
if (!fileTransferEnabled) {
|
||||
showToast(t('screens.chat_view.text_047'), { kind: 'error', timeoutMs: 1900 });
|
||||
@@ -2177,11 +2139,7 @@ export function render({ navigate, route, chrome }) {
|
||||
voiceReleaseRequested = false;
|
||||
voiceLocked = false;
|
||||
voiceStartY = Number(pointerY || 0);
|
||||
voiceStartX = Number(pointerX || 0);
|
||||
voicePointerId = pointerId;
|
||||
voiceCancelRequested = false;
|
||||
voicePausedMs = 0;
|
||||
voicePausedAt = 0;
|
||||
suppressVoiceClick = false;
|
||||
|
||||
try {
|
||||
@@ -2209,15 +2167,13 @@ export function render({ navigate, route, chrome }) {
|
||||
showToast(actionErrorText(t('screens.chat_view.text_050'), event?.error), { kind: 'error' });
|
||||
});
|
||||
recorder.addEventListener('stop', async () => {
|
||||
const shouldSend = recorder.__shineShouldSend !== false && !voiceCancelRequested;
|
||||
const shouldSend = recorder.__shineShouldSend !== false;
|
||||
const durationMs = currentVoiceDurationMs();
|
||||
const chunks = voiceChunks.slice();
|
||||
voiceChunks = [];
|
||||
voiceRecorder = null;
|
||||
voiceLocked = false;
|
||||
voiceStartedAt = 0;
|
||||
voicePausedAt = 0;
|
||||
voicePausedMs = 0;
|
||||
clearVoiceTimer();
|
||||
stopVoiceStreamTracks();
|
||||
voiceBusy = shouldSend && chunks.some((chunk) => chunk.size > 0);
|
||||
@@ -2256,8 +2212,7 @@ export function render({ navigate, route, chrome }) {
|
||||
recorder.start(1000);
|
||||
voiceTimer = window.setInterval(syncVoiceTimer, 250);
|
||||
updateSendButtonMode();
|
||||
if (voiceCancelRequested) stopVoiceRecording({ send: false });
|
||||
else if (voiceReleaseRequested && !voiceLocked) stopVoiceRecording({ send: true });
|
||||
if (voiceReleaseRequested && !voiceLocked) stopVoiceRecording({ send: true });
|
||||
} catch (error) {
|
||||
voicePointerHeld = false;
|
||||
voiceReleaseRequested = false;
|
||||
@@ -2573,7 +2528,7 @@ export function render({ navigate, route, chrome }) {
|
||||
}
|
||||
};
|
||||
|
||||
const sendFileAttachmentMessage = async (attachmentsInput, caption = '') => {
|
||||
const sendFileAttachmentMessage = async (attachmentsInput) => {
|
||||
const attachments = (Array.isArray(attachmentsInput) ? attachmentsInput : [attachmentsInput]).filter(Boolean);
|
||||
if (!attachments.length) return;
|
||||
if (attachments.length > DM_MAX_ATTACHMENTS_PER_MESSAGE) {
|
||||
@@ -2588,7 +2543,7 @@ export function render({ navigate, route, chrome }) {
|
||||
: (attachments.length === 1
|
||||
? `📎 ${String(attachments[0]?.name || 'file')}`
|
||||
: t('screens.chat_view.text_097', { value1: attachments.length }));
|
||||
const finalText = `${replyBlock}${fileBlocks}${String(caption || '').trim() || fallbackText}`;
|
||||
const finalText = `${replyBlock}${fileBlocks}${fallbackText}`;
|
||||
|
||||
hideUnreadSeparator({ rerender: false });
|
||||
const tempId = addOutgoingPendingMessage(chatId, finalText);
|
||||
@@ -2652,7 +2607,7 @@ export function render({ navigate, route, chrome }) {
|
||||
};
|
||||
|
||||
// Файлы уже лежат на сервере – повторить можно одно сообщение с ключами, без новой загрузки.
|
||||
const offerAttachmentsRetry = (attachments, error, caption = '') => {
|
||||
const offerAttachmentsRetry = (attachments, error) => {
|
||||
showToast(actionErrorText(attachments.length === 1 ? t('screens.chat_view.text_075') : t('screens.chat_view.text_076'), error), {
|
||||
kind: 'error',
|
||||
action: {
|
||||
@@ -2660,40 +2615,17 @@ export function render({ navigate, route, chrome }) {
|
||||
onClick: async () => {
|
||||
if (disposed) return;
|
||||
try {
|
||||
await sendFileAttachmentMessage(attachments, caption);
|
||||
await sendFileAttachmentMessage(attachments);
|
||||
if (!disposed) showToast(attachments.length === 1 ? t('screens.chat_view.text_077') : t('screens.chat_view.text_100', { value1: attachments.length }), { timeoutMs: 1300 });
|
||||
} catch (again) {
|
||||
if (!disposed) offerAttachmentsRetry(attachments, again, caption);
|
||||
if (!disposed) offerAttachmentsRetry(attachments, again);
|
||||
}
|
||||
},
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
const renderQueuedFiles = () => {
|
||||
fileQueue.replaceChildren();
|
||||
fileQueue.hidden = !queuedFiles.length;
|
||||
queuedFiles.forEach((file, index) => {
|
||||
const chip = document.createElement('span');
|
||||
chip.className = 'dm-file-queue__chip';
|
||||
const name = document.createElement('span');
|
||||
name.textContent = file.name;
|
||||
const remove = document.createElement('button');
|
||||
remove.type = 'button';
|
||||
remove.textContent = '✕';
|
||||
remove.setAttribute('aria-label', t('screens.chat_view.file_remove', { value1: file.name }));
|
||||
remove.addEventListener('click', () => {
|
||||
queuedFiles.splice(index, 1);
|
||||
renderQueuedFiles();
|
||||
});
|
||||
chip.append(name, remove);
|
||||
fileQueue.append(chip);
|
||||
});
|
||||
updateSendButtonMode();
|
||||
};
|
||||
|
||||
const handleSelectedFiles = async (fileList) => {
|
||||
if (fileSending) return;
|
||||
if (!fileTransferEnabled) {
|
||||
showToast(t('screens.chat_view.text_054'), { kind: 'error', timeoutMs: 1800 });
|
||||
return;
|
||||
@@ -2703,14 +2635,11 @@ export function render({ navigate, route, chrome }) {
|
||||
return;
|
||||
}
|
||||
const allFiles = Array.from(fileList || []).filter(Boolean);
|
||||
const caption = String(input?.value || '').trim();
|
||||
if (!allFiles.length) return;
|
||||
if (allFiles.length > DM_MAX_ATTACHMENTS_PER_MESSAGE) {
|
||||
showToast(t('screens.chat_view.text_101', { value1: DM_MAX_ATTACHMENTS_PER_MESSAGE }), { kind: 'error', timeoutMs: 2200 });
|
||||
return;
|
||||
}
|
||||
fileSending = true;
|
||||
updateSendButtonMode();
|
||||
|
||||
attachButtons.forEach((button) => {
|
||||
button.disabled = true;
|
||||
@@ -2738,26 +2667,13 @@ export function render({ navigate, route, chrome }) {
|
||||
attachments.push(attachment);
|
||||
}
|
||||
uploaded = true;
|
||||
await sendFileAttachmentMessage(attachments, caption);
|
||||
queuedFiles = [];
|
||||
renderQueuedFiles();
|
||||
if (caption && String(input?.value || '').trim() === caption) {
|
||||
input.value = '';
|
||||
autoResizeComposer(input);
|
||||
updateSendButtonMode();
|
||||
}
|
||||
await sendFileAttachmentMessage(attachments);
|
||||
setFileActionVisible(false);
|
||||
showToast(attachments.length === 1 ? t('screens.chat_view.text_078') : t('screens.chat_view.text_103', { value1: attachments.length }), { timeoutMs: 1300 });
|
||||
} catch (error) {
|
||||
if (uploaded) {
|
||||
queuedFiles = [];
|
||||
renderQueuedFiles();
|
||||
offerAttachmentsRetry(attachments, error, caption);
|
||||
}
|
||||
if (uploaded) offerAttachmentsRetry(attachments, error);
|
||||
else showToast(actionErrorText(allFiles.length === 1 ? t('screens.chat_view.text_079') : t('screens.chat_view.text_080'), error), { kind: 'error' });
|
||||
} finally {
|
||||
fileSending = false;
|
||||
updateSendButtonMode();
|
||||
attachButtons.forEach((button) => {
|
||||
button.disabled = false;
|
||||
button.classList.remove('is-busy');
|
||||
@@ -3005,14 +2921,7 @@ export function render({ navigate, route, chrome }) {
|
||||
});
|
||||
picker?.addEventListener('change', () => {
|
||||
const files = Array.from(picker.files || []);
|
||||
if (!files.length) return;
|
||||
if (queuedFiles.length + files.length > DM_MAX_ATTACHMENTS_PER_MESSAGE) {
|
||||
showToast(t('screens.chat_view.text_101', { value1: DM_MAX_ATTACHMENTS_PER_MESSAGE }), { kind: 'error' });
|
||||
return;
|
||||
}
|
||||
queuedFiles.push(...files);
|
||||
renderQueuedFiles();
|
||||
picker.value = '';
|
||||
if (files.length) void handleSelectedFiles(files);
|
||||
});
|
||||
});
|
||||
screen.addEventListener('pointerdown', (event) => {
|
||||
@@ -3045,21 +2954,14 @@ export function render({ navigate, route, chrome }) {
|
||||
voicePointerHeld = true;
|
||||
voiceReleaseRequested = false;
|
||||
voiceStartY = Number(event.clientY || 0);
|
||||
voicePressStartedAt = Date.now();
|
||||
voicePointerId = event.pointerId;
|
||||
try { sendBtn.setPointerCapture?.(event.pointerId); } catch { /* optional */ }
|
||||
void startVoiceRecording({ pointerY: voiceStartY, pointerX: event.clientX, pointerId: event.pointerId });
|
||||
void startVoiceRecording({ pointerY: voiceStartY, pointerId: event.pointerId });
|
||||
});
|
||||
|
||||
sendBtn?.addEventListener('pointermove', (event) => {
|
||||
if (!voicePointerHeld || voiceLocked || voicePointerId !== event.pointerId) return;
|
||||
if (Number(event.clientX || 0) <= voiceStartX - 72) {
|
||||
voiceCancelRequested = true;
|
||||
suppressVoiceClick = true;
|
||||
stopVoiceRecording({ send: false });
|
||||
if (voiceHint) voiceHint.textContent = t('screens.chat_view.voice_cancelled');
|
||||
return;
|
||||
}
|
||||
if (!voiceRecorder || voiceRecorder.state === 'inactive') return;
|
||||
if (Number(event.clientY || 0) <= voiceStartY - 64) {
|
||||
voiceLocked = true;
|
||||
voiceReleaseRequested = false;
|
||||
@@ -3076,40 +2978,13 @@ export function render({ navigate, route, chrome }) {
|
||||
voiceReleaseRequested = true;
|
||||
try { sendBtn?.releasePointerCapture?.(event.pointerId); } catch { /* optional */ }
|
||||
voicePointerId = null;
|
||||
if (!voiceLocked && !voiceCancelRequested && Date.now() - voicePressStartedAt < 350) {
|
||||
voiceLocked = true;
|
||||
voiceReleaseRequested = false;
|
||||
if (voiceHint) voiceHint.textContent = t('screens.chat_view.voice_tap_hint');
|
||||
updateSendButtonMode();
|
||||
if (!voiceLocked) {
|
||||
suppressVoiceClick = true;
|
||||
} else if (!voiceLocked) {
|
||||
suppressVoiceClick = true;
|
||||
stopVoiceRecording({ send: !voiceCancelRequested });
|
||||
stopVoiceRecording({ send: true });
|
||||
}
|
||||
};
|
||||
sendBtn?.addEventListener('pointerup', finishVoicePointerGesture);
|
||||
sendBtn?.addEventListener('pointercancel', (event) => {
|
||||
if (voicePointerId !== event.pointerId) return;
|
||||
voiceCancelRequested = true;
|
||||
finishVoicePointerGesture(event);
|
||||
stopVoiceRecording({ send: false });
|
||||
});
|
||||
voiceCancel?.addEventListener('click', () => {
|
||||
voiceCancelRequested = true;
|
||||
stopVoiceRecording({ send: false });
|
||||
});
|
||||
voicePause?.addEventListener('click', () => {
|
||||
if (!voiceRecorder || !voiceLocked) return;
|
||||
if (voiceRecorder.state === 'recording') {
|
||||
voiceRecorder.pause();
|
||||
voicePausedAt = Date.now();
|
||||
} else if (voiceRecorder.state === 'paused') {
|
||||
voicePausedMs += Date.now() - voicePausedAt;
|
||||
voicePausedAt = 0;
|
||||
voiceRecorder.resume();
|
||||
}
|
||||
updateSendButtonMode();
|
||||
});
|
||||
sendBtn?.addEventListener('pointercancel', finishVoicePointerGesture);
|
||||
sendBtn?.addEventListener('contextmenu', (event) => {
|
||||
if (String(sendBtn.dataset.mode || '') !== 'send') event.preventDefault();
|
||||
});
|
||||
@@ -3138,10 +3013,6 @@ export function render({ navigate, route, chrome }) {
|
||||
form.addEventListener('submit', async (event) => {
|
||||
event.preventDefault();
|
||||
const text = String(input.value || '').trim();
|
||||
if (queuedFiles.length) {
|
||||
await handleSelectedFiles(queuedFiles);
|
||||
return;
|
||||
}
|
||||
if (!text) return;
|
||||
input.value = '';
|
||||
autoResizeComposer(input);
|
||||
|
||||
@@ -0,0 +1,194 @@
|
||||
/** SHiNE wallet beta swap — in-app Jupiter routing, user's blockchainKey signs locally. */
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
import { state } from '../state.js';
|
||||
import { t } from '../i18n/index.js';
|
||||
import { getBalanceSol, getWalletFromStoredBlockchainKey } from '../services/solana-wallet-service.js';
|
||||
import { getUsdtBalance, formatAtomicAmount } from '../services/solana-usdt-service.js';
|
||||
import { getSolanaCluster } from '../services/solana-rpc-gateway.js';
|
||||
import { requestSwapBuild, validateSwapInput, validateSwapBuildResponse, executeJupiterSwap, getPendingSwapSignature } from '../services/jupiter-swap-service.js';
|
||||
|
||||
export const pageMeta = { id: 'wallet-swap-view', get title() { return t('wallet_swap.title'); } };
|
||||
|
||||
export function render({ navigate, chrome }) {
|
||||
chrome?.setTopbar(createTopBar({ title: t('wallet_swap.title'), back: { label: '←', onClick: () => navigate('wallet') } }));
|
||||
const screen = document.createElement('section');
|
||||
screen.className = 'stack wallet-transfer-screen wallet-swap-screen';
|
||||
const card = document.createElement('div');
|
||||
card.className = 'card stack wallet-transfer-card wallet-swap-card';
|
||||
card.innerHTML = `
|
||||
<h2 data-heading></h2>
|
||||
<p class="wallet-swap-beta-tag" data-beta></p>
|
||||
<p class="wallet-swap-warning" data-warning></p>
|
||||
<div class="wallet-transfer-balances">
|
||||
<div class="wallet-transfer-balance"><span>SOL</span><strong data-balance-sol>—</strong></div>
|
||||
<div class="wallet-transfer-balance"><span>USDT</span><strong data-balance-usdt>—</strong></div>
|
||||
</div>
|
||||
<label class="wallet-transfer-field"><span data-from-label></span><select class="input wallet-transfer-select" data-from><option value="SOL">SOL → USDT</option><option value="USDT">USDT → SOL</option></select></label>
|
||||
<label class="wallet-transfer-field"><span data-amount-label></span><input class="input" inputmode="decimal" autocomplete="off" data-amount type="text" placeholder="0.01" /></label>
|
||||
<p class="meta-muted wallet-swap-limit" data-limit></p>
|
||||
<button type="button" class="secondary-btn wallet-swap-quote-button" data-quote></button>
|
||||
<div class="wallet-swap-quote-box" data-preview hidden>
|
||||
<div><span data-receive-label></span><strong data-receive>—</strong></div>
|
||||
<div><span data-min-label></span><strong data-min>—</strong></div>
|
||||
<div><span data-route-label></span><strong>Jupiter Metis</strong></div>
|
||||
<p class="meta-muted" data-preview-hint></p>
|
||||
</div>
|
||||
<label class="wallet-transfer-notice wallet-swap-consent" data-consent-row hidden><input type="checkbox" data-consent /><span data-consent-label></span></label>
|
||||
<button type="button" class="primary-btn wallet-swap-confirm" data-confirm hidden disabled></button>
|
||||
<p class="meta-muted wallet-transfer-status" data-status role="status" aria-live="polite"></p>
|
||||
<a data-explorer target="_blank" rel="noopener noreferrer" class="wallet-swap-explorer" hidden></a>
|
||||
<button type="button" class="secondary-btn wallet-swap-check" data-check hidden></button>
|
||||
`;
|
||||
const el = (name) => card.querySelector(`[data-${name}]`);
|
||||
el('heading').textContent = t('wallet_swap.title');
|
||||
el('beta').textContent = t('wallet_swap.beta');
|
||||
el('warning').textContent = t('wallet_swap.warning');
|
||||
el('from-label').textContent = t('wallet_swap.direction');
|
||||
el('amount-label').textContent = t('wallet_swap.amount');
|
||||
el('quote').textContent = t('wallet_swap.get_quote');
|
||||
el('receive-label').textContent = t('wallet_swap.expected');
|
||||
el('min-label').textContent = t('wallet_swap.minimum');
|
||||
el('route-label').textContent = t('wallet_swap.route');
|
||||
el('preview-hint').textContent = t('wallet_swap.quote_note');
|
||||
el('consent-label').textContent = t('wallet_swap.accept_risk');
|
||||
el('confirm').textContent = t('wallet_swap.execute');
|
||||
el('check').textContent = t('wallet_swap.check_status');
|
||||
screen.append(card);
|
||||
const mainnet = getSolanaCluster() === 'mainnet-beta';
|
||||
const endpoint = state.entrySettings.solanaServer;
|
||||
let destroyed = false;
|
||||
let busy = false;
|
||||
let walletAddress = '';
|
||||
let balances = { solLamports: null, usdtAtomic: null };
|
||||
let lastQuote = null;
|
||||
let lastAmount = '';
|
||||
let lastCurrency = '';
|
||||
let blocked = false;
|
||||
|
||||
const status = (s) => { if (!destroyed) el('status').textContent = s || ''; };
|
||||
const showExplorer = (signature) => {
|
||||
const link = el('explorer');
|
||||
if (!signature || !/^[1-9A-HJ-NP-Za-km-z]{80,100}$/.test(signature)) { link.hidden = true; return; }
|
||||
link.href = `https://solscan.io/tx/${encodeURIComponent(signature)}`;
|
||||
link.textContent = `${t('wallet_swap.transaction')}: ${signature}`;
|
||||
link.hidden = false;
|
||||
};
|
||||
const resetQuote = () => {
|
||||
lastQuote = null;
|
||||
el('preview').hidden = true;
|
||||
el('consent-row').hidden = true;
|
||||
el('consent').checked = false;
|
||||
el('confirm').hidden = true;
|
||||
el('confirm').disabled = true;
|
||||
};
|
||||
const setBusy = (value) => {
|
||||
busy = value;
|
||||
el('amount').disabled = value || !mainnet;
|
||||
el('from').disabled = value || !mainnet;
|
||||
el('quote').disabled = value || !mainnet || blocked;
|
||||
el('confirm').disabled = value || !lastQuote || blocked || !el('consent').checked;
|
||||
};
|
||||
const updateLimit = () => {
|
||||
el('limit').textContent = el('from').value === 'SOL' ? t('wallet_swap.sol_limit') : t('wallet_swap.usdt_limit');
|
||||
resetQuote();
|
||||
};
|
||||
el('from').addEventListener('change', updateLimit);
|
||||
el('amount').addEventListener('input', resetQuote);
|
||||
el('consent').addEventListener('change', () => { el('confirm').disabled = !el('consent').checked || blocked || busy; });
|
||||
updateLimit();
|
||||
|
||||
async function refreshBalances() {
|
||||
const login = state.session.login;
|
||||
const storagePwd = state.session.storagePwdInMemory;
|
||||
if (!login || !storagePwd) throw new Error(t('wallet_swap.session_required'));
|
||||
const wallet = await getWalletFromStoredBlockchainKey({ login, storagePwd });
|
||||
walletAddress = wallet.address;
|
||||
const [sol, usdt] = await Promise.all([getBalanceSol({ endpoint, address: walletAddress }), getUsdtBalance({ endpoint, address: walletAddress })]);
|
||||
if (destroyed) return;
|
||||
balances = { solLamports: BigInt(sol.lamports), usdtAtomic: usdt.atomic };
|
||||
el('balance-sol').textContent = `${sol.sol.toFixed(6)} SOL`;
|
||||
el('balance-usdt').textContent = `${usdt.text} USDT`;
|
||||
}
|
||||
|
||||
async function checkPrevious() {
|
||||
const pending = await getPendingSwapSignature(endpoint);
|
||||
if (destroyed) return;
|
||||
const wasBlocked = blocked;
|
||||
blocked = Boolean(pending);
|
||||
el('check').hidden = !pending;
|
||||
if (pending) {
|
||||
status(t('wallet_swap.pending'));
|
||||
showExplorer(pending);
|
||||
} else if (wasBlocked) {
|
||||
status(t('wallet_swap.pending_resolved'));
|
||||
}
|
||||
setBusy(false);
|
||||
}
|
||||
el('check').addEventListener('click', () => { void checkPrevious().catch((error) => status(error.message || String(error))); });
|
||||
if (!mainnet) {
|
||||
status(t('wallet_swap.devnet_unavailable'));
|
||||
setBusy(false);
|
||||
} else {
|
||||
void (async () => {
|
||||
try { await refreshBalances(); await checkPrevious(); }
|
||||
catch (error) { status(error.message || String(error)); }
|
||||
})();
|
||||
}
|
||||
|
||||
el('quote').addEventListener('click', async () => {
|
||||
if (busy || destroyed || blocked || !mainnet) return;
|
||||
resetQuote();
|
||||
showExplorer('');
|
||||
try {
|
||||
const { pair, amount } = validateSwapInput(el('from').value, el('amount').value, balances);
|
||||
setBusy(true);
|
||||
status(t('wallet_swap.fetching'));
|
||||
if (!walletAddress) throw new Error(t('wallet_swap.session_required'));
|
||||
const prepared = await requestSwapBuild({ inputCurrency: pair.inputCurrency, amountAtomic: amount, walletAddress });
|
||||
if (destroyed) return;
|
||||
const checked = validateSwapBuildResponse(prepared.response, pair, amount);
|
||||
lastQuote = prepared;
|
||||
lastAmount = el('amount').value;
|
||||
lastCurrency = el('from').value;
|
||||
el('receive').textContent = `${formatAtomicAmount(checked.expected, pair.outputDecimals)} ${pair.outputCurrency}`;
|
||||
el('min').textContent = `${formatAtomicAmount(checked.minimum, pair.outputDecimals)} ${pair.outputCurrency}`;
|
||||
el('preview').hidden = false;
|
||||
el('consent-row').hidden = false;
|
||||
el('confirm').hidden = false;
|
||||
status(t('wallet_swap.review'));
|
||||
} catch (error) { status(error.message || String(error)); }
|
||||
finally { if (!destroyed) setBusy(false); }
|
||||
});
|
||||
|
||||
el('confirm').addEventListener('click', async () => {
|
||||
if (busy || blocked || !lastQuote || !el('consent').checked || destroyed) return;
|
||||
if (lastCurrency !== el('from').value || lastAmount !== el('amount').value) { resetQuote(); return; }
|
||||
if (Date.now() - lastQuote.fetchedAt > 30_000) { resetQuote(); status(t('wallet_swap.stale')); return; }
|
||||
const checked = validateSwapBuildResponse(lastQuote.response, lastQuote.pair, lastQuote.amount);
|
||||
const info = `${formatAtomicAmount(lastQuote.amount, lastQuote.pair.inputDecimals)} ${lastQuote.pair.inputCurrency} → ${formatAtomicAmount(checked.expected, lastQuote.pair.outputDecimals)} ${lastQuote.pair.outputCurrency}\n${t('wallet_swap.minimum')}: ${formatAtomicAmount(checked.minimum, lastQuote.pair.outputDecimals)} ${lastQuote.pair.outputCurrency}`;
|
||||
if (!window.confirm(`${t('wallet_swap.final_warning')}\n\n${info}\n\n${t('wallet_swap.final_question')}`)) return;
|
||||
const confirmedQuote = lastQuote;
|
||||
resetQuote(); // One-shot, even if signing or RPC fails.
|
||||
setBusy(true);
|
||||
status(t('wallet_swap.executing'));
|
||||
try {
|
||||
if (await getPendingSwapSignature(endpoint)) throw new Error(t('wallet_swap.pending'));
|
||||
const wallet = await getWalletFromStoredBlockchainKey({ login: state.session.login, storagePwd: state.session.storagePwdInMemory });
|
||||
if (wallet.address !== walletAddress) throw new Error(t('wallet_swap.wallet_changed'));
|
||||
const result = await executeJupiterSwap({ endpoint, fromKeypair: wallet.keypair, prepared: confirmedQuote });
|
||||
if (!destroyed) {
|
||||
showExplorer(result.signature);
|
||||
blocked = true; // No one-click repeat from this page after success.
|
||||
status(t('wallet_swap.success'));
|
||||
await refreshBalances();
|
||||
}
|
||||
} catch (error) {
|
||||
if (!destroyed) {
|
||||
status(error.message || String(error));
|
||||
if (error.signature) { blocked = true; showExplorer(error.signature); el('check').hidden = false; }
|
||||
}
|
||||
} finally { if (!destroyed) setBusy(false); }
|
||||
});
|
||||
screen.cleanup = () => { destroyed = true; };
|
||||
return screen;
|
||||
}
|
||||
@@ -0,0 +1,213 @@
|
||||
/** One dedicated transfer screen, opened from Wallet or an existing DM contact. */
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
import { authService, state } from '../state.js';
|
||||
import { getBalanceSol, getWalletFromStoredBlockchainKey, transferSolLamports, solanaAddressFromPublicKeyBase64 } from '../services/solana-wallet-service.js';
|
||||
import { getUsdtAsset, getUsdtBalance, toAtomicAmount, formatAtomicAmount, transferUsdt } from '../services/solana-usdt-service.js';
|
||||
import { loadSolanaWeb3 } from '../vendor/solana-web3-loader.js';
|
||||
import { readShineUserPda } from '../services/shine-user-pda-service.js';
|
||||
import { bytesToBase58 } from '../services/crypto-utils.js';
|
||||
import { t } from '../i18n/index.js';
|
||||
|
||||
export const pageMeta = { id: 'wallet-transfer-view', get title() { return t('wallet_multi.transfer_title'); } };
|
||||
|
||||
/** Use the blockchain public key, never clientKey (DM) or rootKey. */
|
||||
export async function resolveContactBlockchainAddress(login, endpoint) {
|
||||
const cleanLogin = String(login || '').trim();
|
||||
if (!cleanLogin) throw new Error('Не указан получатель');
|
||||
try {
|
||||
const pda = await readShineUserPda({ login: cleanLogin, solanaEndpoint: endpoint });
|
||||
const latest = pda?.forks?.at(-1)?.blockchainKey;
|
||||
if (latest?.length === 32) return bytesToBase58(latest);
|
||||
} catch { /* A Free account may not have a paid Solana PDA. */ }
|
||||
const user = await authService.getUser(cleanLogin);
|
||||
if (!user?.exists || !user.blockchainKey) throw new Error('Не удалось получить blockchainKey получателя');
|
||||
return solanaAddressFromPublicKeyBase64(user.blockchainKey);
|
||||
}
|
||||
|
||||
export function render({ navigate, chrome, route }) {
|
||||
const recipientFromRoute = String(route?.params?.recipientLogin || '').trim();
|
||||
const backTarget = recipientFromRoute ? `chat/${encodeURIComponent(recipientFromRoute)}` : 'wallet';
|
||||
chrome?.setTopbar(createTopBar({
|
||||
title: t('wallet_multi.transfer_title'),
|
||||
back: { label: '←', onClick: () => navigate(backTarget) },
|
||||
}));
|
||||
const screen = document.createElement('section');
|
||||
screen.className = 'stack wallet-transfer-screen';
|
||||
const card = document.createElement('div');
|
||||
card.className = 'card stack wallet-transfer-card';
|
||||
card.innerHTML = `
|
||||
<h2 class="wallet-transfer-heading"></h2>
|
||||
<div class="wallet-transfer-balances">
|
||||
<div class="wallet-transfer-balance"><span>SOL</span><strong data-balance-sol>—</strong></div>
|
||||
<div class="wallet-transfer-balance"><span data-usdt-name>USDT</span><strong data-balance-usdt>—</strong></div>
|
||||
</div>
|
||||
<label class="wallet-transfer-field"><span data-currency-label></span><select class="input wallet-transfer-select" data-currency><option value="SOL">SOL</option><option value="USDT">USDT</option></select></label>
|
||||
<label class="wallet-transfer-field"><span data-amount-label></span><input class="input" data-amount type="text" inputmode="decimal" autocomplete="off" placeholder="0.01" /></label>
|
||||
<div class="wallet-transfer-selected" data-selected hidden></div>
|
||||
<label class="wallet-transfer-field"><span data-recipient-label></span><input class="input" data-recipient type="text" spellcheck="false" autocomplete="off" placeholder="Solana address (Base58)" /></label>
|
||||
<label class="wallet-transfer-notice" data-notify-row hidden><input type="checkbox" data-notify /><span data-notify-label></span></label>
|
||||
<p class="meta-muted wallet-transfer-hint" data-hint></p>
|
||||
<button type="button" class="primary-btn wallet-transfer-submit" data-send></button>
|
||||
<p class="meta-muted wallet-transfer-status" data-status role="status" aria-live="polite"></p>
|
||||
`;
|
||||
const q = (selector) => card.querySelector(`[data-${selector}]`);
|
||||
q('currency-label').textContent = t('wallet_multi.asset');
|
||||
q('amount-label').textContent = t('wallet_multi.amount');
|
||||
q('recipient-label').textContent = t('wallet_multi.recipient');
|
||||
q('notify-label').textContent = t('wallet_multi.notify');
|
||||
q('notify-row').hidden = !recipientFromRoute;
|
||||
q('send').textContent = t('wallet_multi.send');
|
||||
q('hint').textContent = t('wallet_multi.no_stars');
|
||||
q('selected').textContent = '';
|
||||
card.querySelector('.wallet-transfer-heading').textContent = t('wallet_multi.transfer_title');
|
||||
screen.append(card);
|
||||
let disposed = false;
|
||||
let busy = false;
|
||||
// A chat-bound transfer has exactly one recipient; the wallet flow accepts only an address.
|
||||
const recipientLogin = recipientFromRoute;
|
||||
let selectedAddress = '';
|
||||
let resolvingRecipient = Boolean(recipientLogin);
|
||||
let address = '';
|
||||
let usdt = { available: false, atomic: 0n, asset: getUsdtAsset() };
|
||||
const endpoint = state.entrySettings.solanaServer;
|
||||
const setStatus = (value) => { if (!disposed) q('status').textContent = value; };
|
||||
const setBusy = (value) => {
|
||||
busy = value;
|
||||
q('currency').disabled = value;
|
||||
q('amount').disabled = value;
|
||||
q('recipient').disabled = value;
|
||||
q('notify').disabled = value;
|
||||
q('send').disabled = value || resolvingRecipient || (Boolean(recipientLogin) && !selectedAddress) || q('send').dataset.completed === 'true';
|
||||
};
|
||||
if (recipientLogin) {
|
||||
q('selected').hidden = false;
|
||||
q('selected').textContent = `${t('wallet_multi.contact')}: ${recipientLogin}`;
|
||||
q('recipient').readOnly = true;
|
||||
q('recipient').value = t('wallet_multi.resolving');
|
||||
q('send').disabled = true;
|
||||
void resolveContactBlockchainAddress(recipientLogin, endpoint)
|
||||
.then((resolved) => {
|
||||
if (disposed) return;
|
||||
selectedAddress = resolved;
|
||||
q('recipient').value = resolved;
|
||||
setStatus('');
|
||||
})
|
||||
.catch((error) => {
|
||||
if (disposed) return;
|
||||
q('recipient').value = '';
|
||||
setStatus(error.message || String(error));
|
||||
})
|
||||
.finally(() => {
|
||||
if (disposed) return;
|
||||
resolvingRecipient = false;
|
||||
q('send').disabled = busy || !selectedAddress;
|
||||
});
|
||||
}
|
||||
|
||||
const refreshBalances = async () => {
|
||||
try {
|
||||
const wallet = await getWalletFromStoredBlockchainKey({
|
||||
login: state.session.login, storagePwd: state.session.storagePwdInMemory,
|
||||
});
|
||||
if (disposed) return;
|
||||
address = wallet.address;
|
||||
const [sol, usdtResult] = await Promise.allSettled([
|
||||
getBalanceSol({ endpoint, address }), getUsdtBalance({ endpoint, address }),
|
||||
]);
|
||||
if (disposed) return;
|
||||
if (sol.status === 'fulfilled') q('balance-sol').textContent = `${sol.value.sol.toFixed(6)} SOL`;
|
||||
if (usdtResult.status === 'fulfilled') {
|
||||
usdt = usdtResult.value;
|
||||
q('balance-usdt').textContent = usdt.available ? `${usdt.text} ${usdt.asset.label}` : t('wallet_multi.test_mint_missing');
|
||||
} else q('balance-usdt').textContent = t('wallet_multi.balance_unavailable');
|
||||
q('usdt-name').textContent = usdt.asset.label;
|
||||
if (!usdt.available) q('currency').querySelector('option[value="USDT"]').disabled = true;
|
||||
q('hint').textContent = usdt.asset.test ? `${t('wallet_multi.no_stars')} ${t('wallet_multi.devnet_disclaimer')}` : t('wallet_multi.no_stars');
|
||||
} catch (error) { setStatus(error.message || String(error)); }
|
||||
};
|
||||
void refreshBalances();
|
||||
|
||||
q('send').addEventListener('click', async () => {
|
||||
if (busy || disposed) return;
|
||||
const currency = q('currency').value;
|
||||
const amountText = q('amount').value;
|
||||
const messageWanted = q('notify').checked;
|
||||
let toAddress = String(q('recipient').value || '').trim();
|
||||
let atomic;
|
||||
try {
|
||||
atomic = toAtomicAmount(amountText, currency === 'SOL' ? 9 : 6);
|
||||
if (!state.session.login || !state.session.storagePwdInMemory) throw new Error('Не найдена авторизованная сессия SHiNE');
|
||||
if (currency === 'SOL' && atomic > BigInt(Number.MAX_SAFE_INTEGER)) throw new Error('Сумма SOL слишком большая');
|
||||
if (recipientLogin) {
|
||||
if (!selectedAddress || resolvingRecipient) throw new Error('Адрес получателя ещё не получен');
|
||||
// Refresh the binding at signing time, protect against stale/rotated blockchain keys.
|
||||
toAddress = await resolveContactBlockchainAddress(recipientLogin, endpoint);
|
||||
if (selectedAddress && toAddress !== selectedAddress) {
|
||||
q('recipient').value = toAddress;
|
||||
selectedAddress = toAddress;
|
||||
throw new Error('Блокчейн-ключ получателя изменился. Проверьте новый адрес и повторите отправку.');
|
||||
}
|
||||
}
|
||||
const solana = await loadSolanaWeb3();
|
||||
const target = new solana.PublicKey(toAddress).toBase58();
|
||||
if (address && target === address) throw new Error('Нельзя переводить самому себе');
|
||||
// A wallet-to-wallet payment must never be sent to a mint, token account or executable program.
|
||||
if (!solana.PublicKey.isOnCurve(new solana.PublicKey(target).toBytes())) {
|
||||
throw new Error('Получатель должен быть обычным кошельком Solana (не PDA программы)');
|
||||
}
|
||||
const recipientInfo = await new solana.Connection(endpoint, 'confirmed').getAccountInfo(new solana.PublicKey(target), 'confirmed');
|
||||
if (recipientInfo && (recipientInfo.executable || !recipientInfo.owner.equals(solana.SystemProgram.programId))) {
|
||||
throw new Error('Адрес получателя не является обычным кошельком Solana');
|
||||
}
|
||||
if (currency === 'USDT' && !usdt.available) throw new Error('USDT в этой сети не настроен');
|
||||
const display = `${formatAtomicAmount(atomic, currency === 'SOL' ? 9 : 6)} ${currency === 'SOL' ? 'SOL' : usdt.asset.label}`;
|
||||
const contactLabel = recipientLogin ? `${recipientLogin}\n${target}` : target;
|
||||
if (!window.confirm(`${t('wallet_multi.confirm')}\n${display}\n${contactLabel}`)) return;
|
||||
setBusy(true);
|
||||
setStatus(t('wallet_multi.sending'));
|
||||
const wallet = await getWalletFromStoredBlockchainKey({ login: state.session.login, storagePwd: state.session.storagePwdInMemory });
|
||||
if (wallet.address === target) throw new Error('Нельзя переводить самому себе');
|
||||
const result = currency === 'SOL'
|
||||
? await transferSolLamports({ endpoint, fromKeypair: wallet.keypair, toAddress: target, amountLamports: atomic })
|
||||
: await transferUsdt({ endpoint, fromKeypair: wallet.keypair, toAddress: target, amountAtomic: atomic });
|
||||
// The transfer is confirmed even if the user navigated away. Send requested DM anyway.
|
||||
if (!disposed) {
|
||||
setStatus(`${t('wallet_multi.success')}\n${result.signature}`);
|
||||
q('send').textContent = t('wallet_multi.sent');
|
||||
q('send').dataset.completed = 'true';
|
||||
}
|
||||
if (messageWanted && recipientLogin) {
|
||||
try {
|
||||
await authService.sendDirectMessage({
|
||||
login: state.session.login, toLogin: recipientLogin,
|
||||
storagePwd: state.session.storagePwdInMemory,
|
||||
text: `${t('wallet_multi.dm_prefix')} ${display}\n${t('wallet_multi.dm_signature')}: ${result.signature}`,
|
||||
});
|
||||
if (!disposed) setStatus(`${t('wallet_multi.success')}\n${result.signature}\n${t('wallet_multi.notice_sent')}`);
|
||||
} catch (error) {
|
||||
if (!disposed) setStatus(`${t('wallet_multi.success')}\n${result.signature}\n${t('wallet_multi.notice_failed')}: ${error.message || error}`);
|
||||
}
|
||||
}
|
||||
// Prevent accidental re-send on the success screen; user must navigate away to make another transfer.
|
||||
if (!disposed) {
|
||||
q('send').disabled = true;
|
||||
q('send').dataset.completed = 'true';
|
||||
void refreshBalances();
|
||||
}
|
||||
} catch (error) {
|
||||
const message = error?.message || String(error);
|
||||
if (/timed out|timeout|expired|confirmation/i.test(message)) {
|
||||
// RPC timeout is not evidence that funds were not moved. Avoid duplicate send.
|
||||
setStatus(`${t('wallet_multi.uncertain')}\n${message}`);
|
||||
q('send').dataset.completed = 'true';
|
||||
} else setStatus(message);
|
||||
} finally {
|
||||
if (!disposed) {
|
||||
setBusy(false);
|
||||
if (q('send').dataset.completed === 'true') q('send').disabled = true;
|
||||
}
|
||||
}
|
||||
});
|
||||
screen.cleanup = () => { disposed = true; };
|
||||
return screen;
|
||||
}
|
||||
@@ -8,7 +8,6 @@ import {
|
||||
formatSol,
|
||||
getBalanceSol,
|
||||
getWalletFromStoredBlockchainKey,
|
||||
transferSol,
|
||||
} from '../services/solana-wallet-service.js';
|
||||
import {
|
||||
formatAr,
|
||||
@@ -18,6 +17,7 @@ import {
|
||||
} from '../services/arweave-wallet-service.js';
|
||||
import { loadEncryptedUserSecrets } from '../services/key-vault.js';
|
||||
import { loadSolanaWeb3 } from '../vendor/solana-web3-loader.js';
|
||||
import { getUsdtBalance, getUsdtAsset } from '../services/solana-usdt-service.js';
|
||||
import { openArweaveAttachmentManager } from '../components/arweave-attachment-manager.js';
|
||||
import { buildArweaveDataUrl, sha256HexFromArrayBuffer } from '../services/arweave-file-service.js';
|
||||
import {
|
||||
@@ -1848,7 +1848,12 @@ export function render({navigate, chrome}) {
|
||||
const endpointLabel = document.createElement('p');
|
||||
endpointLabel.className = 'meta-muted';
|
||||
endpointLabel.textContent = `RPC: ${state.entrySettings.solanaServer}`;
|
||||
balanceWrap.append(balanceLabel, balanceValue, updatedLabel, endpointLabel);
|
||||
const usdtLine = document.createElement('div');
|
||||
usdtLine.className = 'wallet-multi-usdt-line';
|
||||
const usdtAsset = getUsdtAsset();
|
||||
usdtLine.innerHTML = `<span></span><strong>—</strong>`;
|
||||
usdtLine.querySelector('span').textContent = usdtAsset.label;
|
||||
balanceWrap.append(balanceLabel, balanceValue, usdtLine, updatedLabel, endpointLabel);
|
||||
|
||||
const addressCard = document.createElement('div');
|
||||
addressCard.className = 'card';
|
||||
@@ -1858,6 +1863,10 @@ export function render({navigate, chrome}) {
|
||||
<p style="font-size:13px; line-height:1.4; word-break:break-all;" id="wallet-address-value">—</p>
|
||||
`;
|
||||
const addressEl = addressCard.querySelector('#wallet-address-value');
|
||||
const receiveHint = document.createElement('p');
|
||||
receiveHint.className = 'meta-muted';
|
||||
receiveHint.textContent = t('wallet_multi.receive_hint');
|
||||
addressCard.append(receiveHint);
|
||||
enableAddressCopy(addressEl, () => walletAddress);
|
||||
|
||||
card.append(balanceWrap, addressCard);
|
||||
@@ -1867,7 +1876,7 @@ export function render({navigate, chrome}) {
|
||||
actions.innerHTML = `
|
||||
<div class="row">
|
||||
<button class="primary-btn" id="refresh-balance" style="flex:1;">${th('screens.wallet_view.text_293')}</button>
|
||||
<button class="primary-btn" id="send-sol" style="flex:1;">${th('screens.wallet_view.text_294')}</button>
|
||||
<button class="primary-btn" id="send-sol" style="flex:1;">${t('wallet_multi.transfer_title')}</button>
|
||||
</div>
|
||||
`;
|
||||
|
||||
@@ -1887,9 +1896,18 @@ export function render({navigate, chrome}) {
|
||||
});
|
||||
if (modeToken !== activeModeToken) return;
|
||||
balanceValue.textContent = `${formatSol(balance.sol, 6)} SOL`;
|
||||
let tokenErrorText = '';
|
||||
try {
|
||||
const token = await getUsdtBalance({ endpoint: state.entrySettings.solanaServer, address: walletAddress });
|
||||
if (modeToken !== activeModeToken) return;
|
||||
usdtLine.querySelector('strong').textContent = token.available ? token.text : t('wallet_multi.test_mint_missing');
|
||||
} catch (tokenError) {
|
||||
usdtLine.querySelector('strong').textContent = t('wallet_multi.balance_unavailable');
|
||||
tokenErrorText = `${t('wallet_multi.balance_unavailable')}: ${tokenError.message || tokenError}`;
|
||||
}
|
||||
updatedLabel.textContent = t('screens.wallet_view.text_181', { value1: nowRu() });
|
||||
endpointLabel.textContent = `RPC: ${balance.endpoint}`;
|
||||
setStatus(t('screens.wallet_view.text_085'));
|
||||
setStatus(tokenErrorText || t('screens.wallet_view.text_085'));
|
||||
} catch (error) {
|
||||
if (modeToken !== activeModeToken) return;
|
||||
setStatus(actionErrorText(t('screens.wallet_view.text_086'), error));
|
||||
@@ -1902,34 +1920,17 @@ export function render({navigate, chrome}) {
|
||||
void refreshBalance();
|
||||
});
|
||||
|
||||
sendBtn.addEventListener('click', async () => {
|
||||
if (!walletCtx?.keypair) {
|
||||
setStatus(t('screens.wallet_view.text_087'));
|
||||
return;
|
||||
}
|
||||
const toAddress = window.prompt(t('dialogs.pages.wallet_view.prompt_002'), '');
|
||||
if (!toAddress) return;
|
||||
const amountRaw = window.prompt(t('dialogs.pages.wallet_view.prompt_003'), '0.01');
|
||||
if (!amountRaw) return;
|
||||
sendBtn.addEventListener('click', () => navigate('wallet/transfer'));
|
||||
|
||||
sendBtn.disabled = true;
|
||||
try {
|
||||
const tx = await transferSol({
|
||||
endpoint: state.entrySettings.solanaServer,
|
||||
fromKeypair: walletCtx.keypair,
|
||||
toAddress,
|
||||
amountSol: Number(String(amountRaw || '').replace(',', '.')),
|
||||
});
|
||||
if (modeToken !== activeModeToken) return;
|
||||
setStatus(t('screens.wallet_view.text_182', { value1: tx.signature }));
|
||||
await refreshBalance();
|
||||
} catch (error) {
|
||||
if (modeToken !== activeModeToken) return;
|
||||
setStatus(actionErrorText(t('screens.wallet_view.text_088'), error));
|
||||
} finally {
|
||||
sendBtn.disabled = false;
|
||||
}
|
||||
});
|
||||
const swapHint = document.createElement('p');
|
||||
swapHint.className = 'meta-muted wallet-jupiter-hint';
|
||||
swapHint.textContent = t('wallet_swap.wallet_hint');
|
||||
const swapButton = document.createElement('button');
|
||||
swapButton.type = 'button';
|
||||
swapButton.className = 'secondary-btn wallet-jupiter-link';
|
||||
swapButton.textContent = t('wallet_swap.wallet_button');
|
||||
swapButton.addEventListener('click', () => navigate('wallet/swap'));
|
||||
actions.append(swapButton, swapHint);
|
||||
|
||||
content.append(backBtn, card, actions);
|
||||
setStatus(t('screens.wallet_view.text_089'));
|
||||
@@ -1986,6 +1987,10 @@ export function render({navigate, chrome}) {
|
||||
<p style="font-size:13px; line-height:1.4; word-break:break-all;" id="wallet-address-value">–</p>
|
||||
`;
|
||||
const addressEl = addressCard.querySelector('#wallet-address-value');
|
||||
const receiveHint = document.createElement('p');
|
||||
receiveHint.className = 'meta-muted';
|
||||
receiveHint.textContent = t('wallet_multi.receive_hint');
|
||||
addressCard.append(receiveHint);
|
||||
enableAddressCopy(addressEl, () => walletAddress);
|
||||
|
||||
const helpCard = document.createElement('details');
|
||||
|
||||
@@ -57,6 +57,8 @@ const PRETTY_PATHS = new Map([
|
||||
['solana-users-init-view', 'settings/solana-users-init'],
|
||||
['solana-rpc-check-view', 'settings/solana-rpc-check'],
|
||||
['wallet-view', 'wallet'],
|
||||
['wallet-transfer-view', 'wallet/transfer'],
|
||||
['wallet-swap-view', 'wallet/swap'],
|
||||
['queue', 'quene'],
|
||||
['device-view', 'devices'],
|
||||
['device-session-view', 'devices'],
|
||||
@@ -380,6 +382,12 @@ export function parseRouteFromPath(pathname = '') {
|
||||
}
|
||||
|
||||
if (pageId === 'wallet') {
|
||||
if (decodePart(segments[1] || '').toLowerCase() === 'swap') {
|
||||
return { pageId: 'wallet-swap-view', params: {} };
|
||||
}
|
||||
if (decodePart(segments[1] || '').toLowerCase() === 'transfer') {
|
||||
return { pageId: 'wallet-transfer-view', params: { recipientLogin: decodePart(segments[2] || '') } };
|
||||
}
|
||||
return { pageId: 'wallet-view', params: {} };
|
||||
}
|
||||
|
||||
@@ -593,6 +601,8 @@ function resolveToolbarTab(pageId) {
|
||||
pageId === 'profile-edit-view' ||
|
||||
pageId === 'profiles-view' ||
|
||||
pageId === 'wallet-view' ||
|
||||
pageId === 'wallet-transfer-view' ||
|
||||
pageId === 'wallet-swap-view' ||
|
||||
pageId === 'settings-view' ||
|
||||
pageId === 'registration-upgrade-view' ||
|
||||
pageId === 'access-keys-view' ||
|
||||
|
||||
@@ -0,0 +1,324 @@
|
||||
/** Jupiter Swap API V2: beta, SOL <-> canonical USDT Mainnet only.
|
||||
* No third-party script or private-key transmission. Jupiter supplies *instructions*;
|
||||
* SHiNE validates and compiles them, signs locally, and sends via its current Solana RPC.
|
||||
* This is not a security audit. Unknown instruction shapes are rejected (fail closed).
|
||||
*/
|
||||
import { getSolanaCluster, confirmSolanaTransactionHttp } from './solana-rpc-gateway.js';
|
||||
import { loadSolanaWeb3 } from '../vendor/solana-web3-loader.js';
|
||||
import { associatedTokenAddress, USDT_MAINNET_MINT, TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, toAtomicAmount, formatAtomicAmount } from './solana-usdt-service.js';
|
||||
import { bytesToBase58 } from './crypto-utils.js';
|
||||
|
||||
export const JUPITER_API_BASE = 'https://api.jup.ag/swap/v2';
|
||||
export const WSOL_MINT = 'So11111111111111111111111111111111111111112';
|
||||
export const JUPITER_ROUTER_PROGRAM = 'JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4';
|
||||
export const SWAP_SLIPPAGE_BPS = 50; // Max slippage: 0.5%
|
||||
export const SWAP_BETA_MAX_SOL_LAMPORTS = 20_000_000n; // 0.02 SOL
|
||||
export const SWAP_BETA_MAX_USDT_ATOMIC = 5_000_000n; // 5 USDT
|
||||
const MAX_CU_PRICE = 50_000n; // micro-lamports per compute unit
|
||||
const MAX_CU = 1_400_000;
|
||||
const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
|
||||
const COMPUTE_PROGRAM_ID = 'ComputeBudget111111111111111111111111111111';
|
||||
const REQUEST_TIMEOUT_MS = 15_000;
|
||||
|
||||
function assertMainnet() {
|
||||
if (getSolanaCluster() !== 'mainnet-beta') throw new Error('Jupiter работает только в Solana Mainnet. Обмен на Devnet отключён.');
|
||||
}
|
||||
export function swapPair(inputCurrency) {
|
||||
if (inputCurrency === 'SOL') return {
|
||||
inputCurrency: 'SOL', outputCurrency: 'USDT', inputMint: WSOL_MINT, outputMint: USDT_MAINNET_MINT,
|
||||
inputDecimals: 9, outputDecimals: 6, maxInput: SWAP_BETA_MAX_SOL_LAMPORTS,
|
||||
};
|
||||
if (inputCurrency === 'USDT') return {
|
||||
inputCurrency: 'USDT', outputCurrency: 'SOL', inputMint: USDT_MAINNET_MINT, outputMint: WSOL_MINT,
|
||||
inputDecimals: 6, outputDecimals: 9, maxInput: SWAP_BETA_MAX_USDT_ATOMIC,
|
||||
};
|
||||
throw new Error('Для тестового обмена доступны только SOL и USDT');
|
||||
}
|
||||
|
||||
export function validateSwapInput(currency, text, balances = {}) {
|
||||
const pair = swapPair(currency);
|
||||
const amount = toAtomicAmount(text, pair.inputDecimals);
|
||||
if (amount > pair.maxInput) throw new Error(`Бета-лимит за один обмен: ${formatAtomicAmount(pair.maxInput, pair.inputDecimals)} ${currency}`);
|
||||
const available = currency === 'SOL' ? balances.solLamports : balances.usdtAtomic;
|
||||
if (available != null && amount > BigInt(available)) throw new Error(`Недостаточно ${currency}`);
|
||||
// Even USDT -> SOL requires a little SOL for tx fees and ATA rent.
|
||||
if (balances.solLamports != null && BigInt(balances.solLamports) < amount * (currency === 'SOL' ? 1n : 0n) + 10_000_000n) {
|
||||
throw new Error('Оставьте не менее 0,01 SOL для сетевых комиссий и создания токеновых счетов');
|
||||
}
|
||||
return { pair, amount };
|
||||
}
|
||||
|
||||
async function fetchJson(url) {
|
||||
const controller = new AbortController();
|
||||
const timer = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
|
||||
try {
|
||||
const response = await fetch(url, { method: 'GET', signal: controller.signal, headers: { Accept: 'application/json' }, cache: 'no-store' });
|
||||
if (!response.ok) throw new Error(`Jupiter API: HTTP ${response.status}. ${response.status === 429 ? 'Превышен лимит запросов, попробуйте позже.' : 'Котировка недоступна.'}`);
|
||||
return await response.json();
|
||||
} catch (e) {
|
||||
if (e?.name === 'AbortError') throw new Error('Jupiter не ответил вовремя');
|
||||
throw e;
|
||||
} finally { clearTimeout(timer); }
|
||||
}
|
||||
|
||||
/** Fetch real Metis instructions (not an opaque transaction) and verify the quoted amounts. */
|
||||
export async function requestSwapBuild({ inputCurrency, amountAtomic, walletAddress }) {
|
||||
assertMainnet();
|
||||
const pair = swapPair(inputCurrency);
|
||||
const amount = BigInt(amountAtomic);
|
||||
if (amount <= 0n || amount > pair.maxInput) throw new Error('Сумма вне лимита бета-обмена');
|
||||
if (!walletAddress) throw new Error('Кошелёк не выбран');
|
||||
const params = new URLSearchParams({
|
||||
inputMint: pair.inputMint, outputMint: pair.outputMint,
|
||||
amount: amount.toString(), taker: walletAddress,
|
||||
slippageBps: String(SWAP_SLIPPAGE_BPS), wrapAndUnwrapSol: 'true', transactionVersion: '0',
|
||||
});
|
||||
const response = await fetchJson(`${JUPITER_API_BASE}/build?${params}`);
|
||||
validateSwapBuildResponse(response, pair, amount);
|
||||
return { pair, amount, response, fetchedAt: Date.now() };
|
||||
}
|
||||
|
||||
function readAtomic(value) {
|
||||
if (!/^(0|[1-9]\d*)$/.test(String(value))) throw new Error('Jupiter вернул некорректную целочисленную сумму');
|
||||
return BigInt(value);
|
||||
}
|
||||
export function validateSwapBuildResponse(build, pair, amountAtomic) {
|
||||
if (!build || typeof build !== 'object' ||
|
||||
build.inputMint !== pair.inputMint || build.outputMint !== pair.outputMint ||
|
||||
readAtomic(build.inAmount) !== BigInt(amountAtomic) ||
|
||||
build.swapMode !== 'ExactIn' || !Number.isInteger(build.slippageBps) ||
|
||||
build.slippageBps < 0 || build.slippageBps > SWAP_SLIPPAGE_BPS ||
|
||||
!Array.isArray(build.routePlan) || !build.routePlan.length ||
|
||||
!build.swapInstruction || build.transactionVersion != null && String(build.transactionVersion) !== '0') {
|
||||
throw new Error('Jupiter вернул неожиданные параметры обмена');
|
||||
}
|
||||
const expected = readAtomic(build.outAmount);
|
||||
const minimum = readAtomic(build.otherAmountThreshold);
|
||||
if (expected <= 0n || minimum <= 0n || minimum > expected ||
|
||||
minimum < expected * BigInt(10_000 - SWAP_SLIPPAGE_BPS) / 10_000n) {
|
||||
throw new Error('Jupiter вернул недопустимый минимум получения');
|
||||
}
|
||||
// Protect against extra fees, additional instructions, and unexpected router contracts.
|
||||
if ((build.otherInstructions?.length || 0) !== 0 || build.tipInstruction ||
|
||||
build.swapInstruction.programId !== JUPITER_ROUTER_PROGRAM) {
|
||||
throw new Error('Неподдерживаемый маршрут Jupiter: дополнительные инструкции или другая программа');
|
||||
}
|
||||
return { expected, minimum };
|
||||
}
|
||||
|
||||
function fromBase64(encoded) {
|
||||
if (typeof encoded !== 'string' || !/^[A-Za-z0-9+/]*={0,2}$/.test(encoded)) throw new Error('Неверные данные инструкции Jupiter');
|
||||
const binary = atob(encoded);
|
||||
return Uint8Array.from(binary, (c) => c.charCodeAt(0));
|
||||
}
|
||||
function accountStrings(ix) { return ix.accounts.map((a) => String(a.pubkey)); }
|
||||
function validateIxShape(ix, walletAddress) {
|
||||
if (!ix || typeof ix.programId !== 'string' || !Array.isArray(ix.accounts) || typeof ix.data !== 'string') throw new Error('Некорректная инструкция Jupiter');
|
||||
if (ix.accounts.length > 64) throw new Error('Слишком много аккаунтов в инструкции Jupiter');
|
||||
for (const a of ix.accounts) {
|
||||
if (!a || typeof a.pubkey !== 'string' || typeof a.isSigner !== 'boolean' || typeof a.isWritable !== 'boolean') throw new Error('Некорректный аккаунт инструкции');
|
||||
if (a.isSigner && a.pubkey !== walletAddress) throw new Error('Jupiter требует неизвестного подписанта');
|
||||
}
|
||||
}
|
||||
function checkedIx(apiIx, walletAddress, solana) {
|
||||
validateIxShape(apiIx, walletAddress);
|
||||
return new solana.TransactionInstruction({
|
||||
programId: new solana.PublicKey(apiIx.programId),
|
||||
keys: apiIx.accounts.map((a) => ({ pubkey: new solana.PublicKey(a.pubkey), isSigner: a.isSigner, isWritable: a.isWritable })),
|
||||
data: fromBase64(apiIx.data),
|
||||
});
|
||||
}
|
||||
function u64le(bytes, from = 1) {
|
||||
if (bytes.length < from + 8) throw new Error('Неожиданная длина инструкции');
|
||||
let value = 0n;
|
||||
for (let i = 0; i < 8; i++) value |= BigInt(bytes[from + i]) << (BigInt(i) * 8n);
|
||||
return value;
|
||||
}
|
||||
|
||||
/** The instructions are *untrusted*. Only safe setup/cleanup for the user's USDT/WSOL ATAs. */
|
||||
export function validateSwapInstructions(build, pair, amountAtomic, walletAddress, solana) {
|
||||
const token = TOKEN_PROGRAM_ID;
|
||||
const wsolAta = associatedTokenAddress(solana, walletAddress, WSOL_MINT).toBase58();
|
||||
const usdtAta = associatedTokenAddress(solana, walletAddress, USDT_MAINNET_MINT).toBase58();
|
||||
const permittedAtas = new Set([wsolAta, usdtAta]);
|
||||
const setup = Array.isArray(build.setupInstructions) ? build.setupInstructions : [];
|
||||
const cleanup = build.cleanupInstruction ? [build.cleanupInstruction] : [];
|
||||
if (setup.length > 8 || cleanup.length > 1 || (build.computeBudgetInstructions || []).length > 4) throw new Error('Слишком много инструкций Jupiter');
|
||||
let wrappedLamports = 0n;
|
||||
const checked = (ix) => {
|
||||
const validated = checkedIx(ix, walletAddress, solana);
|
||||
const bytes = validated.data;
|
||||
const ac = accountStrings(ix);
|
||||
if (ix.programId === ASSOCIATED_TOKEN_PROGRAM_ID) {
|
||||
if (![0, 1].includes(bytes[0]) || bytes.length > 1 || ac.length < 6 ||
|
||||
ac[0] !== walletAddress || ac[2] !== walletAddress ||
|
||||
!permittedAtas.has(ac[1]) ||
|
||||
(ac[3] === WSOL_MINT ? ac[1] !== wsolAta : ac[3] !== USDT_MAINNET_MINT || ac[1] !== usdtAta) ||
|
||||
ac[5] !== token) throw new Error('Jupiter пытается создать посторонний токеновый счёт');
|
||||
} else if (ix.programId === SYSTEM_PROGRAM_ID) {
|
||||
// Only wrapping SOL into the user's canonical WSOL ATA is allowed.
|
||||
if (bytes.length !== 12 || new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength).getUint32(0, true) !== 2 ||
|
||||
ac[0] !== walletAddress || ac[1] !== wsolAta) throw new Error('Недопустимый системный перевод Jupiter');
|
||||
wrappedLamports += u64le(bytes, 4);
|
||||
if (pair.inputCurrency !== 'SOL' || wrappedLamports > BigInt(amountAtomic)) throw new Error('Jupiter запрашивает лишние SOL');
|
||||
} else if (ix.programId === token) {
|
||||
if (bytes[0] === 17) { // SyncNative
|
||||
if (bytes.length !== 1 || ac[0] !== wsolAta) throw new Error('Jupiter синхронизирует чужой WSOL');
|
||||
} else if (bytes[0] === 9) { // CloseAccount
|
||||
if (bytes.length !== 1 || ac[0] !== wsolAta || ac[1] !== walletAddress || ac[2] !== walletAddress) throw new Error('Jupiter закрывает чужой токеновый счёт');
|
||||
} else throw new Error('Небезопасная операция SPL в Jupiter');
|
||||
} else throw new Error(`Недопустимая программа в Jupiter: ${ix.programId}`);
|
||||
return validated;
|
||||
};
|
||||
const setupIxs = setup.map(checked);
|
||||
const cleanupIxs = cleanup.map(checked);
|
||||
const swapIx = checkedIx(build.swapInstruction, walletAddress, solana);
|
||||
if (swapIx.programId.toBase58() !== JUPITER_ROUTER_PROGRAM ||
|
||||
!build.swapInstruction.accounts.some((a) => a.pubkey === walletAddress && a.isSigner)) {
|
||||
throw new Error('Jupiter не использует ожидаемый on-chain router');
|
||||
}
|
||||
return { setupIxs, swapIx, cleanupIxs };
|
||||
}
|
||||
|
||||
async function verifiedLookupTables(conn, build, solana) {
|
||||
const tables = build.addressesByLookupTableAddress || {};
|
||||
const items = Object.entries(tables);
|
||||
if (items.length > 4) throw new Error('Слишком много таблиц адресов в Jupiter');
|
||||
const result = [];
|
||||
for (const [address, expected] of items) {
|
||||
if (!Array.isArray(expected) || expected.length > 256) throw new Error('Некорректная таблица Jupiter');
|
||||
const key = new solana.PublicKey(address);
|
||||
const account = await conn.getAccountInfo(key, 'confirmed');
|
||||
if (!account || !account.owner.equals(solana.AddressLookupTableProgram.programId)) throw new Error('Таблица адресов Jupiter отсутствует в Solana');
|
||||
const parsed = solana.AddressLookupTableAccount.deserialize(account.data);
|
||||
const actual = parsed.addresses.map((x) => x.toBase58());
|
||||
// Never trust a list of addresses given by Jupiter without checking on-chain data.
|
||||
if (JSON.stringify(actual) !== JSON.stringify(expected)) throw new Error('Таблица адресов Jupiter не соответствует Solana');
|
||||
if (parsed.deactivationSlot !== 18_446_744_073_709_551_615n) throw new Error('Таблица адресов Jupiter отключена');
|
||||
result.push(new solana.AddressLookupTableAccount({ key, state: parsed }));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/** SPL Token account data: mint(32), owner(32), amount(u64 LE); fail closed. */
|
||||
function parseUsdtTokenAccount(data, walletAddress) {
|
||||
if (!data) return 0n;
|
||||
const bytes = data instanceof Uint8Array ? data : new Uint8Array(data);
|
||||
if (bytes.length < 72 || bytesToBase58(bytes.subarray(0, 32)) !== USDT_MAINNET_MINT ||
|
||||
bytesToBase58(bytes.subarray(32, 64)) !== walletAddress) {
|
||||
throw new Error('В симуляции обнаружен посторонний токеновый счёт');
|
||||
}
|
||||
return u64le(bytes, 64);
|
||||
}
|
||||
|
||||
function limitedComputeBudget(build, solana, walletAddress) {
|
||||
let price = 0n;
|
||||
for (const raw of build.computeBudgetInstructions || []) {
|
||||
const ix = checkedIx(raw, walletAddress, solana);
|
||||
if (ix.programId.toBase58() !== COMPUTE_PROGRAM_ID || ix.data.length !== 9 || ix.data[0] !== 3) {
|
||||
throw new Error('Неожиданная настройка комиссии Jupiter');
|
||||
}
|
||||
const candidate = u64le(ix.data);
|
||||
if (candidate > price) price = candidate;
|
||||
}
|
||||
price = price > MAX_CU_PRICE ? MAX_CU_PRICE : price;
|
||||
return solana.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: Number(price) });
|
||||
}
|
||||
|
||||
export async function buildVerifiedSwapTransaction({ endpoint, walletAddress, build, pair, amountAtomic }) {
|
||||
assertMainnet();
|
||||
validateSwapBuildResponse(build, pair, amountAtomic);
|
||||
const solana = await loadSolanaWeb3();
|
||||
const conn = new solana.Connection(endpoint, 'confirmed');
|
||||
const { setupIxs, swapIx, cleanupIxs } = validateSwapInstructions(build, pair, amountAtomic, walletAddress, solana);
|
||||
const lookups = await verifiedLookupTables(conn, build, solana);
|
||||
const priceIx = limitedComputeBudget(build, solana, walletAddress);
|
||||
const latest = await conn.getLatestBlockhash('confirmed');
|
||||
const buildTx = (units) => new solana.VersionedTransaction(new solana.TransactionMessage({
|
||||
payerKey: new solana.PublicKey(walletAddress), recentBlockhash: latest.blockhash,
|
||||
instructions: [
|
||||
solana.ComputeBudgetProgram.setComputeUnitLimit({ units }), priceIx,
|
||||
...setupIxs, swapIx, ...cleanupIxs,
|
||||
],
|
||||
}).compileToV0Message(lookups));
|
||||
// Snapshot the wallet and canonical USDT ATA before and *after* simulation.
|
||||
// Do not rely exclusively on the untrusted Jupiter JSON quote for the actual spend.
|
||||
const usdtAta = associatedTokenAddress(solana, walletAddress, USDT_MAINNET_MINT);
|
||||
const [beforeSol, beforeUsdtInfo] = await Promise.all([
|
||||
conn.getBalance(new solana.PublicKey(walletAddress), 'confirmed'),
|
||||
conn.getAccountInfo(usdtAta, 'confirmed'),
|
||||
]);
|
||||
if (beforeUsdtInfo && beforeUsdtInfo.owner.toBase58() !== TOKEN_PROGRAM_ID) throw new Error('USDT ATA управляется неизвестной программой');
|
||||
const beforeUsdt = parseUsdtTokenAccount(beforeUsdtInfo?.data, walletAddress);
|
||||
const simulated = await conn.simulateTransaction(buildTx(MAX_CU), {
|
||||
sigVerify: false, replaceRecentBlockhash: true, commitment: 'confirmed',
|
||||
accounts: { encoding: 'base64', addresses: [walletAddress, usdtAta.toBase58()] },
|
||||
});
|
||||
if (simulated?.value?.err) throw new Error(`Обмен не прошёл проверку Solana: ${JSON.stringify(simulated.value.err)}`);
|
||||
if (!simulated?.value || !Array.isArray(simulated.value.accounts) || simulated.value.accounts.length !== 2 || !simulated.value.accounts[0]) {
|
||||
throw new Error('Solana не предоставила итоговые балансы симуляции');
|
||||
}
|
||||
const afterSol = BigInt(simulated.value.accounts[0].lamports);
|
||||
const tokenSnapshot = simulated.value.accounts[1];
|
||||
if (!tokenSnapshot) throw new Error('После симуляции USDT-счёт отсутствует');
|
||||
if (tokenSnapshot.owner !== TOKEN_PROGRAM_ID) throw new Error('После симуляции USDT-счёт управляется неизвестной программой');
|
||||
const afterUsdtBytes = typeof tokenSnapshot.data === 'string' ? fromBase64(tokenSnapshot.data)
|
||||
: Array.isArray(tokenSnapshot.data) ? fromBase64(tokenSnapshot.data[0]) : tokenSnapshot.data;
|
||||
const afterUsdt = parseUsdtTokenAccount(afterUsdtBytes, walletAddress);
|
||||
const minOut = readAtomic(build.otherAmountThreshold);
|
||||
const maxFeeAndRent = 15_000_000n; // 0.015 SOL; actual fees/rent generally much lower.
|
||||
if (pair.inputCurrency === 'SOL') {
|
||||
if (afterUsdt - beforeUsdt < minOut || BigInt(beforeSol) - afterSol > BigInt(amountAtomic) + maxFeeAndRent) {
|
||||
throw new Error('Симуляция показывает неожиданные списания или недостачу USDT');
|
||||
}
|
||||
} else if (beforeUsdt - afterUsdt !== BigInt(amountAtomic) ||
|
||||
afterSol - BigInt(beforeSol) < minOut - maxFeeAndRent) {
|
||||
throw new Error('Симуляция показывает неожиданные списания или недостачу SOL');
|
||||
}
|
||||
const consumed = Number(simulated.value.unitsConsumed);
|
||||
const limit = Number.isFinite(consumed) && consumed > 0 ? Math.min(MAX_CU, Math.max(200_000, Math.ceil(consumed * 1.25))) : MAX_CU;
|
||||
return { transaction: buildTx(limit), conn, latest, solana };
|
||||
}
|
||||
|
||||
/** The caller must have shown the exact quote and obtained explicit user consent before this. */
|
||||
export async function executeJupiterSwap({ endpoint, fromKeypair, prepared }) {
|
||||
assertMainnet();
|
||||
if (!prepared || Date.now() - prepared.fetchedAt > 30_000) throw new Error('Котировка устарела. Получите новую перед подтверждением.');
|
||||
const address = fromKeypair.publicKey.toBase58();
|
||||
const { transaction, conn, latest } = await buildVerifiedSwapTransaction({
|
||||
endpoint, walletAddress: address, build: prepared.response, pair: prepared.pair, amountAtomic: prepared.amount,
|
||||
});
|
||||
// Keys stay inside the running SHiNE client; never passed to Jupiter or SHiNE server.
|
||||
transaction.sign([fromKeypair]);
|
||||
const signature = bytesToBase58(transaction.signatures[0]);
|
||||
let submitted = false;
|
||||
try {
|
||||
// Mark the signed signature before the network call to avoid accidental duplicate swaps on RPC timeouts.
|
||||
if (typeof sessionStorage !== 'undefined') sessionStorage.setItem('shine_swap_beta_pending_signature', signature);
|
||||
submitted = true;
|
||||
await conn.sendRawTransaction(transaction.serialize(), { skipPreflight: false, maxRetries: 0 });
|
||||
await confirmSolanaTransactionHttp(conn, signature, { lastValidBlockHeight: latest.lastValidBlockHeight, timeoutMs: 100_000 });
|
||||
if (typeof sessionStorage !== 'undefined') sessionStorage.removeItem('shine_swap_beta_pending_signature');
|
||||
return { signature };
|
||||
} catch (error) {
|
||||
if (submitted) {
|
||||
const uncertain = new Error(`Статус обмена не подтверждён. Он мог выполниться! Проверьте ${signature} в Solana Explorer, прежде чем повторять. ${error?.message || error}`);
|
||||
uncertain.signature = signature;
|
||||
throw uncertain;
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
export async function getPendingSwapSignature(endpoint) {
|
||||
const signature = typeof sessionStorage === 'undefined' ? '' : String(sessionStorage.getItem('shine_swap_beta_pending_signature') || '');
|
||||
if (!signature) return '';
|
||||
const solana = await loadSolanaWeb3();
|
||||
const conn = new solana.Connection(endpoint, 'confirmed');
|
||||
const status = (await conn.getSignatureStatuses([signature], { searchTransactionHistory: true }))?.value?.[0];
|
||||
if (status?.confirmationStatus === 'confirmed' || status?.confirmationStatus === 'finalized' || status?.err) {
|
||||
sessionStorage.removeItem('shine_swap_beta_pending_signature');
|
||||
return '';
|
||||
}
|
||||
return signature;
|
||||
}
|
||||
@@ -0,0 +1,127 @@
|
||||
/** SPL USDT wallet operations. Only the user's blockchainKey signs; never the DM key. */
|
||||
import { getSolanaCluster, sendAndConfirmSolanaHttp } from './solana-rpc-gateway.js';
|
||||
import { loadSolanaWeb3 } from '../vendor/solana-web3-loader.js';
|
||||
import { devnetTestUsdtMint } from '../deploy-config.js';
|
||||
|
||||
export const USDT_MAINNET_MINT = 'Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB';
|
||||
export const TOKEN_PROGRAM_ID = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
|
||||
export const ASSOCIATED_TOKEN_PROGRAM_ID = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
|
||||
const USDT_DECIMALS = 6;
|
||||
|
||||
/** Devnet has no official circulating USDT. For testing, explicitly supply a 6-decimal SPL mint. */
|
||||
export function getUsdtAsset() {
|
||||
const cluster = getSolanaCluster();
|
||||
if (cluster === 'mainnet-beta') return { mint: USDT_MAINNET_MINT, label: 'USDT', test: false };
|
||||
const mint = cluster === 'devnet' ? String(devnetTestUsdtMint || '').trim() : '';
|
||||
return { mint, label: 'Тестовый USDT', test: true };
|
||||
}
|
||||
|
||||
export function toAtomicAmount(text, decimals = USDT_DECIMALS) {
|
||||
const normalized = String(text ?? '').trim().replace(',', '.');
|
||||
if (!/^(?:0|[1-9]\d*)(?:\.\d+)?$/.test(normalized)) throw new Error('Введите положительную сумму числом');
|
||||
const [whole, fraction = ''] = normalized.split('.');
|
||||
if (fraction.length > decimals) throw new Error(`Допустимо не больше ${decimals} знаков после запятой`);
|
||||
const value = BigInt(whole) * (10n ** BigInt(decimals)) + BigInt(fraction.padEnd(decimals, '0') || '0');
|
||||
if (value <= 0n || value > 18_446_744_073_709_551_615n) throw new Error('Сумма вне допустимого диапазона');
|
||||
return value;
|
||||
}
|
||||
|
||||
export function formatAtomicAmount(amount, decimals = USDT_DECIMALS) {
|
||||
const value = BigInt(amount);
|
||||
const factor = 10n ** BigInt(decimals);
|
||||
const fraction = String(value % factor).padStart(decimals, '0').replace(/0+$/, '');
|
||||
return `${value / factor}${fraction ? `.${fraction}` : ''}`;
|
||||
}
|
||||
|
||||
export function associatedTokenAddress(solana, ownerAddress, mintAddress) {
|
||||
const tokenProgram = new solana.PublicKey(TOKEN_PROGRAM_ID);
|
||||
const owner = new solana.PublicKey(ownerAddress);
|
||||
const mint = new solana.PublicKey(mintAddress);
|
||||
return solana.PublicKey.findProgramAddressSync(
|
||||
[owner.toBuffer(), tokenProgram.toBuffer(), mint.toBuffer()],
|
||||
new solana.PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID),
|
||||
)[0];
|
||||
}
|
||||
|
||||
async function verifyMint(conn, solana, mintAddress) {
|
||||
const info = await conn.getParsedAccountInfo(new solana.PublicKey(mintAddress), 'confirmed');
|
||||
if (!info?.value || info.value.owner.toBase58() !== TOKEN_PROGRAM_ID ||
|
||||
info.value.data?.parsed?.type !== 'mint' ||
|
||||
info.value.data.parsed.info?.decimals !== USDT_DECIMALS) {
|
||||
throw new Error('Токен USDT недоступен в этой сети или имеет неверный формат (нужен SPL с 6 знаками)');
|
||||
}
|
||||
}
|
||||
|
||||
export async function getUsdtBalance({ endpoint, address }) {
|
||||
const asset = getUsdtAsset();
|
||||
if (!asset.mint) return { available: false, atomic: 0n, text: '—', asset };
|
||||
const solana = await loadSolanaWeb3();
|
||||
const conn = new solana.Connection(endpoint, 'confirmed');
|
||||
await verifyMint(conn, solana, asset.mint);
|
||||
const ata = associatedTokenAddress(solana, address, asset.mint);
|
||||
const info = await conn.getAccountInfo(ata, 'confirmed');
|
||||
if (!info) return { available: true, atomic: 0n, text: '0', asset };
|
||||
if (info.owner.toBase58() !== TOKEN_PROGRAM_ID) throw new Error('У токенового счёта неверный владелец программы');
|
||||
const parsed = await conn.getTokenAccountBalance(ata, 'confirmed');
|
||||
const atomic = BigInt(parsed.value.amount);
|
||||
return { available: true, atomic, text: formatAtomicAmount(atomic), asset, ata: ata.toBase58() };
|
||||
}
|
||||
|
||||
export function encodeTransferChecked(amountAtomic) {
|
||||
const bytes = new Uint8Array(10);
|
||||
bytes[0] = 12; // SPL Token TransferChecked
|
||||
let v = BigInt(amountAtomic);
|
||||
for (let i = 1; i <= 8; i += 1) { bytes[i] = Number(v & 255n); v >>= 8n; }
|
||||
bytes[9] = USDT_DECIMALS;
|
||||
return bytes;
|
||||
}
|
||||
|
||||
/** Sends real USDT in Mainnet, or an explicitly configured *test* SPL token in Devnet. */
|
||||
export async function transferUsdt({ endpoint, fromKeypair, toAddress, amountAtomic }) {
|
||||
const asset = getUsdtAsset();
|
||||
if (!asset.mint) throw new Error('Для Devnet укажите тестовый SPL-mint с 6 знаками (не настоящий USDT)');
|
||||
const amount = BigInt(amountAtomic);
|
||||
if (amount <= 0n || amount > 18_446_744_073_709_551_615n) throw new Error('Недопустимая сумма');
|
||||
const solana = await loadSolanaWeb3();
|
||||
const conn = new solana.Connection(endpoint, 'confirmed');
|
||||
const sender = fromKeypair.publicKey;
|
||||
const recipient = new solana.PublicKey(String(toAddress || '').trim());
|
||||
if (sender.equals(recipient)) throw new Error('Нельзя перевести средства самому себе');
|
||||
await verifyMint(conn, solana, asset.mint);
|
||||
const mint = new solana.PublicKey(asset.mint);
|
||||
const fromAta = associatedTokenAddress(solana, sender, mint);
|
||||
const toAta = associatedTokenAddress(solana, recipient, mint);
|
||||
const balance = await conn.getTokenAccountBalance(fromAta, 'confirmed').catch(() => null);
|
||||
if (!balance || BigInt(balance.value.amount) < amount) throw new Error('Недостаточно USDT на связанном токеновом счёте');
|
||||
const transaction = new solana.Transaction();
|
||||
const destInfo = await conn.getAccountInfo(toAta, 'confirmed');
|
||||
if (!destInfo) {
|
||||
// CreateAssociatedTokenAccountIdempotent; payer is the sender, owner is the recipient.
|
||||
transaction.add(new solana.TransactionInstruction({
|
||||
programId: new solana.PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID),
|
||||
keys: [
|
||||
{ pubkey: sender, isSigner: true, isWritable: true },
|
||||
{ pubkey: toAta, isSigner: false, isWritable: true },
|
||||
{ pubkey: recipient, isSigner: false, isWritable: false },
|
||||
{ pubkey: mint, isSigner: false, isWritable: false },
|
||||
{ pubkey: solana.SystemProgram.programId, isSigner: false, isWritable: false },
|
||||
{ pubkey: new solana.PublicKey(TOKEN_PROGRAM_ID), isSigner: false, isWritable: false },
|
||||
],
|
||||
data: Uint8Array.of(1),
|
||||
}));
|
||||
} else if (destInfo.owner.toBase58() !== TOKEN_PROGRAM_ID) {
|
||||
throw new Error('Адрес токенового счёта получателя занят другой программой');
|
||||
}
|
||||
transaction.add(new solana.TransactionInstruction({
|
||||
programId: new solana.PublicKey(TOKEN_PROGRAM_ID),
|
||||
keys: [
|
||||
{ pubkey: fromAta, isSigner: false, isWritable: true },
|
||||
{ pubkey: mint, isSigner: false, isWritable: false },
|
||||
{ pubkey: toAta, isSigner: false, isWritable: true },
|
||||
{ pubkey: sender, isSigner: true, isWritable: false },
|
||||
],
|
||||
data: encodeTransferChecked(amount),
|
||||
}));
|
||||
const signature = await sendAndConfirmSolanaHttp(conn, transaction, [fromKeypair]);
|
||||
return { signature, amountAtomic: amount, asset, destination: recipient.toBase58() };
|
||||
}
|
||||
@@ -25,6 +25,12 @@
|
||||
}
|
||||
|
||||
|
||||
/* Vertical dots only where explicitly selected (e.g. private chat actions). */
|
||||
.app-overflow-dots--vertical {
|
||||
flex-direction: column;
|
||||
gap: 3px;
|
||||
}
|
||||
|
||||
/* Явный вариант для шапок, где overflow-кнопку нужно выровнять по эталонной
|
||||
* позиции экрана «Связи». Поднимаем кнопку вместе с зоной нажатия и якорем
|
||||
* выпадающего меню, не меняя базовый TopBar для остальных экранов. */
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
/* Jupiter beta exchange uses the same surfaces and button styles as wallet transfer. */
|
||||
.wallet-swap-beta-tag { background: rgba(237, 150, 20, .14); border: 1px solid rgba(237,150,20,.55); padding: 8px 12px; border-radius: 10px; margin: 0; font-weight: 700; }
|
||||
.wallet-swap-warning { background: var(--surface, #262a30); border: 1px solid var(--border, rgba(150,150,150,.35)); padding: 14px; border-radius: 12px; line-height: 1.55; margin: 0; white-space: pre-line; }
|
||||
.wallet-swap-quote-box { background: var(--surface, #262a30); border: 1px solid var(--border, rgba(150,150,150,.35)); border-radius: 12px; padding: 14px; }
|
||||
.wallet-swap-quote-box > div { display: flex; justify-content: space-between; gap: 12px; padding: 7px 0; }
|
||||
.wallet-swap-quote-box strong { overflow-wrap: anywhere; text-align: end; }
|
||||
.wallet-swap-quote-box p { margin: 8px 0 0; line-height: 1.45; }
|
||||
.wallet-swap-quote-button, .wallet-swap-confirm, .wallet-swap-check { width: 100%; min-height: 47px; font-weight: 700; }
|
||||
.wallet-swap-explorer { font-size: .85rem; overflow-wrap: anywhere; }
|
||||
.wallet-swap-limit { margin: -8px 0 0; font-size: .85rem; }
|
||||
.wallet-swap-consent { background: rgba(237, 150, 20, .08); padding: 10px; border-radius: 10px; }
|
||||
.wallet-jupiter-link { background: var(--surface, #262a30); border: 1px solid var(--border, rgba(150,150,150,.4)); color: inherit; font-weight: 700; cursor: pointer; }
|
||||
.wallet-jupiter-link:hover { border-color: var(--accent, #52abff); }
|
||||
@@ -0,0 +1,22 @@
|
||||
/* Dedicated user-to-user Solana transfer screen. No new shell or dropdown owner. */
|
||||
.wallet-transfer-screen { width: 100%; max-width: 640px; margin: 0 auto; padding: 16px 12px 40px; }
|
||||
.wallet-transfer-card { gap: 15px; padding: 19px; }
|
||||
.wallet-transfer-heading { margin: 0; font-size: 1.45rem; }
|
||||
.wallet-transfer-balances { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 10px; }
|
||||
.wallet-transfer-balance { display: flex; flex-direction: column; gap: 7px; padding: 13px; background: var(--surface, #262a30); border: 1px solid var(--border, rgba(150,150,150,.24)); border-radius: 12px; min-width: 0; }
|
||||
.wallet-transfer-balance span { font-weight: 600; opacity: .78; }
|
||||
.wallet-transfer-balance strong { font-size: 1rem; overflow-wrap: anywhere; }
|
||||
.wallet-transfer-field { display: flex; flex-direction: column; gap: 7px; width: 100%; font-weight: 600; }
|
||||
.wallet-transfer-field input, .wallet-transfer-field select { width: 100%; min-height: 44px; box-sizing: border-box; }
|
||||
.wallet-transfer-select { cursor: pointer; }
|
||||
.wallet-transfer-selected { padding: 9px; font-weight: 600; background: var(--surface, #262a30); border-radius: 9px; }
|
||||
.wallet-transfer-notice { display: flex; align-items: flex-start; gap: 9px; line-height: 1.4; }
|
||||
.wallet-transfer-notice input { width: 18px; height: 18px; flex: 0 0 auto; margin: 2px 0 0; accent-color: var(--accent); }
|
||||
.wallet-transfer-submit { width: 100%; min-height: 46px; }
|
||||
.wallet-transfer-hint, .wallet-transfer-status { margin: 0; white-space: pre-wrap; overflow-wrap: anywhere; }
|
||||
.wallet-multi-usdt-line { display: flex; justify-content: space-between; gap: 10px; padding: 10px 0; font-size: 1.1rem; }
|
||||
.wallet-jupiter-link { display: flex; justify-content: center; text-align: center; align-items: center; min-height: 44px; text-decoration: none; }
|
||||
.wallet-jupiter-hint { margin: 0; font-size: 12px; line-height: 1.5; }
|
||||
|
||||
.wallet-transfer-field input[readonly] { cursor: default; opacity: .82; background: var(--surface, #262a30); }
|
||||
.wallet-transfer-notice[hidden] { display: none; }
|
||||
@@ -0,0 +1,135 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import vm from 'node:vm';
|
||||
import { readFileSync } from 'node:fs';
|
||||
import { setSolanaCluster } from '../js/services/solana-rpc-gateway.js';
|
||||
globalThis.window = { location: { pathname: '/wallet' } };
|
||||
const { parseRouteFromPath, toPrettyPath } = await import('../js/router.js');
|
||||
import { USDT_MAINNET_MINT, ASSOCIATED_TOKEN_PROGRAM_ID, associatedTokenAddress } from '../js/services/solana-usdt-service.js';
|
||||
import {
|
||||
WSOL_MINT, JUPITER_ROUTER_PROGRAM, swapPair, validateSwapInput,
|
||||
validateSwapBuildResponse, validateSwapInstructions, SWAP_BETA_MAX_SOL_LAMPORTS,
|
||||
SWAP_BETA_MAX_USDT_ATOMIC, requestSwapBuild,
|
||||
} from '../js/services/jupiter-swap-service.js';
|
||||
const code = (rel) => readFileSync(new URL(rel, import.meta.url), 'utf8');
|
||||
const ctx = { Buffer, Uint8Array, TextEncoder, TextDecoder, console, setTimeout, crypto: globalThis.crypto };
|
||||
vm.createContext(ctx);
|
||||
vm.runInContext(code('../js/vendor/solana-web3.iife.min.js'), ctx);
|
||||
const solana = ctx.solanaWeb3;
|
||||
const wallet = solana.Keypair.generate().publicKey.toBase58();
|
||||
const usdtAta = associatedTokenAddress(solana, wallet, USDT_MAINNET_MINT).toBase58();
|
||||
const wsolAta = associatedTokenAddress(solana, wallet, WSOL_MINT).toBase58();
|
||||
const fake = (inputCurrency = 'SOL', amount = 1000000n) => {
|
||||
const pair = swapPair(inputCurrency);
|
||||
return {
|
||||
pair,
|
||||
amount,
|
||||
build: {
|
||||
inputMint: pair.inputMint, outputMint: pair.outputMint, inAmount: amount.toString(),
|
||||
outAmount: '5000000', otherAmountThreshold: '4975000',
|
||||
swapMode: 'ExactIn', slippageBps: 50, transactionVersion: '0',
|
||||
routePlan: [{ swapInfo: { label: 'test' }, percent: 100 }],
|
||||
setupInstructions: [], cleanupInstruction: null, otherInstructions: [], computeBudgetInstructions: [],
|
||||
tipInstruction: null, addressesByLookupTableAddress: {},
|
||||
swapInstruction: { programId: JUPITER_ROUTER_PROGRAM,
|
||||
accounts: [{ pubkey: wallet, isSigner: true, isWritable: true }], data: 'AA==' },
|
||||
},
|
||||
};
|
||||
};
|
||||
|
||||
test('swap page wired from wallet, no external Jupiter wallet', () => {
|
||||
assert.deepEqual(parseRouteFromPath('/wallet/swap'), { pageId: 'wallet-swap-view', params: {} });
|
||||
assert.equal(toPrettyPath('wallet-swap-view'), 'wallet/swap');
|
||||
assert.match(code('../js/pages/wallet-view.js'), /navigate\('wallet\/swap'\)/);
|
||||
assert.match(code('../js/app.js'), /'wallet-swap-view': walletSwapView/);
|
||||
const page = code('../js/pages/wallet-swap-view.js');
|
||||
assert.match(page, /executeJupiterSwap/);
|
||||
assert.match(page, /data-consent/);
|
||||
assert.match(page, /window\.confirm/);
|
||||
assert.doesNotMatch(page, /jup\.ag\/swap\/SOL/);
|
||||
});
|
||||
|
||||
test('only Mainnet swaps allowed, with conservative small beta limits', async () => {
|
||||
setSolanaCluster('devnet');
|
||||
await assert.rejects(requestSwapBuild({ inputCurrency: 'SOL', amountAtomic: 1000000n, walletAddress: wallet }), /Mainnet/);
|
||||
setSolanaCluster('mainnet-beta');
|
||||
assert.equal(swapPair('SOL').outputMint, USDT_MAINNET_MINT);
|
||||
assert.equal(swapPair('USDT').outputMint, WSOL_MINT);
|
||||
assert.throws(() => swapPair('FAKE'), /SOL и USDT/);
|
||||
assert.equal(SWAP_BETA_MAX_SOL_LAMPORTS, 20_000_000n);
|
||||
assert.equal(SWAP_BETA_MAX_USDT_ATOMIC, 5_000_000n);
|
||||
assert.throws(() => validateSwapInput('SOL', '0.020000001', { solLamports: 200_000_000n }), /Бета-лимит/);
|
||||
assert.throws(() => validateSwapInput('USDT', '5.000001', { solLamports: 200_000_000n }), /Бета-лимит/);
|
||||
assert.throws(() => validateSwapInput('USDT', '0.1', { solLamports: 0n }), /0,01 SOL/);
|
||||
assert.equal(validateSwapInput('SOL', '0.01', { solLamports: 100_000_000n }).amount, 10_000_000n);
|
||||
});
|
||||
|
||||
test('Jupiter response must match exact currency, input, slippage and expected minimum', () => {
|
||||
const { pair, amount, build } = fake();
|
||||
assert.equal(validateSwapBuildResponse(build, pair, amount).minimum, 4975000n);
|
||||
assert.throws(() => validateSwapBuildResponse({ ...build, inAmount: '9999999' }, pair, amount), /неожиданные/);
|
||||
assert.throws(() => validateSwapBuildResponse({ ...build, inputMint: USDT_MAINNET_MINT }, pair, amount), /неожиданные/);
|
||||
assert.throws(() => validateSwapBuildResponse({ ...build, slippageBps: 150 }, pair, amount), /неожиданные/);
|
||||
assert.throws(() => validateSwapBuildResponse({ ...build, otherAmountThreshold: '100000' }, pair, amount), /минимум/);
|
||||
assert.throws(() => validateSwapBuildResponse({ ...build, tipInstruction: {} }, pair, amount), /Неподдерживаемый/);
|
||||
});
|
||||
|
||||
test('only Jupiter router can swap; unsigned extra signer and malicious setup rejected', () => {
|
||||
const { pair, amount, build } = fake();
|
||||
assert.equal(validateSwapInstructions(build, pair, amount, wallet, solana).setupIxs.length, 0);
|
||||
const attacker = solana.Keypair.generate().publicKey.toBase58();
|
||||
assert.throws(() => validateSwapInstructions({ ...build, swapInstruction: { ...build.swapInstruction, programId: attacker } }, pair, amount, wallet, solana), /router/);
|
||||
assert.throws(() => validateSwapInstructions({ ...build, swapInstruction: { ...build.swapInstruction,
|
||||
accounts: [{ pubkey: attacker, isSigner: true, isWritable: true }] } }, pair, amount, wallet, solana), /неизвестного подписанта/);
|
||||
const badSystem = { programId: '11111111111111111111111111111111', accounts: [
|
||||
{ pubkey: wallet, isSigner: true, isWritable: true },
|
||||
{ pubkey: attacker, isSigner: false, isWritable: true },
|
||||
], data: Buffer.from([2,0,0,0,1,0,0,0,0,0,0,0]).toString('base64') };
|
||||
assert.throws(() => validateSwapInstructions({ ...build, setupInstructions: [badSystem] }, pair, amount, wallet, solana), /Недопустимый системный перевод/);
|
||||
});
|
||||
|
||||
test('canonical WSOL wrapping allowed up to input, not to arbitrary accounts', () => {
|
||||
const { pair, amount, build } = fake('SOL', 1_000_000n);
|
||||
const data = Buffer.alloc(12); data.writeUInt32LE(2, 0); data.writeBigUInt64LE(1_000_000n, 4);
|
||||
const instruction = { programId: '11111111111111111111111111111111',
|
||||
accounts: [{ pubkey: wallet, isSigner: true, isWritable: true }, { pubkey: wsolAta, isSigner: false, isWritable: true }],
|
||||
data: data.toString('base64') };
|
||||
assert.equal(validateSwapInstructions({ ...build, setupInstructions: [instruction] }, pair, amount, wallet, solana).setupIxs.length, 1);
|
||||
const tooMuch = Buffer.alloc(12); tooMuch.writeUInt32LE(2, 0); tooMuch.writeBigUInt64LE(1_000_001n, 4);
|
||||
assert.throws(() => validateSwapInstructions({ ...build, setupInstructions: [{ ...instruction, data: tooMuch.toString('base64') }] }, pair, amount, wallet, solana), /лишние SOL/);
|
||||
const initAta = { programId: ASSOCIATED_TOKEN_PROGRAM_ID,
|
||||
accounts: [
|
||||
{ pubkey: wallet, isSigner: true, isWritable: true },
|
||||
{ pubkey: usdtAta, isSigner: false, isWritable: true },
|
||||
{ pubkey: wallet, isSigner: false, isWritable: false },
|
||||
{ pubkey: USDT_MAINNET_MINT, isSigner: false, isWritable: false },
|
||||
{ pubkey: '11111111111111111111111111111111', isSigner: false, isWritable: false },
|
||||
{ pubkey: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA', isSigner: false, isWritable: false },
|
||||
], data: Buffer.from([1]).toString('base64') };
|
||||
assert.equal(validateSwapInstructions({ ...build, setupInstructions: [initAta] }, pair, amount, wallet, solana).setupIxs.length, 1);
|
||||
});
|
||||
|
||||
test('compiled Jupiter v0 route can be signed locally without external wallet', () => {
|
||||
const keypair = solana.Keypair.generate();
|
||||
const sender = keypair.publicKey.toBase58();
|
||||
const sample = fake();
|
||||
sample.build.swapInstruction.accounts = [{ pubkey: sender, isSigner: true, isWritable: true }];
|
||||
const checked = validateSwapInstructions(sample.build, sample.pair, sample.amount, sender, solana);
|
||||
const tx = new solana.VersionedTransaction(new solana.TransactionMessage({
|
||||
payerKey: keypair.publicKey,
|
||||
recentBlockhash: solana.Keypair.generate().publicKey.toBase58(),
|
||||
instructions: [solana.ComputeBudgetProgram.setComputeUnitLimit({units: 200000}), checked.swapIx],
|
||||
}).compileToV0Message());
|
||||
tx.sign([keypair]);
|
||||
assert.ok(tx.serialize().length > 100);
|
||||
assert.equal(tx.signatures[0].length, 64);
|
||||
});
|
||||
|
||||
test('i18n warnings clarify beta, risk and non-custodial key handling', () => {
|
||||
for (const lang of ['ru', 'en']) {
|
||||
const json = JSON.parse(code(`../js/i18n/locales/${lang}.json`));
|
||||
assert.ok(json.wallet_swap.warning.length > 100);
|
||||
assert.ok(json.wallet_swap.accept_risk.length > 30);
|
||||
assert.ok(json.wallet_swap.wallet_button.includes('Jupiter'));
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,102 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { readFileSync } from 'node:fs';
|
||||
import vm from 'node:vm';
|
||||
import { setSolanaCluster } from '../js/services/solana-rpc-gateway.js';
|
||||
import {
|
||||
USDT_MAINNET_MINT, TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID,
|
||||
getUsdtAsset, associatedTokenAddress, toAtomicAmount, formatAtomicAmount, encodeTransferChecked,
|
||||
} from '../js/services/solana-usdt-service.js';
|
||||
globalThis.window = { location: { pathname: '/wallet' } };
|
||||
const { parseRouteFromPath, toPrettyPath } = await import('../js/router.js');
|
||||
|
||||
const code = (rel) => readFileSync(new URL(rel, import.meta.url), 'utf8');
|
||||
const ctx = { Buffer, Uint8Array, TextEncoder, TextDecoder, console, setTimeout, crypto: globalThis.crypto };
|
||||
vm.createContext(ctx);
|
||||
vm.runInContext(code('../js/vendor/solana-web3.iife.min.js'), ctx);
|
||||
const solana = ctx.solanaWeb3;
|
||||
|
||||
test('mainnet pins Tether official mint, devnet is explicitly separate', () => {
|
||||
setSolanaCluster('mainnet-beta');
|
||||
assert.deepEqual(getUsdtAsset(), { mint: USDT_MAINNET_MINT, label: 'USDT', test: false });
|
||||
setSolanaCluster('devnet');
|
||||
assert.equal(getUsdtAsset().test, true);
|
||||
assert.equal(getUsdtAsset().mint, '');
|
||||
});
|
||||
|
||||
test('atomic amount parsing avoids floating point rounding and enforces decimals', () => {
|
||||
assert.equal(toAtomicAmount('0.000001'), 1n);
|
||||
assert.equal(toAtomicAmount('0,75'), 750_000n);
|
||||
assert.equal(toAtomicAmount('10.25'), 10_250_000n);
|
||||
assert.equal(formatAtomicAmount(10_250_000n), '10.25');
|
||||
assert.equal(toAtomicAmount('0.000000001', 9), 1n);
|
||||
assert.throws(() => toAtomicAmount('0.0000001'), /6/);
|
||||
assert.throws(() => toAtomicAmount('-1'), /сумму/);
|
||||
assert.throws(() => toAtomicAmount('0'), /диапазона/);
|
||||
assert.throws(() => toAtomicAmount('1e6'), /сумму/);
|
||||
});
|
||||
|
||||
test('token ATA uses legacy Token Program, not Token-2022 or arbitrary mint', () => {
|
||||
const owner = solana.Keypair.generate().publicKey.toBase58();
|
||||
const mint = new solana.PublicKey(USDT_MAINNET_MINT);
|
||||
const tokenProgram = new solana.PublicKey(TOKEN_PROGRAM_ID);
|
||||
const associatedProgram = new solana.PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID);
|
||||
const actual = associatedTokenAddress(solana, owner, mint);
|
||||
const expected = solana.PublicKey.findProgramAddressSync([
|
||||
new solana.PublicKey(owner).toBytes(), tokenProgram.toBytes(), mint.toBytes(),
|
||||
], associatedProgram)[0];
|
||||
assert.equal(actual.toBase58(), expected.toBase58());
|
||||
assert.equal(solana.PublicKey.isOnCurve(new solana.PublicKey(owner).toBytes()), true);
|
||||
});
|
||||
|
||||
test('wallet transfer route preserves selected SHiNE login', () => {
|
||||
globalThis.window = { location: { pathname: '/wallet/transfer/a%40example' } };
|
||||
assert.deepEqual(parseRouteFromPath('/wallet/transfer/a%40example'), {
|
||||
pageId: 'wallet-transfer-view', params: { recipientLogin: 'a@example' },
|
||||
});
|
||||
assert.equal(toPrettyPath('wallet-transfer-view'), 'wallet/transfer');
|
||||
assert.deepEqual(parseRouteFromPath('/wallet'), { pageId: 'wallet-view', params: {} });
|
||||
});
|
||||
|
||||
test('chat route has direct transfer action, wallet no longer prompts for address', () => {
|
||||
const chat = code('../js/pages/chat-view.js');
|
||||
const wallet = code('../js/pages/wallet-view.js');
|
||||
const transfer = code('../js/pages/wallet-transfer-view.js');
|
||||
assert.match(chat, /createOverflowDots\(\{ className: 'app-overflow-dots--vertical' \}\)/);
|
||||
assert.match(chat, /navigate\(`wallet\/transfer\/\$\{encodeURIComponent\(chatId\)\}`\)/);
|
||||
assert.match(wallet, /navigate\('wallet\/transfer'\)/);
|
||||
assert.doesNotMatch(wallet, /window\.prompt\(t\('dialogs\.pages\.wallet_view\.prompt_002'/);
|
||||
assert.match(transfer, /resolveContactBlockchainAddress/);
|
||||
assert.match(transfer, /authService\.sendDirectMessage/);
|
||||
assert.match(transfer, /transferUsdt/);
|
||||
});
|
||||
|
||||
test('SPL TransferChecked instruction uses exact u64 little-endian amount and 6 decimals', () => {
|
||||
const bytes = encodeTransferChecked(123_456_789n);
|
||||
assert.equal(bytes.length, 10);
|
||||
assert.equal(bytes[0], 12);
|
||||
assert.equal(bytes[9], 6);
|
||||
assert.equal(new DataView(bytes.buffer).getBigUint64(1, true), 123_456_789n);
|
||||
});
|
||||
|
||||
|
||||
test('chat transfer fixes recipient; wallet transfer has only free-address entry', () => {
|
||||
const transfer = code('../js/pages/wallet-transfer-view.js');
|
||||
assert.match(transfer, /const recipientLogin = recipientFromRoute;/);
|
||||
assert.match(transfer, /q\('recipient'\)\.readOnly = true;/);
|
||||
assert.match(transfer, /q\('notify-row'\)\.hidden = !recipientFromRoute;/);
|
||||
assert.match(transfer, /if \(recipientLogin\) \{/);
|
||||
assert.match(transfer, /toAddress = await resolveContactBlockchainAddress\(recipientLogin, endpoint\);/);
|
||||
assert.doesNotMatch(transfer, /data-clear-contact|data-search|data-contacts|wallet-transfer-contact-picker|authService\.listContacts/);
|
||||
});
|
||||
|
||||
test('chat transfer action is directly before destructive-actions divider', () => {
|
||||
const chat = code('../js/pages/chat-view.js');
|
||||
const menu = chat.slice(chat.indexOf("items: () => [", chat.indexOf('chat-header-menu-btn')));
|
||||
const addToContacts = menu.indexOf("label: t('screens.chat_view.text_019')");
|
||||
const transfer = menu.indexOf("label: t('wallet_multi.transfer_to_contact')");
|
||||
const divider = menu.indexOf('{ divider: true }');
|
||||
const clearHistory = menu.indexOf("label: t('screens.chat_view.text_020')");
|
||||
assert.ok(addToContacts >= 0 && addToContacts < transfer && transfer < divider && divider < clearHistory);
|
||||
assert.equal(menu.slice(0, divider).match(/wallet_multi\.transfer_to_contact/g)?.length, 1);
|
||||
});
|
||||
Reference in New Issue
Block a user