SHA256
Solana RPC gateway для клиента и сервера
This commit is contained in:
@@ -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