@dubsdotapp/expo 0.2.19 → 0.2.21

package/dist/index.mjs

@@ -490,7 +490,7 @@ function createSecureStoreStorage() {
 
 // src/provider.tsx
 import { createContext as createContext3, useContext as useContext3, useMemo, useCallback as useCallback12, useState as useState12, useEffect as useEffect7 } from "react";
-import { Connection } from "@solana/web3.js";
+import { Connection as Connection2 } from "@solana/web3.js";
 
 // src/managed-wallet.tsx
 import { createContext, useContext, useState, useEffect, useRef, useCallback } from "react";
@@ -907,38 +907,6 @@ var PhantomDeeplinkAdapter = class {
     console.log(TAG2, "Decrypted signed transaction, length:", data.transaction?.length);
     return Transaction2.from(bs582.decode(data.transaction));
   }
-  async signAndSendTransaction(transaction) {
-    this.assertConnected();
-    console.log(TAG2, "signAndSendTransaction() \u2014 serializing transaction");
-    const serializedTx = bs582.encode(
-      transaction.serialize({ requireAllSignatures: false, verifySignatures: false })
-    );
-    console.log(TAG2, "Transaction serialized, length:", serializedTx.length);
-    const { nonce, ciphertext } = encryptPayload(
-      { transaction: serializedTx, session: this._sessionToken },
-      this._sharedSecret
-    );
-    const requestId = nextRequestId();
-    const redirectLink = this.config.redirectUri;
-    console.log(TAG2, `signAndSendTransaction() requestId=${requestId}`);
-    const params = new URLSearchParams({
-      dapp_encryption_public_key: bs582.encode(this._dappKeyPair.publicKey),
-      nonce,
-      payload: ciphertext,
-      redirect_link: redirectLink
-    });
-    const url = `https://phantom.app/ul/v1/signAndSendTransaction?${params.toString()}`;
-    console.log(TAG2, "Opening Phantom signAndSendTransaction deeplink...");
-    const response = await this.handler.send(url, requestId, this.timeout);
-    console.log(TAG2, "Received signAndSendTransaction response");
-    const data = decryptPayload(
-      response.params.data,
-      response.params.nonce,
-      this._sharedSecret
-    );
-    console.log(TAG2, "Transaction sent! Signature:", data.signature);
-    return data.signature;
-  }
   async signMessage(message) {
     this.assertConnected();
     console.log(TAG2, "signMessage() \u2014 message length:", message.length);
@@ -1270,12 +1238,23 @@ function ManagedWalletProvider({
           }
           return;
         }
-        console.log(TAG3, "Phantom path \u2014 clearing any saved session, will require fresh connect");
-        await storage.deleteItem(STORAGE_KEYS.PHANTOM_SESSION).catch(() => {
-        });
         try {
+          const savedSession = await storage.getItem(STORAGE_KEYS.PHANTOM_SESSION);
+          if (savedSession && !cancelled) {
+            const session = JSON.parse(savedSession);
+            console.log(TAG3, "Found saved Phantom session, restoring for wallet:", session.walletPublicKey);
+            phantom.restoreSession(session);
+            if (!cancelled) {
+              console.log(TAG3, "Phantom reconnected from saved session");
+              setConnected(true);
+            }
+          } else {
+            console.log(TAG3, "No saved Phantom session");
+          }
         } catch (err) {
-          console.log(TAG3, "Unexpected error during Phantom init:", err instanceof Error ? err.message : err);
+          console.log(TAG3, "Phantom session restore failed:", err instanceof Error ? err.message : err);
+          await storage.deleteItem(STORAGE_KEYS.PHANTOM_SESSION).catch(() => {
+          });
         } finally {
           if (!cancelled) {
             console.log(TAG3, "Phantom init complete, marking ready");
@@ -1390,7 +1369,7 @@ import {
   StyleSheet as StyleSheet2,
   Keyboard,
   KeyboardAvoidingView,
-  Platform as Platform2,
+  Platform as Platform3,
   Image as Image2,
   Animated,
   ScrollView
@@ -1505,7 +1484,7 @@ import { useState as useState6, useCallback as useCallback6 } from "react";
 
 // src/utils/transaction.ts
 import { Transaction as Transaction3 } from "@solana/web3.js";
-async function signAndSendBase64Transaction(base64Tx, wallet) {
+async function signAndSendBase64Transaction(base64Tx, wallet, connection) {
   if (!wallet.publicKey) throw new Error("Wallet not connected");
   const binaryStr = atob(base64Tx);
   const bytes = new Uint8Array(binaryStr.length);
@@ -1516,12 +1495,14 @@ async function signAndSendBase64Transaction(base64Tx, wallet) {
   if (wallet.signAndSendTransaction) {
     return wallet.signAndSendTransaction(transaction);
   }
-  throw new Error("Wallet does not support signAndSendTransaction");
+  const signed = await wallet.signTransaction(transaction);
+  const signature = await connection.sendRawTransaction(signed.serialize());
+  return signature;
 }
 
 // src/hooks/useCreateGame.ts
 function useCreateGame() {
-  const { client, wallet } = useDubs();
+  const { client, wallet, connection } = useDubs();
   const [status, setStatus] = useState6("idle");
   const [error, setError] = useState6(null);
   const [data, setData] = useState6(null);
@@ -1542,7 +1523,8 @@ function useCreateGame() {
       console.log("[useCreateGame] Step 2: Signing and sending...");
       const signature = await signAndSendBase64Transaction(
         createResult.transaction,
-        wallet
+        wallet,
+        connection
       );
       console.log("[useCreateGame] Step 2 done. Signature:", signature);
       setStatus("confirming");
@@ -1582,7 +1564,7 @@ function useCreateGame() {
 // src/hooks/useJoinGame.ts
 import { useState as useState7, useCallback as useCallback7 } from "react";
 function useJoinGame() {
-  const { client, wallet } = useDubs();
+  const { client, wallet, connection } = useDubs();
   const [status, setStatus] = useState7("idle");
   const [error, setError] = useState7(null);
   const [data, setData] = useState7(null);
@@ -1603,7 +1585,8 @@ function useJoinGame() {
       console.log("[useJoinGame] Step 2: Signing and sending transaction...");
       const signature = await signAndSendBase64Transaction(
         joinResult.transaction,
-        wallet
+        wallet,
+        connection
       );
       console.log("[useJoinGame] Step 2 done. Signature:", signature);
       setStatus("confirming");
@@ -1644,7 +1627,7 @@ function useJoinGame() {
 // src/hooks/useClaim.ts
 import { useState as useState8, useCallback as useCallback8 } from "react";
 function useClaim() {
-  const { client, wallet } = useDubs();
+  const { client, wallet, connection } = useDubs();
   const [status, setStatus] = useState8("idle");
   const [error, setError] = useState8(null);
   const [data, setData] = useState8(null);
@@ -1665,7 +1648,8 @@ function useClaim() {
       console.log("[useClaim] Step 2: Signing and sending...");
       const signature = await signAndSendBase64Transaction(
         claimResult.transaction,
-        wallet
+        wallet,
+        connection
       );
       console.log("[useClaim] Step 2 done. Signature:", signature);
       const explorerUrl = `https://solscan.io/tx/${signature}`;
@@ -1692,7 +1676,7 @@ function useClaim() {
 // src/hooks/useCreateCustomGame.ts
 import { useState as useState9, useCallback as useCallback9 } from "react";
 function useCreateCustomGame() {
-  const { client, wallet } = useDubs();
+  const { client, wallet, connection } = useDubs();
   const [status, setStatus] = useState9("idle");
   const [error, setError] = useState9(null);
   const [data, setData] = useState9(null);
@@ -1713,7 +1697,8 @@ function useCreateCustomGame() {
       console.log("[useCreateCustomGame] Step 2: Signing and sending...");
       const signature = await signAndSendBase64Transaction(
         createResult.transaction,
-        wallet
+        wallet,
+        connection
       );
       console.log("[useCreateCustomGame] Step 2 done. Signature:", signature);
       setStatus("confirming");
@@ -1759,6 +1744,45 @@ import bs583 from "bs58";
 import { createContext as createContext2 } from "react";
 var AuthContext = createContext2(null);
 
+// src/utils/device.ts
+import { Platform as Platform2 } from "react-native";
+async function getDeviceInfo() {
+  try {
+    const Device = __require("expo-device");
+    return {
+      platform: Platform2.OS,
+      modelName: Device.modelName,
+      brand: Device.brand,
+      manufacturer: Device.manufacturer,
+      osName: Device.osName,
+      osVersion: Device.osVersion,
+      deviceType: Device.deviceType,
+      deviceName: Device.deviceName,
+      totalMemory: Device.totalMemory,
+      modelId: Device.modelId,
+      designName: Device.designName,
+      productName: Device.productName,
+      isDevice: Device.isDevice
+    };
+  } catch {
+    return {
+      platform: Platform2.OS,
+      modelName: null,
+      brand: null,
+      manufacturer: null,
+      osName: null,
+      osVersion: null,
+      deviceType: null,
+      deviceName: null,
+      totalMemory: null,
+      modelId: null,
+      designName: null,
+      productName: null,
+      isDevice: null
+    };
+  }
+}
+
 // src/hooks/useAuth.ts
 function useAuth() {
   const sharedAuth = useContext2(AuthContext);
@@ -1787,15 +1811,17 @@ function useAuth() {
       setStatus("authenticating");
       setError(null);
       const walletAddress = wallet.publicKey.toBase58();
+      const deviceInfo = await getDeviceInfo();
+      console.log("[useAuth] Device info:", JSON.stringify(deviceInfo, null, 2));
       const { nonce, message } = await client.getNonce(walletAddress);
       setStatus("signing");
       const messageBytes = new TextEncoder().encode(message);
       const signatureBytes = await wallet.signMessage(messageBytes);
       const signature = bs583.encode(signatureBytes);
       setStatus("verifying");
-      const result = await client.authenticate({ walletAddress, signature, nonce });
+      const result = await client.authenticate({ walletAddress, signature, nonce, deviceInfo });
       if (result.needsRegistration) {
-        pendingAuth.current = { walletAddress, nonce, signature };
+        pendingAuth.current = { walletAddress, nonce, signature, deviceInfo };
         setStatus("needsRegistration");
         return;
       }
@@ -1821,7 +1847,8 @@ function useAuth() {
         nonce: pending.nonce,
         username,
         referralCode,
-        avatarUrl
+        avatarUrl,
+        deviceInfo: pending.deviceInfo
       });
       pendingAuth.current = null;
       const user2 = avatarUrl && !result.user.avatar ? { ...result.user, avatar: avatarUrl } : result.user;
@@ -2292,7 +2319,7 @@ function DefaultRegistrationScreen({
     KeyboardAvoidingView,
     {
       style: [s.container, { backgroundColor: t.background }],
-      behavior: Platform2.OS === "ios" ? "padding" : void 0,
+      behavior: Platform3.OS === "ios" ? "padding" : void 0,
       children: /* @__PURE__ */ jsx3(
         ScrollView,
         {
@@ -2402,7 +2429,7 @@ function DubsProvider({
   const rpcUrl = rpcUrlOverride || config.rpcUrl;
   const cluster = config.cluster;
   const client = useMemo(() => new DubsClient({ apiKey, baseUrl }), [apiKey, baseUrl]);
-  const connection = useMemo(() => new Connection(rpcUrl, { commitment: "confirmed" }), [rpcUrl]);
+  const connection = useMemo(() => new Connection2(rpcUrl, { commitment: "confirmed" }), [rpcUrl]);
   const storage = useMemo(() => tokenStorage || createSecureStoreStorage(), [tokenStorage]);
   const [uiConfig, setUiConfig] = useState12(null);
   useEffect7(() => {
@@ -3266,7 +3293,7 @@ import {
   Animated as Animated2,
   StyleSheet as StyleSheet10,
   KeyboardAvoidingView as KeyboardAvoidingView2,
-  Platform as Platform3
+  Platform as Platform4
 } from "react-native";
 import { jsx as jsx12, jsxs as jsxs10 } from "react/jsx-runtime";
 var STATUS_LABELS2 = {
@@ -3378,7 +3405,7 @@ function CreateCustomGameSheet({
           KeyboardAvoidingView2,
           {
             style: styles9.keyboardView,
-            behavior: Platform3.OS === "ios" ? "padding" : void 0,
+            behavior: Platform4.OS === "ios" ? "padding" : void 0,
             children: /* @__PURE__ */ jsx12(View10, { style: styles9.sheetPositioner, children: /* @__PURE__ */ jsxs10(View10, { style: [styles9.sheet, { backgroundColor: t.background }], children: [
               /* @__PURE__ */ jsx12(View10, { style: styles9.handleRow, children: /* @__PURE__ */ jsx12(View10, { style: [styles9.handle, { backgroundColor: t.textMuted }] }) }),
               /* @__PURE__ */ jsxs10(View10, { style: styles9.header, children: [
@@ -3638,6 +3665,7 @@ export {
   SettingsSheet,
   UserProfileCard,
   createSecureStoreStorage,
+  getDeviceInfo,
   mergeTheme,
   parseSolanaError,
   signAndSendBase64Transaction,