@dubsdotapp/expo 0.2.18 → 0.2.20

package/dist/index.d.mts

@@ -625,7 +625,6 @@ declare class PhantomDeeplinkAdapter implements WalletAdapter {
     connect(): Promise<void>;
     disconnect(): void;
     signTransaction(transaction: Transaction): Promise<Transaction>;
-    signAndSendTransaction(transaction: Transaction): Promise<string>;
     signMessage(message: Uint8Array): Promise<Uint8Array>;
     /** Remove the Linking event listener. Call when the adapter is no longer needed. */
     destroy(): void;
@@ -864,8 +863,10 @@ declare function CreateCustomGameSheet({ visible, onDismiss, title, maxPlayers,
 
 /**
  * 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.
  */
-declare function signAndSendBase64Transaction(base64Tx: string, wallet: WalletAdapter): Promise<string>;
+declare function signAndSendBase64Transaction(base64Tx: string, wallet: WalletAdapter, connection: Connection): Promise<string>;
 
 export { AuthGate, type AuthGateProps, type AuthStatus, type AuthenticateParams, type AuthenticateResult, type Bettor, type BuildClaimParams, type BuildClaimResult, type CheckUsernameResult, type ClaimMutationResult, type ConfirmGameParams, type ConfirmGameResult, ConnectWalletScreen, type ConnectWalletScreenProps, type CreateCustomGameMutationResult, type CreateCustomGameParams, type CreateCustomGameResult, CreateCustomGameSheet, type CreateCustomGameSheetProps, type CreateGameMutationResult, type CreateGameParams, type CreateGameResult, DEFAULT_BASE_URL, DEFAULT_RPC_URL, DubsApiError, type DubsAppUser, DubsClient, type DubsClientConfig, type DubsContextValue, type DubsNetwork, DubsProvider, type DubsProviderProps, type DubsPublicUser, type DubsTheme, type DubsUser, type EsportsMatchDetail, type EsportsMatchOpponent, type EsportsMatchResult, type EventMedia, type EventMeta, type EventStream, type GameDetail, type GameListItem, type GameListOpponent, type GameMedia, GamePoster, type GamePosterProps, type GetGamesParams, type GetNetworkGamesParams, type GetUpcomingEventsParams, JoinGameButton, type JoinGameButtonProps, type JoinGameMutationResult, type JoinGameParams, type JoinGameResult, LivePoolsCard, type LivePoolsCardProps, type LiveScore, type LiveScoreCompetitor, type MutationResult, type MutationStatus, type MwaAdapterConfig, type MwaTransactFn, MwaWalletAdapter, NETWORK_CONFIG, type NonceResult, type Opponent, type Pagination, type ParsedError, PhantomDeeplinkAdapter, type PhantomDeeplinkAdapterConfig, type PhantomSession, PickWinnerCard, type PickWinnerCardProps, PlayersCard, type PlayersCardProps, type QueryResult, type RegisterParams, type RegisterResult, type RegistrationScreenProps, SOLANA_PROGRAM_ERRORS, STORAGE_KEYS, SettingsSheet, type SettingsSheetProps, type SolanaErrorCode, type TokenStorage, type UiConfig, type UnifiedEvent, type UseAuthResult, UserProfileCard, type UserProfileCardProps, type ValidateEventResult, type WalletAdapter, createSecureStoreStorage, mergeTheme, parseSolanaError, signAndSendBase64Transaction, useAppConfig, useAuth, useClaim, useCreateCustomGame, useCreateGame, useDubs, useDubsTheme, useEvents, useGame, useGames, useJoinGame, useNetworkGames };

package/dist/index.d.ts

@@ -625,7 +625,6 @@ declare class PhantomDeeplinkAdapter implements WalletAdapter {
     connect(): Promise<void>;
     disconnect(): void;
     signTransaction(transaction: Transaction): Promise<Transaction>;
-    signAndSendTransaction(transaction: Transaction): Promise<string>;
     signMessage(message: Uint8Array): Promise<Uint8Array>;
     /** Remove the Linking event listener. Call when the adapter is no longer needed. */
     destroy(): void;
@@ -864,8 +863,10 @@ declare function CreateCustomGameSheet({ visible, onDismiss, title, maxPlayers,
 
 /**
  * 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.
  */
-declare function signAndSendBase64Transaction(base64Tx: string, wallet: WalletAdapter): Promise<string>;
+declare function signAndSendBase64Transaction(base64Tx: string, wallet: WalletAdapter, connection: Connection): Promise<string>;
 
 export { AuthGate, type AuthGateProps, type AuthStatus, type AuthenticateParams, type AuthenticateResult, type Bettor, type BuildClaimParams, type BuildClaimResult, type CheckUsernameResult, type ClaimMutationResult, type ConfirmGameParams, type ConfirmGameResult, ConnectWalletScreen, type ConnectWalletScreenProps, type CreateCustomGameMutationResult, type CreateCustomGameParams, type CreateCustomGameResult, CreateCustomGameSheet, type CreateCustomGameSheetProps, type CreateGameMutationResult, type CreateGameParams, type CreateGameResult, DEFAULT_BASE_URL, DEFAULT_RPC_URL, DubsApiError, type DubsAppUser, DubsClient, type DubsClientConfig, type DubsContextValue, type DubsNetwork, DubsProvider, type DubsProviderProps, type DubsPublicUser, type DubsTheme, type DubsUser, type EsportsMatchDetail, type EsportsMatchOpponent, type EsportsMatchResult, type EventMedia, type EventMeta, type EventStream, type GameDetail, type GameListItem, type GameListOpponent, type GameMedia, GamePoster, type GamePosterProps, type GetGamesParams, type GetNetworkGamesParams, type GetUpcomingEventsParams, JoinGameButton, type JoinGameButtonProps, type JoinGameMutationResult, type JoinGameParams, type JoinGameResult, LivePoolsCard, type LivePoolsCardProps, type LiveScore, type LiveScoreCompetitor, type MutationResult, type MutationStatus, type MwaAdapterConfig, type MwaTransactFn, MwaWalletAdapter, NETWORK_CONFIG, type NonceResult, type Opponent, type Pagination, type ParsedError, PhantomDeeplinkAdapter, type PhantomDeeplinkAdapterConfig, type PhantomSession, PickWinnerCard, type PickWinnerCardProps, PlayersCard, type PlayersCardProps, type QueryResult, type RegisterParams, type RegisterResult, type RegistrationScreenProps, SOLANA_PROGRAM_ERRORS, STORAGE_KEYS, SettingsSheet, type SettingsSheetProps, type SolanaErrorCode, type TokenStorage, type UiConfig, type UnifiedEvent, type UseAuthResult, UserProfileCard, type UserProfileCardProps, type ValidateEventResult, type WalletAdapter, createSecureStoreStorage, mergeTheme, parseSolanaError, signAndSendBase64Transaction, useAppConfig, useAuth, useClaim, useCreateCustomGame, useCreateGame, useDubs, useDubsTheme, useEvents, useGame, useGames, useJoinGame, useNetworkGames };

package/dist/index.js

@@ -895,7 +895,8 @@ var PhantomDeeplinkAdapter = class {
     console.log(TAG2, "Using app_url:", appUrl);
     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
     });
@@ -970,38 +971,6 @@ var PhantomDeeplinkAdapter = class {
     console.log(TAG2, "Decrypted signed transaction, length:", data.transaction?.length);
     return import_web32.Transaction.from(import_bs582.default.decode(data.transaction));
   }
-  async signAndSendTransaction(transaction) {
-    this.assertConnected();
-    console.log(TAG2, "signAndSendTransaction() \u2014 serializing transaction");
-    const serializedTx = import_bs582.default.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: import_bs582.default.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);
@@ -1326,12 +1295,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");
@@ -1548,7 +1528,7 @@ var import_react6 = require("react");
 
 // src/utils/transaction.ts
 var import_web33 = require("@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);
@@ -1559,12 +1539,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] = (0, import_react6.useState)("idle");
   const [error, setError] = (0, import_react6.useState)(null);
   const [data, setData] = (0, import_react6.useState)(null);
@@ -1585,7 +1567,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");
@@ -1625,7 +1608,7 @@ function useCreateGame() {
 // src/hooks/useJoinGame.ts
 var import_react7 = require("react");
 function useJoinGame() {
-  const { client, wallet } = useDubs();
+  const { client, wallet, connection } = useDubs();
   const [status, setStatus] = (0, import_react7.useState)("idle");
   const [error, setError] = (0, import_react7.useState)(null);
   const [data, setData] = (0, import_react7.useState)(null);
@@ -1646,7 +1629,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");
@@ -1687,7 +1671,7 @@ function useJoinGame() {
 // src/hooks/useClaim.ts
 var import_react8 = require("react");
 function useClaim() {
-  const { client, wallet } = useDubs();
+  const { client, wallet, connection } = useDubs();
   const [status, setStatus] = (0, import_react8.useState)("idle");
   const [error, setError] = (0, import_react8.useState)(null);
   const [data, setData] = (0, import_react8.useState)(null);
@@ -1708,7 +1692,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}`;
@@ -1735,7 +1720,7 @@ function useClaim() {
 // src/hooks/useCreateCustomGame.ts
 var import_react9 = require("react");
 function useCreateCustomGame() {
-  const { client, wallet } = useDubs();
+  const { client, wallet, connection } = useDubs();
   const [status, setStatus] = (0, import_react9.useState)("idle");
   const [error, setError] = (0, import_react9.useState)(null);
   const [data, setData] = (0, import_react9.useState)(null);
@@ -1756,7 +1741,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");