Регистрация V2: не проверено end-to-end

This commit is contained in:
AidarKC
2026-10-23 19:21:52 +03:00
parent 6c8159c5f7
commit cab26bbf41
95 changed files with 4469 additions and 1088 deletions
+10 -90
View File
@@ -1,12 +1,6 @@
import { registerUserOnSolana as registerUserOnSolanaShared } from './shine-user-pda-service.js';
import {
SHINE_USERS_PROGRAM_ID,
SHINE_LOGIN_GUARD_PROGRAM_ID,
} from '../solana-programs.js';
import { loadSolanaWeb3 } from '../vendor/solana-web3-loader.js';
const CLASSIFY_LOGIN_INSTRUCTION_TAG = 1;
const SHINE_USERS_USER_PDA_SEED_PREFIX = 'user_login=';
import { deriveUserPda, normalizeFullLogin } from './shine-namespace-service.js';
let solanaLibPromise = null;
function loadSolanaLib() {
@@ -14,37 +8,6 @@ function loadSolanaLib() {
return solanaLibPromise;
}
function pushU32LE(buf, v) {
const n = v >>> 0;
buf.push(n & 0xFF, (n >> 8) & 0xFF, (n >> 16) & 0xFF, (n >> 24) & 0xFF);
}
class BorshBuf {
constructor() { this._b = []; }
u8(v) { this._b.push(v & 0xFF); }
u32(v) { pushU32LE(this._b, v); }
str(s) {
const enc = new TextEncoder().encode(s);
this.u32(enc.length);
for (const x of enc) this._b.push(x);
}
raw(bytes) { for (const x of bytes) this._b.push(x); }
result() { return new Uint8Array(this._b); }
}
function serializeClassifyLoginArgs(login) {
const b = new BorshBuf();
b.u8(CLASSIFY_LOGIN_INSTRUCTION_TAG);
b.str(String(login || ''));
return b.result();
}
function decodeU32FromB64(rawB64) {
const bytes = Uint8Array.from(atob(rawB64), (ch) => ch.charCodeAt(0));
if (bytes.length < 4) throw new Error('LOGIN_GUARD_BAD_RETURN_DATA');
return new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength).getUint32(0, true);
}
function safeJson(value) {
try {
return JSON.stringify(value);
@@ -94,64 +57,21 @@ export function isUserAlreadyExistsSolanaError(error) {
|| details.includes('Instruction 2: custom program error: 0x4');
}
export async function precheckLoginClassOnSolana({ login, solanaEndpoint }) {
const solana = await loadSolanaLib();
const connection = new solana.Connection(String(solanaEndpoint || ''), 'confirmed');
const loginGuardProgram = new solana.PublicKey(SHINE_LOGIN_GUARD_PROGRAM_ID);
const ix = new solana.TransactionInstruction({
programId: loginGuardProgram,
keys: [],
data: serializeClassifyLoginArgs(String(login || '').toLowerCase()),
});
const { blockhash } = await connection.getLatestBlockhash('confirmed');
const v0Message = new solana.TransactionMessage({
// Для simulateTransaction нужен существующий аккаунт payer.
// Используем сам program id, чтобы не зависеть от внешнего тестового адреса.
payerKey: loginGuardProgram,
recentBlockhash: blockhash,
instructions: [ix],
}).compileToV0Message();
const tx = new solana.VersionedTransaction(v0Message);
const sim = await connection.simulateTransaction(tx, {
commitment: 'confirmed',
sigVerify: false,
replaceRecentBlockhash: true,
});
if (sim?.value?.err) {
const simErr = new Error(`LOGIN_GUARD_SIMULATION_FAILED: ${safeJson(sim.value.err)}`);
simErr.logs = sim?.value?.logs || [];
simErr.err = sim?.value?.err;
throw simErr;
}
const returnData = sim?.value?.returnData;
if (!returnData || returnData.programId !== SHINE_LOGIN_GUARD_PROGRAM_ID) {
throw new Error('LOGIN_GUARD_BAD_RETURN_DATA');
}
const classValue = decodeU32FromB64(returnData.data?.[0] || '');
if (classValue === 0) return { classCode: 0, className: 'free' };
if (classValue === 1) return { classCode: 1, className: 'premium' };
if (classValue === 2) return { classCode: 2, className: 'company' };
return { classCode: classValue, className: 'unknown' };
export async function precheckLoginClassOnSolana() {
throw new Error('CLASSIFY_LOGIN_DEPRECATED: новая регистрация использует namespace PDA; UI требуется обновить на этапе 10');
}
export async function checkLoginExistsOnSolana({ login, solanaEndpoint }) {
const full = normalizeFullLogin(login);
const solana = await loadSolanaLib();
const connection = new solana.Connection(String(solanaEndpoint || ''), 'confirmed');
const usersProgram = new solana.PublicKey(SHINE_USERS_PROGRAM_ID);
const enc = new TextEncoder();
const loginNorm = String(login || '').trim().toLowerCase();
if (!loginNorm) {
throw new Error('EMPTY_LOGIN');
}
const [userPda] = solana.PublicKey.findProgramAddressSync(
[enc.encode(SHINE_USERS_USER_PDA_SEED_PREFIX), enc.encode(loginNorm)],
usersProgram,
);
const userPda = await deriveUserPda(full);
const ai = await connection.getAccountInfo(userPda, 'confirmed');
return { exists: !!ai, userPda: userPda.toBase58() };
// Для type2 нужно также сверяться с отдельным серверным индексом free сертификатов;
// отсутствие PDA НЕ является доказательством свободы логина.
return { exists: Boolean(ai), userPda: userPda.toBase58(), solanaPdaExists: Boolean(ai) };
}
export async function registerUserOnSolana({ login, keyBundle, solanaEndpoint, accessServers, promoCode = '' }) {
return registerUserOnSolanaShared({ login, keyBundle, solanaEndpoint, accessServers, promoCode });
export async function registerUserOnSolana({ login, keyBundle, solanaEndpoint, accessServers, registrarSignature64 = null }) {
return registerUserOnSolanaShared({ login, keyBundle, solanaEndpoint, accessServers, registrarSignature64 });
}