@sip-protocol/sdk 0.9.0 → 0.10.0

package/src/chains/near/resolver.ts

@@ -30,6 +30,7 @@
  * @module chains/near/resolver
  */
 
+import { ed25519 } from '@noble/curves/ed25519'
 import { bytesToHex, hexToBytes } from '@noble/hashes/utils'
 import type { HexString, StealthAddress } from '@sip-protocol/types'
 import { ValidationError } from '../../errors'
@@ -44,6 +45,19 @@ import {
 } from './constants'
 import type { NEARViewingKey } from './viewing-key'
 
+// ─── Helpers ──────────────────────────────────────────────────────────────────
+
+/**
+ * Derive the ed25519 spending PUBLIC key from a spending private key.
+ *
+ * Canonical EIP-5564 view-only scanning needs the spending public key, but
+ * scan recipients in this module hold the spending private key. This converts
+ * one to the other on the fly.
+ */
+function nearSpendingPublicFromPrivate(spendingPrivateKey: HexString): HexString {
+  return `0x${bytesToHex(ed25519.getPublicKey(hexToBytes(spendingPrivateKey.slice(2))))}` as HexString
+}
+
 // ─── Types ────────────────────────────────────────────────────────────────────
 
 /**
@@ -652,8 +666,8 @@ export class NEARStealthScanner {
         try {
           const isMatch = checkNEARStealthAddress(
             stealthAddressToCheck,
-            recipient.spendingPrivateKey,
-            recipient.viewingPrivateKey
+            recipient.viewingPrivateKey,
+            nearSpendingPublicFromPrivate(recipient.spendingPrivateKey)
           )
 
           if (isMatch) {
@@ -764,8 +778,8 @@ export class NEARStealthScanner {
     try {
       return checkNEARStealthAddress(
         stealthAddressToCheck,
-        spendingPrivateKey,
-        viewingPrivateKey
+        viewingPrivateKey,
+        nearSpendingPublicFromPrivate(spendingPrivateKey)
       )
     } catch {
       return false
@@ -814,8 +828,8 @@ export class NEARStealthScanner {
         try {
           const isMatch = checkNEARStealthAddress(
             stealthAddressToCheck,
-            recipient.spendingPrivateKey,
-            recipient.viewingPrivateKey
+            recipient.viewingPrivateKey,
+            nearSpendingPublicFromPrivate(recipient.spendingPrivateKey)
           )
 
           if (isMatch) {
@@ -954,8 +968,8 @@ export function hasNEARAnnouncementMatch(
       try {
         const isMatch = checkNEARStealthAddress(
           stealthAddressToCheck,
-          recipient.spendingPrivateKey,
-          recipient.viewingPrivateKey
+          recipient.viewingPrivateKey,
+          nearSpendingPublicFromPrivate(recipient.spendingPrivateKey)
         )
 
         if (isMatch) {

package/src/chains/near/stealth.ts

@@ -204,12 +204,12 @@ export function deriveNEARStealthPrivateKey(
 /**
  * Check if a NEAR stealth address was intended for this recipient
  *
- * Efficiently checks if a stealth address belongs to the owner of
- * the given spending/viewing keys.
+ * Canonical EIP-5564 view-only check: requires only the recipient's viewing
+ * private key plus their spending PUBLIC key (no spending private key needed).
  *
  * @param stealthAddress - The stealth address to check
- * @param spendingPrivateKey - Recipient's spending private key
  * @param viewingPrivateKey - Recipient's viewing private key
+ * @param spendingPublicKey - Recipient's spending public key (meta-address spendingKey)
  * @returns True if the address belongs to this recipient
  *
  * @example
@@ -217,8 +217,8 @@ export function deriveNEARStealthPrivateKey(
  * // Check if a detected address is for us
  * const isForMe = checkNEARStealthAddress(
  *   announcement.stealthAddress,
- *   mySpendingPrivateKey,
- *   myViewingPrivateKey
+ *   myViewingPrivateKey,
+ *   mySpendingPublicKey
  * )
  *
  * if (isForMe) {
@@ -228,13 +228,13 @@ export function deriveNEARStealthPrivateKey(
  */
 export function checkNEARStealthAddress(
   stealthAddress: StealthAddress,
-  spendingPrivateKey: HexString,
-  viewingPrivateKey: HexString
+  viewingPrivateKey: HexString,
+  spendingPublicKey: HexString
 ): boolean {
   return checkEd25519StealthAddress(
     stealthAddress,
-    spendingPrivateKey,
-    viewingPrivateKey
+    viewingPrivateKey,
+    spendingPublicKey
   )
 }
 

