@dubsdotapp/expo 0.2.18 → 0.2.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dubsdotapp/expo",
-  "version": "0.2.18",
+  "version": "0.2.20",
   "description": "React Native SDK for the Dubs betting platform",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/hooks/useClaim.ts

@@ -10,7 +10,7 @@ export interface ClaimMutationResult {
 }
 
 export function useClaim() {
-  const { client, wallet } = useDubs();
+  const { client, wallet, connection } = useDubs();
   const [status, setStatus] = useState<MutationStatus>('idle');
   const [error, setError] = useState<Error | null>(null);
   const [data, setData] = useState<ClaimMutationResult | null>(null);
@@ -38,6 +38,7 @@ export function useClaim() {
       const signature = await signAndSendBase64Transaction(
         claimResult.transaction,
         wallet,
+        connection,
       );
       console.log('[useClaim] Step 2 done. Signature:', signature);
 

package/src/hooks/useCreateCustomGame.ts

@@ -12,7 +12,7 @@ export interface CreateCustomGameMutationResult {
 }
 
 export function useCreateCustomGame() {
-  const { client, wallet } = useDubs();
+  const { client, wallet, connection } = useDubs();
   const [status, setStatus] = useState<MutationStatus>('idle');
   const [error, setError] = useState<Error | null>(null);
   const [data, setData] = useState<CreateCustomGameMutationResult | null>(null);
@@ -40,6 +40,7 @@ export function useCreateCustomGame() {
       const signature = await signAndSendBase64Transaction(
         createResult.transaction,
         wallet,
+        connection,
       );
       console.log('[useCreateCustomGame] Step 2 done. Signature:', signature);
 

package/src/hooks/useCreateGame.ts

@@ -11,7 +11,7 @@ export interface CreateGameMutationResult {
 }
 
 export function useCreateGame() {
-  const { client, wallet } = useDubs();
+  const { client, wallet, connection } = useDubs();
   const [status, setStatus] = useState<MutationStatus>('idle');
   const [error, setError] = useState<Error | null>(null);
   const [data, setData] = useState<CreateGameMutationResult | null>(null);
@@ -39,6 +39,7 @@ export function useCreateGame() {
       const signature = await signAndSendBase64Transaction(
         createResult.transaction,
         wallet,
+        connection,
       );
       console.log('[useCreateGame] Step 2 done. Signature:', signature);
 

package/src/hooks/useJoinGame.ts

@@ -11,7 +11,7 @@ export interface JoinGameMutationResult {
 }
 
 export function useJoinGame() {
-  const { client, wallet } = useDubs();
+  const { client, wallet, connection } = useDubs();
   const [status, setStatus] = useState<MutationStatus>('idle');
   const [error, setError] = useState<Error | null>(null);
   const [data, setData] = useState<JoinGameMutationResult | null>(null);
@@ -39,6 +39,7 @@ export function useJoinGame() {
       const signature = await signAndSendBase64Transaction(
         joinResult.transaction,
         wallet,
+        connection,
       );
       console.log('[useJoinGame] Step 2 done. Signature:', signature);
 

package/src/managed-wallet.tsx

@@ -156,15 +156,22 @@ export function ManagedWalletProvider({
           return;
         }
 
-        // Clear any stale session — Phantom sessions don't survive across app/Phantom restarts.
-        // Always require a fresh connect to establish a valid encryption channel.
-        console.log(TAG, 'Phantom path — clearing any saved session, will require fresh connect');
-        await storage.deleteItem(STORAGE_KEYS.PHANTOM_SESSION).catch(() => {});
-
         try {
-          // Nothing to restore — fall through to show connect screen
+          const savedSession = await storage.getItem(STORAGE_KEYS.PHANTOM_SESSION);
+          if (savedSession && !cancelled) {
+            const session: PhantomSession = JSON.parse(savedSession);
+            console.log(TAG, 'Found saved Phantom session, restoring for wallet:', session.walletPublicKey);
+            phantom.restoreSession(session);
+            if (!cancelled) {
+              console.log(TAG, 'Phantom reconnected from saved session');
+              setConnected(true);
+            }
+          } else {
+            console.log(TAG, 'No saved Phantom session');
+          }
         } catch (err) {
-          console.log(TAG, 'Unexpected error during Phantom init:', err instanceof Error ? err.message : err);
+          console.log(TAG, 'Phantom session restore failed:', err instanceof Error ? err.message : err);
+          await storage.deleteItem(STORAGE_KEYS.PHANTOM_SESSION).catch(() => {});
         } finally {
           if (!cancelled) {
             console.log(TAG, 'Phantom init complete, marking ready');

package/src/utils/transaction.ts

@@ -1,13 +1,16 @@
-import { Transaction } from '@solana/web3.js';
+import { Transaction, Connection } from '@solana/web3.js';
 import type { WalletAdapter } from '../wallet/types';
 
 /**
  * Deserialize a base64-encoded transaction, sign via wallet adapter, send to Solana.
+ * Prefers signAndSendTransaction if available (MWA), otherwise falls back to
+ * signTransaction + sendRawTransaction via RPC (Phantom deeplinks).
  * Returns the transaction signature.
  */
 export async function signAndSendBase64Transaction(
   base64Tx: string,
   wallet: WalletAdapter,
+  connection: Connection,
 ): Promise<string> {
   if (!wallet.publicKey) throw new Error('Wallet not connected');
 
@@ -18,9 +21,13 @@ export async function signAndSendBase64Transaction(
   }
   const transaction = Transaction.from(bytes);
 
+  // Prefer signAndSendTransaction if wallet supports it (e.g. MWA)
   if (wallet.signAndSendTransaction) {
     return wallet.signAndSendTransaction(transaction);
   }
 
-  throw new Error('Wallet does not support signAndSendTransaction');
+  // Fallback: sign via wallet, then send via RPC
+  const signed = await wallet.signTransaction(transaction);
+  const signature = await connection.sendRawTransaction(signed.serialize());
+  return signature;
 }

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

@@ -141,7 +141,8 @@ export class PhantomDeeplinkAdapter implements WalletAdapter {
 
     const params = new URLSearchParams({
       dapp_encryption_public_key: dappPubBase58,
-      cluster: this.config.cluster || 'mainnet-beta',
+      // Force mainnet-beta for deeplink session — devnet sessions cause -32603 on signMessage
+      cluster: 'mainnet-beta',
       redirect_link: redirectLink,
       app_url: appUrl,
     });
@@ -236,46 +237,6 @@ export class PhantomDeeplinkAdapter implements WalletAdapter {
     return Transaction.from(bs58.decode(data.transaction));
   }
 
-  async signAndSendTransaction(transaction: Transaction): Promise<string> {
-    this.assertConnected();
-    console.log(TAG, 'signAndSendTransaction() — serializing transaction');
-
-    const serializedTx = bs58.encode(
-      transaction.serialize({ requireAllSignatures: false, verifySignatures: false }),
-    );
-    console.log(TAG, '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(TAG, `signAndSendTransaction() requestId=${requestId}`);
-
-    const params = new URLSearchParams({
-      dapp_encryption_public_key: bs58.encode(this._dappKeyPair!.publicKey),
-      nonce,
-      payload: ciphertext,
-      redirect_link: redirectLink,
-    });
-
-    const url = `https://phantom.app/ul/v1/signAndSendTransaction?${params.toString()}`;
-    console.log(TAG, 'Opening Phantom signAndSendTransaction deeplink...');
-    const response = await this.handler.send(url, requestId, this.timeout);
-    console.log(TAG, 'Received signAndSendTransaction response');
-
-    const data = decryptPayload(
-      response.params.data,
-      response.params.nonce,
-      this._sharedSecret!,
-    );
-    console.log(TAG, 'Transaction sent! Signature:', data.signature);
-
-    return data.signature as string;
-  }
-
   async signMessage(message: Uint8Array): Promise<Uint8Array> {
     this.assertConnected();
     console.log(TAG, 'signMessage() — message length:', message.length);