SHA256
Solana RPC gateway для клиента и сервера
This commit is contained in:
@@ -12,7 +12,6 @@ import { checkServerAvailabilityByKey, resolveAndCheckShineServerLogin } from '.
|
||||
export const pageMeta = { id: 'entry-settings-view', title: 'Настройки входа', showAppChrome: false };
|
||||
|
||||
const SERVER_FIELDS = [
|
||||
{ key: 'solanaServer', label: 'Сервер Solana' },
|
||||
{ key: 'shineServerLogin', label: 'Сервер Сияния' },
|
||||
{ key: 'arweaveServer', label: 'Сервер Arweave' },
|
||||
];
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { getSolanaCluster } from '../services/solana-rpc-gateway.js';
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
import { defaultSolanaCluster } from '../deploy-config.js';
|
||||
import { state } from '../state.js';
|
||||
import { loadSolanaWeb3 } from '../vendor/solana-web3-loader.js';
|
||||
|
||||
@@ -7,7 +7,6 @@ export const pageMeta = { id: 'queue', title: 'Очередь билета' };
|
||||
|
||||
const SHINE_PAYMENTS_PROGRAM_ID = 'SHiPmXbM9Fs9khzRUW3TGKsS2W84aqaXTxs3ZkajW9v';
|
||||
const SHINE_PAYMENTS_ORACLE_ACCOUNT = '7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE';
|
||||
const SHINE_MAINNET_SOLANA_ENDPOINT = 'https://solana-rpc.publicnode.com';
|
||||
const SHINE_PAYMENTS_SEEDS = {
|
||||
config: 'shine_payments_config',
|
||||
coef: 'shine_payments_coef_limit',
|
||||
@@ -18,11 +17,11 @@ const SHINE_PAYMENTS_SEEDS = {
|
||||
};
|
||||
|
||||
function isTestDeployUi() {
|
||||
return String(defaultSolanaCluster || '').trim().toLowerCase() !== 'mainnet-beta';
|
||||
return getSolanaCluster() === 'devnet';
|
||||
}
|
||||
|
||||
function resolveQueueEndpoint(useMainnetQueue) {
|
||||
return useMainnetQueue ? SHINE_MAINNET_SOLANA_ENDPOINT : state.entrySettings.solanaServer;
|
||||
return state.entrySettings.solanaServer;
|
||||
}
|
||||
|
||||
function utf8Bytes(text) {
|
||||
@@ -312,9 +311,9 @@ export function render({navigate, chrome}) {
|
||||
mainnetRow.className = 'checkbox-row';
|
||||
mainnetRow.innerHTML = `
|
||||
<input type="checkbox" id="public-queue-mainnet-source" ${testDeploy ? 'checked' : ''} />
|
||||
<span>Показывать данные mainnet (${SHINE_MAINNET_SOLANA_ENDPOINT})</span>
|
||||
<span>Использовать сеть текущего сервера SHiNE</span>
|
||||
`;
|
||||
mainnetRow.style.display = testDeploy ? '' : 'none';
|
||||
mainnetRow.style.display = 'none';
|
||||
const mainnetCheckbox = mainnetRow.querySelector('#public-queue-mainnet-source');
|
||||
|
||||
let lastCoreState = null;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { getSolanaCluster } from '../services/solana-rpc-gateway.js';
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
import { iconHtml } from '../components/ui-icon.js';
|
||||
import {
|
||||
@@ -51,23 +52,13 @@ function getExplorerClusterName(endpoint) {
|
||||
}
|
||||
|
||||
function isTestRegistrationContour() {
|
||||
const solanaCluster = getExplorerClusterName(state.entrySettings.solanaServer);
|
||||
if (solanaCluster !== 'mainnet-beta') return true;
|
||||
const shineServer = String(state.entrySettings.shineServer || '').trim().toLowerCase();
|
||||
const shineServerLogin = String(state.entrySettings.shineServerLogin || '').trim().toLowerCase();
|
||||
return (
|
||||
shineServer.includes('t1.shineup.me')
|
||||
|| shineServer.includes('t2.shineup.me')
|
||||
|| shineServer.includes('t3.shineup.me')
|
||||
|| shineServer.includes('t4.shineup.me')
|
||||
|| ['t1', 't2', 't3', 't4'].includes(shineServerLogin)
|
||||
);
|
||||
return getSolanaCluster() === 'devnet';
|
||||
}
|
||||
|
||||
function makeSolanaExplorerTxUrl(signature, endpoint) {
|
||||
const cleanSignature = String(signature || '').trim();
|
||||
if (!cleanSignature) return '';
|
||||
const cluster = getExplorerClusterName(endpoint);
|
||||
const cluster = getSolanaCluster() || getExplorerClusterName(endpoint);
|
||||
const url = new URL(`https://explorer.solana.com/tx/${encodeURIComponent(cleanSignature)}`);
|
||||
if (cluster !== 'mainnet-beta') {
|
||||
url.searchParams.set('cluster', cluster);
|
||||
|
||||
@@ -1,19 +1,11 @@
|
||||
import { state } from '../state.js';
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
|
||||
export const pageMeta = { id: 'solana-rpc-check-view', title: 'Проверка Solana RPC' };
|
||||
|
||||
const MAINNET_RPC_ENDPOINTS = [
|
||||
{ name: 'GetBlock', url: 'https://go.getblock.us/86aac42ad4484f3c813079afc201451c' },
|
||||
{ name: 'PublicNode', url: 'https://solana-rpc.publicnode.com' },
|
||||
{ name: 'BlockEden', url: 'https://api.blockeden.xyz/solana/KeCh6p22EX5AeRHxMSmc' },
|
||||
{ name: 'dRPC', url: 'https://solana.drpc.org/' },
|
||||
{ name: 'Grove', url: 'https://solana.rpc.grove.city/v1/01fdb492' },
|
||||
{ name: 'LeoRPC', url: 'https://solana.leorpc.com/?api_key=FREE' },
|
||||
{ name: 'OnFinality', url: 'https://solana.api.onfinality.io/public' },
|
||||
{ name: 'Solana Foundation', url: 'https://api.mainnet-beta.solana.com' },
|
||||
{ name: 'Solana Vibe Station', url: 'https://public.rpc.solanavibestation.com/' },
|
||||
{ name: 'TheRPC', url: 'https://solana.therpc.io' },
|
||||
];
|
||||
function currentRpcEndpoints() {
|
||||
return [{ name: 'SHiNE SolanaRpcGateway', url: state.entrySettings.solanaServer }];
|
||||
}
|
||||
|
||||
const RPC_PAYLOAD = {
|
||||
jsonrpc: '2.0',
|
||||
@@ -139,10 +131,10 @@ export function render({navigate, chrome}) {
|
||||
const intro = document.createElement('div');
|
||||
intro.className = 'card stack';
|
||||
intro.innerHTML = `
|
||||
<strong>Проверка mainnet RPC из браузера</strong>
|
||||
<strong>Проверка SolanaRpcGateway</strong>
|
||||
<p class="meta-muted">
|
||||
Этот экран делает реальный browser fetch к публичным Solana mainnet RPC.
|
||||
Если ответ приходит прямо здесь, значит нода годится для клиентского UI без промежуточного сервера.
|
||||
Этот экран проверяет RPC-шлюз подключённого сервера SHiNE.
|
||||
RPC-провайдер и сеть определяются сервером SHiNE.
|
||||
</p>
|
||||
`;
|
||||
|
||||
@@ -152,7 +144,7 @@ export function render({navigate, chrome}) {
|
||||
const runBtn = document.createElement('button');
|
||||
runBtn.className = 'primary-btn';
|
||||
runBtn.type = 'button';
|
||||
runBtn.textContent = 'Проверить все ноды';
|
||||
runBtn.textContent = 'Проверить шлюз';
|
||||
|
||||
const resetBtn = document.createElement('button');
|
||||
resetBtn.className = 'ghost-btn';
|
||||
@@ -169,7 +161,7 @@ export function render({navigate, chrome}) {
|
||||
const grid = document.createElement('div');
|
||||
grid.className = 'stack';
|
||||
|
||||
const cards = MAINNET_RPC_ENDPOINTS.map((endpoint) => {
|
||||
const cards = currentRpcEndpoints().map((endpoint) => {
|
||||
const ui = makeResultCard(endpoint);
|
||||
grid.append(ui.card);
|
||||
return { endpoint, ui };
|
||||
@@ -194,7 +186,7 @@ export function render({navigate, chrome}) {
|
||||
runBtn.disabled = true;
|
||||
resetBtn.disabled = true;
|
||||
summary.className = 'status-line';
|
||||
summary.textContent = 'Проверяем mainnet RPC из браузера...';
|
||||
summary.textContent = 'Проверяем SHiNE SolanaRpcGateway...';
|
||||
|
||||
let okCount = 0;
|
||||
let warnCount = 0;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { confirmSolanaTransactionHttp, getSolanaCluster } from '../services/solana-rpc-gateway.js';
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
import {
|
||||
SHINE_USERS_ECONOMY_CONFIG_SEED,
|
||||
SHINE_USERS_PROGRAM_ID,
|
||||
SOLANA_CLUSTER,
|
||||
} from '../solana-programs.js';
|
||||
import { state } from '../state.js';
|
||||
import { loadSolanaWeb3 } from '../vendor/solana-web3-loader.js';
|
||||
@@ -136,7 +136,7 @@ export function render({navigate, chrome}) {
|
||||
|
||||
const signed = await provider.signTransaction(tx);
|
||||
const sig = await connection.sendRawTransaction(signed.serialize(), { skipPreflight: false });
|
||||
await connection.confirmTransaction({ signature: sig, blockhash, lastValidBlockHeight }, 'confirmed');
|
||||
await confirmSolanaTransactionHttp(connection, sig, { lastValidBlockHeight });
|
||||
|
||||
txLine.textContent = `TX: ${sig}`;
|
||||
status.textContent = 'Успешно: init_users_economy_config выполнен.';
|
||||
@@ -159,7 +159,7 @@ export function render({navigate, chrome}) {
|
||||
(() => {
|
||||
const t = document.createElement('p');
|
||||
t.className = 'meta-muted';
|
||||
t.textContent = `Cluster: ${SOLANA_CLUSTER}`;
|
||||
t.textContent = `Cluster: ${getSolanaCluster() || "не определён"}`;
|
||||
return t;
|
||||
})(),
|
||||
(() => {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { getSolanaCluster, confirmSolanaTransactionHttp } from '../services/solana-rpc-gateway.js';
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
import { defaultSolanaCluster } from '../deploy-config.js';
|
||||
import { authService, state } from '../state.js';
|
||||
import {
|
||||
formatSol,
|
||||
@@ -96,7 +96,6 @@ function sessionArgsOrThrow() {
|
||||
|
||||
const SHINE_PAYMENTS_PROGRAM_ID = 'SHiPmXbM9Fs9khzRUW3TGKsS2W84aqaXTxs3ZkajW9v';
|
||||
const SHINE_PAYMENTS_ORACLE_ACCOUNT = '7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE';
|
||||
const SHINE_MAINNET_SOLANA_ENDPOINT = 'https://solana-rpc.publicnode.com';
|
||||
const SHINE_PAYMENTS_SEEDS = {
|
||||
config: 'shine_payments_config',
|
||||
coef: 'shine_payments_coef_limit',
|
||||
@@ -117,11 +116,11 @@ const SUPPORT_TICKET_HELP_TEXT = [
|
||||
].join('\n');
|
||||
|
||||
function isTestDeployUi() {
|
||||
return String(defaultSolanaCluster || '').trim().toLowerCase() !== 'mainnet-beta';
|
||||
return getSolanaCluster() === 'devnet';
|
||||
}
|
||||
|
||||
function resolveSupportQueueEndpoint(useMainnetQueue) {
|
||||
return useMainnetQueue ? SHINE_MAINNET_SOLANA_ENDPOINT : state.entrySettings.solanaServer;
|
||||
return state.entrySettings.solanaServer;
|
||||
}
|
||||
|
||||
function utf8Bytes(text) {
|
||||
@@ -801,9 +800,9 @@ export function render({navigate, chrome}) {
|
||||
mainnetRow.className = 'checkbox-row';
|
||||
mainnetRow.innerHTML = `
|
||||
<input type="checkbox" id="support-ticket-mainnet-source" ${testDeploy ? 'checked' : ''} />
|
||||
<span>Показывать данные mainnet (${SHINE_MAINNET_SOLANA_ENDPOINT})</span>
|
||||
<span>Использовать сеть текущего сервера SHiNE</span>
|
||||
`;
|
||||
mainnetRow.style.display = testDeploy ? '' : 'none';
|
||||
mainnetRow.style.display = 'none';
|
||||
const mainnetCheckbox = mainnetRow.querySelector('#support-ticket-mainnet-source');
|
||||
|
||||
const actions = document.createElement('div');
|
||||
@@ -1224,10 +1223,7 @@ export function render({navigate, chrome}) {
|
||||
tx.recentBlockhash = bh.blockhash;
|
||||
tx.partialSign(walletCtx.keypair);
|
||||
const signature = await connection.sendRawTransaction(tx.serialize(), { skipPreflight: false });
|
||||
await connection.confirmTransaction(
|
||||
{ signature, blockhash: bh.blockhash, lastValidBlockHeight: bh.lastValidBlockHeight },
|
||||
'confirmed',
|
||||
);
|
||||
await confirmSolanaTransactionHttp(connection, signature, { lastValidBlockHeight: bh.lastValidBlockHeight });
|
||||
const ticketInfo = await connection.getAccountInfo(ticketPda, 'confirmed');
|
||||
const ticket = ticketInfo?.data
|
||||
? parsePaymentsTicket(ticketInfo.data)
|
||||
|
||||
Reference in New Issue
Block a user