package/src/chains/solana/constants.ts

@@ -66,11 +66,23 @@ export const SOLANA_EXPLORER_URLS = {
 export const MEMO_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr'
 
 /**
- * SIP announcement memo prefix
+ * SIP announcement memo prefix (legacy SIP:1, swapped scheme — read-only back-compat)
  * Format: SIP:1:<ephemeral_pubkey_base58>:<view_tag_hex>
  */
 export const SIP_MEMO_PREFIX = 'SIP:1:'
 
+/**
+ * Canonical EIP-5564 (SIP:2) announcement memo prefix — emitted by new sends.
+ * Format: SIP:2:<ephemeral_pubkey_base58>:<view_tag_hex>[:<stealth_address_base58>]
+ */
+export const SIP_MEMO_PREFIX_V2 = 'SIP:2:'
+
+/**
+ * Version-agnostic prefix for filtering announcement logs during scanning.
+ * Matches both SIP:1 (legacy) and SIP:2 (canonical) announcements.
+ */
+export const SIP_MEMO_PREFIX_ANY = 'SIP:'
+
 /**
  * Estimated transaction fee in lamports
  * Includes base fee + rent for ATA creation

package/src/chains/solana/ephemeral-keys.ts

@@ -42,41 +42,6 @@ export interface EphemeralKeypair {
   publicKeyBase58: string
 }
 
-/**
- * Result of using an ephemeral keypair for stealth address generation
- */
-export interface EphemeralKeyUsageResult {
-  /**
-   * Shared secret derived from ECDH
-   */
-  sharedSecret: HexString
-
-  /**
-   * View tag (first byte of shared secret hash)
-   */
-  viewTag: number
-
-  /**
-   * Stealth address (hex, ed25519 format)
-   */
-  stealthAddress: HexString
-
-  /**
-   * Stealth address in Solana base58 format
-   */
-  stealthAddressBase58: string
-
-  /**
-   * Ephemeral public key used (for announcement)
-   */
-  ephemeralPublicKey: HexString
-
-  /**
-   * Ephemeral public key in Solana base58 format
-   */
-  ephemeralPublicKeyBase58: string
-}
-
 /**
  * Managed ephemeral keypair with automatic secure disposal
  */
@@ -91,15 +56,6 @@ export interface ManagedEphemeralKeypair extends EphemeralKeypair {
    * Called automatically after use, but can be called manually
    */
   dispose(): void
-
-  /**
-   * Use this keypair to generate a stealth address
-   * Automatically disposes the keypair after use
-   */
-  useForStealthAddress(
-    recipientSpendingKey: HexString,
-    recipientViewingKey: HexString
-  ): EphemeralKeyUsageResult
 }
 
 /**
@@ -162,13 +118,9 @@ export function generateEphemeralKeypair(): EphemeralKeypair {
  * ```typescript
  * const managed = generateManagedEphemeralKeypair()
  *
- * // Use for stealth address generation (auto-disposes)
- * const result = managed.useForStealthAddress(
- *   recipientSpendingKey,
- *   recipientViewingKey
- * )
- *
- * console.log('Stealth address:', result.stealthAddressBase58)
+ * // Use the ephemeral key, then securely dispose
+ * console.log('Public key:', managed.publicKeyBase58)
+ * managed.dispose()
  * console.log('Is disposed:', managed.isDisposed) // true
  * ```
  */
@@ -203,33 +155,6 @@ export function generateManagedEphemeralKeypair(): ManagedEphemeralKeypair {
         disposed = true
       }
     },
