@dubsdotapp/expo 0.2.51 → 0.2.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dubsdotapp/expo",
-  "version": "0.2.51",
+  "version": "0.2.53",
   "description": "React Native SDK for the Dubs betting platform",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -25,14 +25,15 @@
   },
   "dependencies": {
     "bs58": "^5.0.0",
+    "expo-crypto": "~14.0.0",
     "tweetnacl": "^1.0.3"
   },
   "peerDependencies": {
     "@solana/web3.js": "^1.90.0",
-    "react": ">=18.0.0",
-    "react-native": ">=0.72.0",
+    "expo-device": ">=6.0.0",
     "expo-secure-store": ">=13.0.0",
-    "expo-device": ">=6.0.0"
+    "react": ">=18.0.0",
+    "react-native": ">=0.72.0"
   },
   "peerDependenciesMeta": {
     "expo-secure-store": {
@@ -48,8 +49,8 @@
   "devDependencies": {
     "@solana/web3.js": "^1.95.0",
     "@types/react": "^18.2.0",
-    "react": "^18.2.0",
     "expo-device": "^7.0.0",
+    "react": "^18.2.0",
     "react-native": "^0.73.0",
     "tsup": "^8.0.0",
     "typescript": "^5.3.0"

package/src/index.ts

@@ -1,3 +1,6 @@
+// Polyfill crypto.getRandomValues before anything else
+import './polyfill';
+
 // Core
 export { DubsClient } from './client';
 export type { DubsClientConfig } from './client';

package/src/polyfill.ts

@@ -0,0 +1,23 @@
+/**
+ * Polyfill crypto.getRandomValues for React Native environments.
+ *
+ * This runs once at SDK import time, before tweetnacl, @solana/web3.js,
+ * uuid, jayson, or any other dependency tries to use crypto.
+ *
+ * Must be imported as the very first line in src/index.ts.
+ */
+import { getRandomValues } from 'expo-crypto';
+
+if (typeof global !== 'undefined') {
+  if (typeof global.crypto !== 'object') {
+    (global as any).crypto = {};
+  }
+  if (typeof global.crypto.getRandomValues !== 'function') {
+    (global.crypto as any).getRandomValues = getRandomValues;
+  }
+}
+
+// Also polyfill `self` so tweetnacl's init finds crypto via self.crypto
+if (typeof self === 'undefined' && typeof globalThis !== 'undefined') {
+  (globalThis as any).self = globalThis;
+}

package/src/wallet/phantom-deeplink/crypto.ts

@@ -1,49 +1,6 @@
-import './ensure-self';
 import nacl from 'tweetnacl';
 import bs58 from 'bs58';
 
-// ── Lazy PRNG fallback ──
-// If tweetnacl's own init didn't find crypto (e.g. self polyfill didn't help,
-// or globalThis.crypto wasn't ready at module eval time), configure PRNG
-// on first use — by that time the Hermes runtime is fully initialized.
-let prngChecked = false;
-
-function ensurePRNG(): void {
-  if (prngChecked) return;
-  prngChecked = true;
-
-  try {
-    nacl.randomBytes(1);
-    return; // Already works
-  } catch {
-    // PRNG not configured — try fallbacks
-  }
-
-  // Try globalThis.crypto (Hermes / RN 0.76+)
-  const g = typeof globalThis !== 'undefined' ? globalThis : undefined;
-  if (g?.crypto?.getRandomValues) {
-    nacl.setPRNG((x: Uint8Array, n: number) => {
-      const v = new Uint8Array(n);
-      g.crypto.getRandomValues(v);
-      for (let i = 0; i < n; i++) x[i] = v[i];
-    });
-    return;
-  }
-
-  // Try expo-crypto
-  try {
-    const { getRandomValues } = require('expo-crypto');
-    nacl.setPRNG((x: Uint8Array, n: number) => {
-      const v = new Uint8Array(n);
-      getRandomValues(v);
-      for (let i = 0; i < n; i++) x[i] = v[i];
-    });
-    return;
-  } catch {}
-
-  console.error('[Dubs] No PRNG available — crypto operations will fail. Install expo-crypto or use Hermes.');
-}
-
 export interface KeyPair {
   publicKey: Uint8Array;
   secretKey: Uint8Array;
@@ -51,7 +8,6 @@ export interface KeyPair {
 
 /** Generate an x25519 keypair for Diffie-Hellman key exchange with Phantom. */
 export function generateKeyPair(): KeyPair {
-  ensurePRNG();
   const kp = nacl.box.keyPair();
   return { publicKey: kp.publicKey, secretKey: kp.secretKey };
 }
@@ -69,7 +25,6 @@ export function encryptPayload(
   payload: object,
   sharedSecret: Uint8Array,
 ): { nonce: string; ciphertext: string } {
-  ensurePRNG();
   const nonce = nacl.randomBytes(24);
   const message = new TextEncoder().encode(JSON.stringify(payload));
   const encrypted = nacl.box.after(message, nonce, sharedSecret);

package/src/wallet/phantom-deeplink/ensure-self.ts

@@ -1,9 +0,0 @@
-// Ensure `self` is defined for tweetnacl's PRNG initialization.
-// tweetnacl checks `self.crypto.getRandomValues` at import time.
-// In React Native custom dev builds, `self` may not be set, but
-// Hermes (RN 0.76+) provides `globalThis.crypto`. Bridge the gap.
-if (typeof self === 'undefined') {
-  if (typeof globalThis !== 'undefined') {
-    (globalThis as any).self = globalThis;
-  }
-}