Wallet-session pairing и browser plugin wallet, оплаты пока не работают

2026-06-16 16:23:08 +04:00
parent 5c155ef503
commit 3efa8bb7ee
41 changed files with 3260 additions and 37 deletions
@@ -1,11 +1,11 @@
 import {
  base64ToBytes,
  bytesToBase64,
-  deriveOpaqueArgon2Hash,
  exportEd25519PublicKeyB64,
  exportPkcs8B64,
  generateEd25519Pair,
  sha256Bytes,
+  sha256Text,
  utf8Bytes,
 } from './crypto-utils.js';
 import {
@@ -14,8 +14,9 @@ import {
  x25519,
 } from 'https://esm.sh/@noble/curves@1.5.0/ed25519';

-const PAIRING_HASH_SUFFIX = 'esp.pairing.password';
 const PAIRING_ENVELOPE_PREFIX = 'shine-esp-pairing-v1:';
+const PAIRING_HASH_PREFIX = 'sha256$';
+const PAIRING_HASH_VERSION = 'shine-pairing';
 const ED25519_PKCS8_PREFIX = new Uint8Array([
  0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x04, 0x22, 0x04, 0x20,
 ]);
@@ -84,10 +85,11 @@ export function detectPairingPayloadType(keys = {}) {
 }

 export async function deriveEspPairingPasswordHash(login, password) {
-  return deriveOpaqueArgon2Hash(password, {
-    login,
-    suffix: PAIRING_HASH_SUFFIX,
-  });
+  const loginLower = String(login || '').trim().toLowerCase();
+  const preimage = `${PAIRING_HASH_VERSION}|${loginLower}|${String(password ?? '')}`;
+  const digest = await sha256Text(preimage);
+  const hex = [...digest].map((byte) => byte.toString(16).padStart(2, '0')).join('');
+  return `${PAIRING_HASH_PREFIX}${hex}`;
 }

 export async function createRequesterPairingMaterial() {
@@ -158,3 +160,19 @@ export function buildSecretsPayload({ login, keys, mode }) {
    createdAtMs: Date.now(),
  };
 }
+
+export function buildSessionAttachPayload({ login, session }) {
+  return {
+    v: 1,
+    type: 'shine-esp-session-attach',
+    login: String(login || '').trim(),
+    session: {
+      sessionId: String(session?.sessionId || '').trim(),
+      sessionKey: String(session?.sessionKey || '').trim(),
+      storagePwd: String(session?.storagePwd || '').trim(),
+      sessionType: Number(session?.sessionType || 50) || 50,
+      clientPlatform: String(session?.clientPlatform || '').trim(),
+    },
+    createdAtMs: Date.now(),
+  };
+}