-
-    useForStealthAddress(
-      recipientSpendingKey: HexString,
-      recipientViewingKey: HexString
-    ): EphemeralKeyUsageResult {
-      if (disposed) {
-        throw new Error('Ephemeral keypair has been disposed')
-      }
-
-      try {
-        const result = computeStealthAddress(
-          privateKeyBytes,
-          publicKeyBytes,
-          recipientSpendingKey,
-          recipientViewingKey
-        )
-
-        return {
-          ...result,
-          ephemeralPublicKey: publicKeyHex,
-          ephemeralPublicKeyBase58: publicKeyBase58,
-        }
-      } finally {
-        // Always dispose after use
-        managed.dispose()
-      }
-    },
   }
 
   return managed
@@ -362,182 +287,3 @@ export function wipeEphemeralPrivateKey(privateKeyHex: HexString): void {
   const bytes = hexToBytes(privateKeyHex.slice(2))
   secureWipe(bytes)
 }
-
-// ─── Internal Helpers ─────────────────────────────────────────────────────────
-
-/**
- * ed25519 group order (L)
- */
-const ED25519_ORDER = 2n ** 252n + 27742317777372353535851937790883648493n
-
-/**
- * Convert bytes to bigint (little-endian for ed25519)
- */
-function bytesToBigIntLE(bytes: Uint8Array): bigint {
-  let result = 0n
-  for (let i = bytes.length - 1; i >= 0; i--) {
-    result = (result << 8n) | BigInt(bytes[i])
-  }
-  return result
-}
-
-/**
- * Get ed25519 scalar from private key bytes
- * Follows standard ed25519 scalar clamping
- */
-function getEd25519Scalar(privateKey: Uint8Array): bigint {
-  const hash = sha256(privateKey)
-  // Clamp to valid scalar
-  hash[0] &= 248
-  hash[31] &= 127
-  hash[31] |= 64
-  return bytesToBigIntLE(hash.slice(0, 32))
-}
-
-/**
- * Compute stealth address from ephemeral keypair and recipient keys
- */
-function computeStealthAddress(
-  ephemeralPrivateBytes: Uint8Array,
-  _ephemeralPublicBytes: Uint8Array, // Reserved for future validation
-  recipientSpendingKey: HexString,
-  recipientViewingKey: HexString
-): Omit<EphemeralKeyUsageResult, 'ephemeralPublicKey' | 'ephemeralPublicKeyBase58'> {
-  // Parse recipient keys
-  const spendingKeyBytes = hexToBytes(recipientSpendingKey.slice(2))
-  const viewingKeyBytes = hexToBytes(recipientViewingKey.slice(2))
-
-  // Get ephemeral scalar
-  const rawEphemeralScalar = getEd25519Scalar(ephemeralPrivateBytes)
-  const ephemeralScalar = rawEphemeralScalar % ED25519_ORDER
-  if (ephemeralScalar === 0n) {
-    throw new Error('Invalid ephemeral scalar')
-  }
-
-  // Compute shared secret: S = ephemeral_scalar * P_spend
-  const spendingPoint = ed25519.ExtendedPoint.fromHex(spendingKeyBytes)
-  const sharedSecretPoint = spendingPoint.multiply(ephemeralScalar)
-  const sharedSecretBytes = sharedSecretPoint.toRawBytes()
-
-  // Hash the shared secret
-  const sharedSecretHash = sha256(sharedSecretBytes)
-  const viewTag = sharedSecretHash[0]
-
-  // Derive stealth address: P_stealth = P_view + hash(S)*G
-  const hashScalar = bytesToBigIntLE(sharedSecretHash) % ED25519_ORDER
-  if (hashScalar === 0n) {
-    throw new Error('Invalid hash scalar')
-  }
-
-  const hashTimesG = ed25519.ExtendedPoint.BASE.multiply(hashScalar)
-  const viewingPoint = ed25519.ExtendedPoint.fromHex(viewingKeyBytes)
-  const stealthPoint = viewingPoint.add(hashTimesG)
-  const stealthAddressBytes = stealthPoint.toRawBytes()
-
-  const stealthAddress = `0x${bytesToHex(stealthAddressBytes)}` as HexString
-  const stealthAddressBase58 = ed25519PublicKeyToSolanaAddress(stealthAddress)
-
-  return {
-    sharedSecret: `0x${bytesToHex(sharedSecretHash)}` as HexString,
-    viewTag,
-    stealthAddress,
-    stealthAddressBase58,
-  }
-}
-
-// ─── Announcement Format ──────────────────────────────────────────────────────
-
-/**
- * Format ephemeral key data for Solana memo announcement
- *
- * @param ephemeralPublicKeyBase58 - Ephemeral public key in base58
- * @param viewTag - View tag (0-255)
- * @param stealthAddressBase58 - Optional stealth address for verification
- * @returns Formatted announcement string
- *
- * @example
- * ```typescript
- * const memo = formatEphemeralAnnouncement(
- *   result.ephemeralPublicKeyBase58,
- *   result.viewTag,
- *   result.stealthAddressBase58
- * )
- * // "SIP:1:7xK9...:0a:8yL0..."
- * ```
- */
-export function formatEphemeralAnnouncement(
-  ephemeralPublicKeyBase58: string,
-  viewTag: number,
-  stealthAddressBase58?: string
-): string {
-  const viewTagHex = viewTag.toString(16).padStart(2, '0')
-  const parts = ['SIP:1', ephemeralPublicKeyBase58, viewTagHex]
-
-  if (stealthAddressBase58) {
-    parts.push(stealthAddressBase58)
-  }
-
-  return parts.join(':')
-}
-
-/**
- * Parse ephemeral key data from Solana memo announcement
- *
- * @param announcement - Announcement string from memo
- * @returns Parsed ephemeral data or null if invalid
- *
- * @example
- * ```typescript
- * const parsed = parseEphemeralAnnouncement('SIP:1:7xK9...:0a:8yL0...')
- * if (parsed) {
- *   console.log('Ephemeral key:', parsed.ephemeralPublicKeyBase58)
- *   console.log('View tag:', parsed.viewTag)
- * }
- * ```
- */
-export function parseEphemeralAnnouncement(
-  announcement: string
-): {
-  ephemeralPublicKeyBase58: string
-  viewTag: number
-  stealthAddressBase58?: string
-} | null {
-  if (!announcement.startsWith('SIP:1:')) {
-    return null
-  }
-
-  const parts = announcement.slice(6).split(':')
-  if (parts.length < 2) {
-    return null
-  }
-
-  const ephemeralPublicKeyBase58 = parts[0]
-  const viewTagHex = parts[1]
-  const stealthAddressBase58 = parts[2]
-
-  // Validate ephemeral key (base58, 32-44 chars)
-  if (!ephemeralPublicKeyBase58 || ephemeralPublicKeyBase58.length < 32 || ephemeralPublicKeyBase58.length > 44) {
-    return null
-  }
-
-  // Validate view tag (1-2 hex chars)
-  if (!viewTagHex || viewTagHex.length > 2 || !/^[0-9a-fA-F]+$/.test(viewTagHex)) {
-    return null
-  }
-
-  const viewTag = parseInt(viewTagHex, 16)
-  if (viewTag < 0 || viewTag > 255) {
-    return null
-  }
-
-  // Validate stealth address if present
-  if (stealthAddressBase58 && (stealthAddressBase58.length < 32 || stealthAddressBase58.length > 44)) {
-    return null
-  }
-
-  return {
-    ephemeralPublicKeyBase58,
-    viewTag,
-    stealthAddressBase58,
-  }
-}

package/src/chains/solana/index.ts

@@ -52,6 +52,8 @@ export {
   SOLANA_EXPLORER_URLS,
   MEMO_PROGRAM_ID,
   SIP_MEMO_PREFIX,
+  SIP_MEMO_PREFIX_V2,
+  SIP_MEMO_PREFIX_ANY,
   ESTIMATED_TX_FEE_LAMPORTS,
   ATA_RENT_LAMPORTS,
   getExplorerUrl,
@@ -150,10 +152,7 @@ export {
   batchGenerateManagedEphemeralKeypairs,
   disposeEphemeralKeypairs,
   wipeEphemeralPrivateKey,
-  formatEphemeralAnnouncement,
-  parseEphemeralAnnouncement,
   type EphemeralKeypair,
-  type EphemeralKeyUsageResult,
   type ManagedEphemeralKeypair,
   type BatchGenerationOptions,
 } from './ephemeral-keys'

package/src/chains/solana/providers/helius-enhanced.ts

@@ -38,7 +38,7 @@ import {
   SOLANA_ADDRESS_MAX_LENGTH,
   HELIUS_API_KEY_MIN_LENGTH,
   sanitizeUrl,
-  SIP_MEMO_PREFIX,
+  SIP_MEMO_PREFIX_ANY,
   getExplorerUrl,
 } from '../constants'
 import type {
@@ -324,7 +324,7 @@ export class HeliusEnhanced {
    * Extract SIP metadata from a transaction
    *
    * Parses memo program instructions to find SIP announcements.
-   * SIP memo format: SIP:1:<ephemeral_pubkey_base58>:<view_tag_hex>
+   * SIP memo format: SIP:<version>:<ephemeral_pubkey_base58>:<view_tag_hex>
    *
    * @param tx - Enhanced transaction
    * @returns SIP metadata if found
@@ -339,13 +339,13 @@ export class HeliusEnhanced {
     const description = tx.description || ''
 
     // Check if this looks like a SIP transaction
-    // SIP transactions have a memo with format: SIP:1:<ephemeral_pubkey>:<view_tag>
-    if (description.includes(SIP_MEMO_PREFIX) || description.includes('SIP:')) {
+    // SIP transactions have a memo with format: SIP:<version>:<ephemeral_pubkey>:<view_tag>
+    if (description.includes(SIP_MEMO_PREFIX_ANY)) {
       metadata.isSIPTransaction = true
 
       // Try to extract SIP memo data
-      // The memo format is: SIP:1:<ephemeral_pubkey_base58>:<view_tag_hex>
-      const sipMemoMatch = description.match(/SIP:1:([A-Za-z0-9]{32,44}):([0-9a-fA-F]{2})/)
+      // The memo format is: SIP:<version>:<ephemeral_pubkey_base58>:<view_tag_hex>
+      const sipMemoMatch = description.match(/SIP:[12]:([A-Za-z0-9]{32,44}):([0-9a-fA-F]{1,2})/)
       if (sipMemoMatch) {
         metadata.ephemeralPubKey = sipMemoMatch[1]
         metadata.viewTag = parseInt(sipMemoMatch[2], 16)

package/src/chains/solana/providers/webhook.ts

@@ -46,7 +46,7 @@ import {
 import type { StealthAddress } from '@sip-protocol/types'
 import { parseAnnouncement } from '../types'
 import type { SolanaScanResult } from '../types'
-import { SIP_MEMO_PREFIX } from '../constants'
+import { SIP_MEMO_PREFIX_ANY } from '../constants'
 import { getTokenSymbol, parseTokenTransferFromBalances } from '../utils'
 import { ValidationError, SecurityError } from '../../../errors'
 import { hmac } from '@noble/hashes/hmac'
@@ -594,7 +594,7 @@ async function processRawTransaction(
 
   // Search log messages for SIP announcement
   for (const log of tx.meta.logMessages) {
-    if (!log.includes(SIP_MEMO_PREFIX)) continue
+    if (!log.includes(SIP_MEMO_PREFIX_ANY)) continue
 
     // Extract memo content from log
     const memoMatch = log.match(/Program log: (.+)/)

package/src/chains/solana/scan.ts

@@ -17,6 +17,7 @@ import {
 import {
   checkEd25519StealthAddress,
   deriveEd25519StealthPrivateKey,
+  deriveEd25519StealthPrivateKeyV1,
   solanaAddressToEd25519PublicKey,
 } from '../../stealth'
 import type { StealthAddress, HexString } from '@sip-protocol/types'
@@ -28,7 +29,7 @@ import type {
 } from './types'
 import { parseAnnouncement } from './types'
 import {
-  SIP_MEMO_PREFIX,
+  SIP_MEMO_PREFIX_ANY,
   MEMO_PROGRAM_ID,
   getExplorerUrl,
   DEFAULT_SCAN_LIMIT,
@@ -111,7 +112,7 @@ export async function scanForPayments(
 
         // Look for SIP announcement in logs
         for (const log of tx.meta.logMessages) {
-          if (!log.includes(SIP_MEMO_PREFIX)) continue
+          if (!log.includes(SIP_MEMO_PREFIX_ANY)) continue
 
           // Extract memo content from log
           const memoMatch = log.match(/Program log: (.+)/)
@@ -261,6 +262,7 @@ export async function claimStealthPayment(
     spendingPrivateKey,
     destinationAddress,
     mint,
+    version = '2',
   } = params
 
   // M7 FIX: Check SOL balance for fees before attempting claim
@@ -285,12 +287,11 @@ export async function claimStealthPayment(
     viewTag: 0, // Not needed for derivation
   }
 
-  // Derive stealth private key
-  const recovery = deriveEd25519StealthPrivateKey(
-    stealthAddressObj,
-    spendingPrivateKey,
-    viewingPrivateKey
-  )
+  // Derive stealth private key — route by announcement version:
+  // legacy SIP:1 (swapped scheme) vs canonical SIP:2 (EIP-5564).
+  const recovery = version === '1'
+    ? deriveEd25519StealthPrivateKeyV1(stealthAddressObj, spendingPrivateKey, viewingPrivateKey)
+    : deriveEd25519StealthPrivateKey(stealthAddressObj, spendingPrivateKey, viewingPrivateKey)
 
   // Create Solana keypair from derived private key
   // Note: ed25519 private keys in Solana are seeds, not raw scalars

package/src/chains/solana/stealth-scanner.ts

@@ -17,7 +17,7 @@ import type { StealthAddress, HexString } from '@sip-protocol/types'
 import { checkEd25519StealthAddress, solanaAddressToEd25519PublicKey } from '../../stealth'
 import { parseAnnouncement, type SolanaAnnouncement } from './types'
 import {
-  SIP_MEMO_PREFIX,
+  SIP_MEMO_PREFIX_ANY,
   MEMO_PROGRAM_ID,
   DEFAULT_SCAN_LIMIT,
   VIEW_TAG_MAX,
@@ -354,7 +354,7 @@ export class StealthScanner {
 
           // Look for SIP announcements in logs
           for (const log of tx.meta.logMessages) {
-            if (!log.includes(SIP_MEMO_PREFIX)) continue
+            if (!log.includes(SIP_MEMO_PREFIX_ANY)) continue
 
             const memoMatch = log.match(/Program log: (.+)/)
             if (!memoMatch) continue
@@ -421,7 +421,7 @@ export class StealthScanner {
         try {
           // Look for SIP announcements
           for (const log of logs.logs) {
-            if (!log.includes(SIP_MEMO_PREFIX)) continue
+            if (!log.includes(SIP_MEMO_PREFIX_ANY)) continue
 
             const memoMatch = log.match(/Program log: (.+)/)
             if (!memoMatch) continue

package/src/chains/solana/types.ts

@@ -147,6 +147,12 @@ export interface SolanaClaimParams {
   destinationAddress: string
   /** SPL token mint address */
   mint: PublicKey
+  /**
+   * Announcement scheme version of the payment being claimed.
+   * '2' (default) = canonical EIP-5564; '1' = legacy swapped (SIP:1) back-compat.
+   * Pass the `version` returned by {@link parseAnnouncement}.
+   */
+  version?: '1' | '2'
 }
 
 /**
@@ -167,6 +173,8 @@ export interface SolanaClaimResult {
  * Announcement data stored in transaction memo
  */
 export interface SolanaAnnouncement {
+  /** Announcement scheme version: '1' = legacy swapped, '2' = canonical EIP-5564 */
+  version: string
   /** Ephemeral public key (base58) */
   ephemeralPublicKey: string
   /** View tag for efficient scanning (hex, 1 byte) */
@@ -177,16 +185,21 @@ export interface SolanaAnnouncement {
 
 /**
  * Parse announcement from memo string
- * Format: SIP:1:<ephemeral_pubkey_base58>:<view_tag_hex>
+ * Format: SIP:<version>:<ephemeral_pubkey_base58>:<view_tag_hex>[:<stealth_address_base58>]
+ *
+ * Accepts SIP:1 (legacy swapped scheme) and SIP:2 (canonical EIP-5564); the
+ * detected version is returned so the claim path can route to the matching derivation.
  *
  * M4 FIX: Validates view tag is exactly 1-2 hex characters (1 byte)
  */
 export function parseAnnouncement(memo: string): SolanaAnnouncement | null {
-  if (!memo.startsWith('SIP:1:')) {
+  const versionMatch = /^SIP:([12]):/.exec(memo)
+  if (!versionMatch) {
     return null
   }
+  const version = versionMatch[1]
 
-  const parts = memo.slice(6).split(':')
+  const parts = memo.slice(versionMatch[0].length).split(':')
   if (parts.length < 2) {
     return null
   }
@@ -217,6 +230,7 @@ export function parseAnnouncement(memo: string): SolanaAnnouncement | null {
   }
 
   return {
+    version,
     ephemeralPublicKey,
     viewTag,
     stealthAddress,
@@ -231,7 +245,7 @@ export function createAnnouncementMemo(
   viewTag: string,
   stealthAddress?: string
 ): string {
-  const parts = ['SIP:1', ephemeralPublicKey, viewTag]
+  const parts = ['SIP:2', ephemeralPublicKey, viewTag]
   if (stealthAddress) {
     parts.push(stealthAddress)
   }

package/src/cosmos/ibc-stealth.ts

@@ -497,15 +497,15 @@ export class CosmosIBCStealthService {
         const viewingPrivKey = hexToBytes(`0x${bytesToHex(viewingKey)}`.slice(2))
         const spendingPrivKey = hexToBytes(spendingPrivateKey.slice(2))
 
-        // Compute stealth private key using EIP-5564 algorithm:
-        // 1. Compute shared secret: S = spendingPriv * ephemeralPub
-        const sharedSecretPoint = secp256k1.getSharedSecret(spendingPrivKey, ephemeralPubKey)
+        // Compute stealth private key using canonical EIP-5564:
+        // 1. Compute shared secret: S = viewingPriv * ephemeralPub (ECDH on the viewing key)
+        const sharedSecretPoint = secp256k1.getSharedSecret(viewingPrivKey, ephemeralPubKey)
         const sharedSecretHash = sha256(sharedSecretPoint)
 
-        // 2. Derive stealth private key: stealthPriv = viewingPriv + hash(S) mod n
-        const viewingPrivBigInt = bytesToBigInt(viewingPrivKey)
+        // 2. Derive stealth private key: stealthPriv = spendingPriv + hash(S) mod n
+        const spendingPrivBigInt = bytesToBigInt(spendingPrivKey)
         const hashBigInt = bytesToBigInt(sharedSecretHash)
-        const stealthPrivBigInt = (viewingPrivBigInt + hashBigInt) % secp256k1.CURVE.n
+        const stealthPrivBigInt = (spendingPrivBigInt + hashBigInt) % secp256k1.CURVE.n
 
         // Convert to bytes and then to compressed public key
         const stealthPrivKey = bigIntToBytes(stealthPrivBigInt, 32)

package/src/index.ts

@@ -88,6 +88,12 @@ export {
   generateEd25519StealthAddress,
   deriveEd25519StealthPrivateKey,
   checkEd25519StealthAddress,
+  // Legacy SIP:1 back-compat (claim/scan of pre-flip announcements)
+  deriveStealthPrivateKeyV1,
+  deriveEd25519StealthPrivateKeyV1,
+  checkEd25519StealthAddressV1,
+  deriveSecp256k1StealthPrivateKeyV1,
+  checkSecp256k1StealthAddressV1,
   // Solana address derivation
   ed25519PublicKeyToSolanaAddress,
   solanaAddressToEd25519PublicKey,