@aptos-labs/wallet-adapter-core 8.0.0-xchaininit2.0 → 8.0.0

package/src/WalletCore.ts

@@ -100,6 +100,8 @@ import {
 export type AdapterWallet = AptosWallet & {
   readyState?: WalletReadyState;
   isAptosNativeWallet?: boolean;
+  /** A fallback wallet to use when this wallet is not installed */
+  fallbackWallet?: AdapterWallet;
 };
 
 // An adapter not detected wallet types is a wallet that is compatible with the wallet standard but not detected
@@ -149,6 +151,7 @@ export declare interface WalletCoreEvents {
   connect(account: AccountInfo | null): void;
   disconnect(): void;
   standardWalletsAdded(wallets: AdapterWallet): void;
+  standardWalletsHiddenAdded(wallets: AdapterWallet): void;
   standardNotDetectedWalletAdded(wallets: AdapterNotDetectedWallet): void;
   networkChange(network: NetworkInfo | null): void;
   accountChange(account: AccountInfo | null): void;
@@ -172,6 +175,9 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   // Local array that holds all the wallets that are AIP-62 standard compatible but are not installed on the user machine
   private _standard_not_detected_wallets: AdapterNotDetectedWallet[] = [];
 
+  // Local array that holds all the wallets that are AIP-62 standard compatible but are hidden from normal display and that are installed on the user machine
+  private _standard_wallets_hidden: AdapterWallet[] = [];
+
   // Local private variable to hold the network that is currently connected
   private _network: NetworkInfo | null = null;
 
@@ -190,6 +196,9 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   // Private array that holds all the Wallets a dapp decided to opt-in to
   private _optInWallets: ReadonlyArray<AvailableWallets> = [];
 
+  // Private array that holds all the Wallets a dapp decided to hide from normal display
+  private _hideWallets: ReadonlyArray<AvailableWallets> = [];
+
   // Local flag to disable the adapter telemetry tool
   private _disableTelemetry: boolean = false;
 
@@ -199,10 +208,12 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   constructor(
     optInWallets?: ReadonlyArray<AvailableWallets>,
     dappConfig?: DappConfig,
-    disableTelemetry?: boolean
+    disableTelemetry?: boolean,
+    hideWallets: ReadonlyArray<AvailableWallets> = ["Petra Web"],
   ) {
     super();
     this._optInWallets = optInWallets || [];
+    this._hideWallets = hideWallets;
     this._dappConfig = dappConfig;
     this._disableTelemetry = disableTelemetry ?? false;
     this._sdkWallets = getSDKWallets(this._dappConfig);
@@ -246,7 +257,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @param extensionwWallets
    */
   private setExtensionAIP62Wallets(
-    extensionwWallets: readonly AptosWallet[]
+    extensionwWallets: readonly AptosWallet[],
   ): void {
     extensionwWallets.map((wallet: AdapterWallet) => {
       if (this.excludeWallet(wallet)) {
@@ -263,22 +274,27 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       if (isValid) {
         // check if we already have this wallet as a not detected wallet
         const index = this._standard_not_detected_wallets.findIndex(
-          (notDetctedWallet) => notDetctedWallet.name == wallet.name
+          (notDetctedWallet) => notDetctedWallet.name == wallet.name,
         );
         // if we do, remove it from the not detected wallets array as it is now become detected
         if (index !== -1) {
           this._standard_not_detected_wallets.splice(index, 1);
         }
 
-        // ✅ Check if wallet already exists in _standard_wallets
-        const alreadyExists = this._standard_wallets.some(
-          (w) => w.name === wallet.name
-        );
+        // ✅ Check if wallet already exists in _standard_wallets or _standard_wallets_hidden
+        const alreadyExists =
+          this._standard_wallets.some((w) => w.name === wallet.name) ||
+          this._standard_wallets_hidden.some((w) => w.name === wallet.name);
         if (!alreadyExists) {
           wallet.readyState = WalletReadyState.Installed;
           wallet.isAptosNativeWallet = this.isAptosNativeWallet(wallet);
-          this._standard_wallets.push(wallet);
-          this.emit("standardWalletsAdded", wallet);
+          if (!this.hideWallet(wallet)) {
+            this._standard_wallets.push(wallet);
+            this.emit("standardWalletsAdded", wallet);
+          } else {
+            this._standard_wallets_hidden.push(wallet);
+            this.emit("standardWalletsHiddenAdded", wallet);
+          }
         }
       }
     });
@@ -297,7 +313,11 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       if (isValid) {
         wallet.readyState = WalletReadyState.Installed;
         wallet.isAptosNativeWallet = this.isAptosNativeWallet(wallet);
-        this._standard_wallets.push(wallet);
+        if (!this.hideWallet(wallet)) {
+          this._standard_wallets.push(wallet);
+        } else {
+          this._standard_wallets_hidden.push(wallet);
+        }
       }
     });
   }
@@ -322,9 +342,13 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     // Loop over the registry map
     walletRegistry.map((supportedWallet: AptosStandardSupportedWallet) => {
       // Check if we already have this wallet as a detected AIP-62 wallet standard
-      const existingStandardWallet = this._standard_wallets.find(
-        (wallet) => wallet.name == supportedWallet.name
-      );
+      const existingStandardWallet =
+        this._standard_wallets.find(
+          (wallet) => wallet.name === supportedWallet.name,
+        ) ||
+        this._standard_wallets_hidden.find(
+          (wallet) => wallet.name === supportedWallet.name,
+        );
       // If it is detected, it means the user has the wallet installed, so dont add it to the wallets array
       if (existingStandardWallet) {
         return;
@@ -364,6 +388,19 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     return false;
   }
 
+  /**
+   * A function that hides an AIP-62 compatible wallet from normal display.
+   *
+   * @param wallet AdapterWallet | AdapterNotDetectedWallet
+   * @returns boolean
+   */
+  hideWallet(wallet: AdapterWallet | AdapterNotDetectedWallet): boolean {
+    return (
+      this._hideWallets.length > 0 &&
+      this._hideWallets.includes(wallet.name as AvailableWallets)
+    );
+  }
+
   private recordEvent(eventName: string, additionalInfo?: object): void {
     this.ga4?.gtag("event", `wallet_adapter_${eventName}`, {
       wallet: this._wallet?.name,
@@ -381,7 +418,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @param wallet A wallet
    */
   private ensureWalletExists(
-    wallet: AdapterWallet | null
+    wallet: AdapterWallet | null,
   ): asserts wallet is AdapterWallet {
     if (!wallet) {
       throw new WalletNotConnectedError().name;
@@ -396,7 +433,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @param account An account
    */
   private ensureAccountExists(
-    account: AccountInfo | null
+    account: AccountInfo | null,
   ): asserts account is AccountInfo {
     if (!account) {
       throw new WalletAccountError("Account is not set").name;
@@ -490,6 +527,13 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     return this._standard_wallets;
   }
 
+  /**
+   * Getter to fetch all hidden wallets
+   */
+  get hiddenWallets(): ReadonlyArray<AdapterWallet> {
+    return this._standard_wallets_hidden;
+  }
+
   get notDetectedWallets(): ReadonlyArray<AdapterNotDetectedWallet> {
     return this._standard_not_detected_wallets;
   }
@@ -547,7 +591,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     // Check if we are in a redirectable view (i.e on mobile AND not in an in-app browser)
     if (isRedirectable()) {
       const selectedWallet = this._standard_not_detected_wallets.find(
-        (wallet: AdapterNotDetectedWallet) => wallet.name === walletName
+        (wallet: AdapterNotDetectedWallet) => wallet.name === walletName,
       );
 
       if (selectedWallet) {
@@ -576,10 +620,13 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     }
 
     // Checks the wallet exists in the detected wallets array
-    const allDetectedWallets = this._standard_wallets;
+    const allDetectedWallets = [
+      ...this._standard_wallets,
+      ...this._standard_wallets_hidden,
+    ];
 
     const selectedWallet = allDetectedWallets.find(
-      (wallet: AdapterWallet) => wallet.name === walletName
+      (wallet: AdapterWallet) => wallet.name === walletName,
     );
 
     if (!selectedWallet) return;
@@ -589,7 +636,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       // if the selected wallet is already connected, we don't need to connect again
       if (this._wallet?.name === walletName)
         throw new WalletConnectionError(
-          `${walletName} wallet is already connected`
+          `${walletName} wallet is already connected`,
         ).message;
     }
 
@@ -622,7 +669,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
     const allDetectedWallets = this._standard_wallets;
     const selectedWallet = allDetectedWallets.find(
-      (wallet: AdapterWallet) => wallet.name === walletName
+      (wallet: AdapterWallet) => wallet.name === walletName,
     );
 
     if (!selectedWallet) {
@@ -631,14 +678,14 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
     if (!selectedWallet.features["aptos:signIn"]) {
       throw new WalletNotSupportedMethod(
-        `aptos:signIn is not supported by ${walletName}`
+        `aptos:signIn is not supported by ${walletName}`,
       ).message;
     }
 
     return await this.connectWallet(selectedWallet, async () => {
       if (!selectedWallet.features["aptos:signIn"]) {
         throw new WalletNotSupportedMethod(
-          `aptos:signIn is not supported by ${selectedWallet.name}`
+          `aptos:signIn is not supported by ${selectedWallet.name}`,
         ).message;
       }
 
@@ -664,7 +711,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    */
   private async connectWallet<T>(
     selectedWallet: AdapterWallet,
-    onConnect: () => Promise<{ account: AccountInfo; output: T }>
+    onConnect: () => Promise<{ account: AccountInfo; output: T }>,
   ): Promise<T> {
     try {
       this._connecting = true;
@@ -715,7 +762,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @returns AptosSignAndSubmitTransactionOutput
    */
   async signAndSubmitTransaction(
-    transactionInput: InputTransactionData
+    transactionInput: InputTransactionData,
   ): Promise<AptosSignAndSubmitTransactionOutput> {
     try {
       if ("function" in transactionInput.data) {
@@ -766,7 +813,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
           });
 
           type AptosSignAndSubmitTransactionV1Method = (
-            transaction: AnyRawTransaction
+            transaction: AnyRawTransaction,
           ) => Promise<UserResponse<AptosSignAndSubmitTransactionOutput>>;
 
           const signAndSubmitTransactionMethod = this._wallet.features[
@@ -775,7 +822,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
             .signAndSubmitTransaction as unknown as AptosSignAndSubmitTransactionV1Method;
 
           const response = (await signAndSubmitTransactionMethod(
-            transaction
+            transaction,
           )) as UserResponse<AptosSignAndSubmitTransactionOutput>;
 
           if (response.status === UserResponseStatus.REJECTED) {
@@ -871,7 +918,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
           "aptos:signTransaction"
         ].signTransaction(
           transactionOrPayload,
-          asFeePayer
+          asFeePayer,
         )) as UserResponse<AccountAuthenticator>;
         if (response.status === UserResponseStatus.REJECTED) {
           throw new WalletConnectionError("User has rejected the request")
@@ -907,7 +954,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
           AptosSignTransactionMethodV1_1;
 
         const response = (await walletSignTransactionMethod(
-          signTransactionV1_1StandardInput
+          signTransactionV1_1StandardInput,
         )) as UserResponse<AptosSignTransactionOutputV1_1>;
         if (response.status === UserResponseStatus.REJECTED) {
           throw new WalletConnectionError("User has rejected the request")
@@ -933,7 +980,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
           "aptos:signTransaction"
         ].signTransaction(
           transaction,
-          asFeePayer
+          asFeePayer,
         )) as UserResponse<AccountAuthenticator>;
         if (response.status === UserResponseStatus.REJECTED) {
           throw new WalletConnectionError("User has rejected the request")
@@ -960,7 +1007,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @throws WalletSignMessageError
    */
   async signMessage(
-    message: AptosSignMessageInput
+    message: AptosSignMessageInput,
   ): Promise<AptosSignMessageOutput> {
     try {
       this.ensureWalletExists(this._wallet);
@@ -986,7 +1033,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @returns PendingTransactionResponse
    */
   async submitTransaction(
-    transaction: InputSubmitTransactionData
+    transaction: InputSubmitTransactionData,
   ): Promise<PendingTransactionResponse> {
     // The standard does not support submitTransaction, so we use the adapter to submit the transaction
     try {
@@ -1032,7 +1079,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
           await this.setAnsName();
           this.recordEvent("account_change");
           this.emit("accountChange", this._account);
-        }
+        },
       );
     } catch (error: any) {
       const errMsg = generalizedErrorMessage(error);
@@ -1053,7 +1100,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
           this.setNetwork(data);
           await this.setAnsName();
           this.emit("networkChange", this._network);
-        }
+        },
       );
     } catch (error: any) {
       const errMsg = generalizedErrorMessage(error);
@@ -1087,7 +1134,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       if (this._wallet.features["aptos:changeNetwork"]) {
         const response =
           await this._wallet.features["aptos:changeNetwork"].changeNetwork(
-            networkInfo
+            networkInfo,
           );
         if (response.status === UserResponseStatus.REJECTED) {
           throw new WalletConnectionError("User has rejected the request")
@@ -1097,7 +1144,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       }
 
       throw new WalletChangeNetworkError(
-        `${this._wallet.name} does not support changing network request`
+        `${this._wallet.name} does not support changing network request`,
       ).message;
     } catch (error: any) {
       const errMsg = generalizedErrorMessage(error);
@@ -1127,7 +1174,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
       const aptosConfig = getAptosConfig(this._network, this._dappConfig);
       const signingMessage = new TextEncoder().encode(
-        response.args.fullMessage
+        response.args.fullMessage,
       );
       if ("verifySignatureAsync" in (this._account.publicKey as Object)) {
         return await this._account.publicKey.verifySignatureAsync({

package/src/constants.ts

@@ -29,6 +29,17 @@ export const APTOS_CONNECT_BASE_URL = "https://aptosconnect.app";
 /** The base URL for all Petra Web wallets. */
 export const PETRA_WEB_BASE_URL = "https://web.petra.app";
 
+/** The name of the generic wallet for Petra Web. */
+export const PETRA_WEB_GENERIC_WALLET_NAME = "Petra Web";
+
+/** The name of the Petra wallet. */
+export const PETRA_WALLET_NAME = "Petra";
+
+/** The default connection fallbacks for wallets that are not installed. */
+export const DEFAULT_WALLET_CONNECTION_FALLBACKS = {
+  [PETRA_WALLET_NAME]: PETRA_WEB_GENERIC_WALLET_NAME,
+};
+
 /**
  * The URL to the Aptos Connect account page if the user is signed in to Aptos Connect.
  *

package/src/sdkWallets.ts

@@ -1,5 +1,6 @@
 import {
   AptosConnectAppleWallet,
+  AptosConnectGenericWallet,
   AptosConnectGoogleWallet,
 } from "@aptos-connect/wallet-adapter-plugin";
 import { DappConfig, AdapterWallet } from "./WalletCore";
@@ -20,6 +21,11 @@ export function getSDKWallets(dappConfig?: DappConfig) {
         dappId: dappConfig?.aptosConnectDappId,
         ...dappConfig?.aptosConnect,
       }),
+      new AptosConnectGenericWallet({
+        network: dappConfig?.network,
+        dappId: dappConfig?.aptosConnectDappId,
+        ...dappConfig?.aptosConnect,
+      }),
     );
   }
 

package/src/utils/types.ts

@@ -30,6 +30,7 @@ export interface AptosStandardSupportedWallet {
 export type AvailableWallets =
   | "Continue with Apple"
   | "Continue with Google"
+  | "Petra Web"
   | "OKX Wallet"
   | "Petra"
   | "Nightly"

package/src/utils/walletSelector.ts

@@ -1,8 +1,9 @@
-import { WalletInfo } from "./types";
+import { AvailableWallets, WalletInfo } from "./types";
 import { AdapterNotDetectedWallet, AdapterWallet } from "../WalletCore";
 import {
   APTOS_CONNECT_BASE_URL,
   PETRA_WEB_BASE_URL,
+  PETRA_WEB_GENERIC_WALLET_NAME,
   WalletReadyState,
 } from "../constants";
 import { isRedirectable } from "./helpers";
@@ -15,15 +16,18 @@ import { isRedirectable } from "./helpers";
 export function partitionWallets(
   wallets: ReadonlyArray<AdapterWallet | AdapterNotDetectedWallet>,
   partitionFunction: (
-    wallet: AdapterWallet | AdapterNotDetectedWallet,
-  ) => boolean = isInstalledOrLoadable,
+    wallet: AdapterWallet | AdapterNotDetectedWallet
+  ) => boolean = isInstalledOrLoadable
 ) {
   const defaultWallets: Array<AdapterWallet> = [];
   const moreWallets: Array<AdapterNotDetectedWallet> = [];
 
   for (const wallet of wallets) {
-    if (partitionFunction(wallet)) defaultWallets.push(wallet as AdapterWallet);
-    else moreWallets.push(wallet as AdapterNotDetectedWallet);
+    if (partitionFunction(wallet)) {
+      defaultWallets.push(wallet as AdapterWallet);
+    } else {
+      moreWallets.push(wallet as AdapterNotDetectedWallet);
+    }
   }
 
   return { defaultWallets, moreWallets };
@@ -31,8 +35,8 @@ export function partitionWallets(
 
 /** Returns true if the wallet is installed or loadable. */
 export function isInstalledOrLoadable(
-  wallet: AdapterWallet | AdapterNotDetectedWallet,
-) {
+  wallet: AdapterWallet | AdapterNotDetectedWallet
+): wallet is AdapterWallet {
   return wallet.readyState === WalletReadyState.Installed;
 }
 
@@ -41,7 +45,7 @@ export function isInstalledOrLoadable(
  * This can be used to decide whether to show a "Connect" button or "Install" link in the UI.
  */
 export function isInstallRequired(
-  wallet: AdapterWallet | AdapterNotDetectedWallet,
+  wallet: AdapterWallet | AdapterNotDetectedWallet
 ) {
   const isWalletReady = isInstalledOrLoadable(wallet);
   const isMobile = !isWalletReady && isRedirectable();
@@ -49,6 +53,16 @@ export function isInstallRequired(
   return !isMobile && !isWalletReady;
 }
 
+export function shouldUseFallbackWallet(
+  wallet: AdapterWallet | AdapterNotDetectedWallet
+): boolean {
+  return (
+    !!wallet.fallbackWallet &&
+    isInstallRequired(wallet) &&
+    isInstalledOrLoadable(wallet.fallbackWallet)
+  );
+}
+
 /** Truncates the provided wallet address at the middle with an ellipsis. */
 export function truncateAddress(address: string | undefined) {
   if (!address) return;
@@ -64,15 +78,28 @@ export function isAptosConnectWallet(wallet: WalletInfo | AdapterWallet) {
   return isPetraWebWallet(wallet);
 }
 
-/** Returns `true` if the provided wallet is a Petra Web wallet. */
-export function isPetraWebWallet(wallet: WalletInfo | AdapterWallet) {
+/** Returns `true` if the provided wallet is a Petra Web wallet. This will automatically exclude the generic wallet. */
+export function isPetraWebWallet(
+  wallet: WalletInfo | AdapterWallet,
+  ignoreGenericWallet: boolean = true
+) {
   if (!wallet.url) return false;
+  if (ignoreGenericWallet && isPetraWebGenericWallet(wallet)) {
+    return false;
+  }
   return (
     wallet.url.startsWith(APTOS_CONNECT_BASE_URL) ||
     wallet.url.startsWith(PETRA_WEB_BASE_URL)
   );
 }
 
+/** Returns true if the wallet is a generic wallet. */
+export function isPetraWebGenericWallet(
+  wallet: AdapterWallet | AdapterNotDetectedWallet | WalletInfo
+) {
+  return wallet.name === PETRA_WEB_GENERIC_WALLET_NAME;
+}
+
 /**
  * Partitions the `wallets` array so that Aptos Connect wallets are grouped separately from the rest.
  * Petra Web is a web wallet that uses social login to create accounts on the blockchain.
@@ -80,13 +107,16 @@ export function isPetraWebWallet(wallet: WalletInfo | AdapterWallet) {
  * @deprecated Use {@link getPetraWebWallets} instead.
  */
 export function getAptosConnectWallets(
-  wallets: ReadonlyArray<AdapterWallet | AdapterNotDetectedWallet>,
+  wallets: ReadonlyArray<AdapterWallet | AdapterNotDetectedWallet>
 ) {
   const { defaultWallets, moreWallets } = partitionWallets(
     wallets,
-    isAptosConnectWallet,
+    isAptosConnectWallet
   );
-  return { aptosConnectWallets: defaultWallets, otherWallets: moreWallets };
+  return {
+    aptosConnectWallets: defaultWallets,
+    otherWallets: moreWallets,
+  };
 }
 
 /**
@@ -94,13 +124,16 @@ export function getAptosConnectWallets(
  * Petra Web is a web wallet that uses social login to create accounts on the blockchain.
  */
 export function getPetraWebWallets(
-  wallets: ReadonlyArray<AdapterWallet | AdapterNotDetectedWallet>,
+  wallets: ReadonlyArray<AdapterWallet | AdapterNotDetectedWallet>
 ) {
   const { defaultWallets, moreWallets } = partitionWallets(
     wallets,
-    isPetraWebWallet,
+    isPetraWebWallet
   );
-  return { petraWebWallets: defaultWallets, otherWallets: moreWallets };
+  return {
+    petraWebWallets: defaultWallets,
+    otherWallets: moreWallets,
+  };
 }
 
 export interface WalletSortingOptions {
@@ -115,13 +148,31 @@ export interface WalletSortingOptions {
   /** An optional function for sorting wallets that are currently installed or loadable. */
   sortAvailableWallets?: (
     a: AdapterWallet | AdapterNotDetectedWallet,
-    b: AdapterWallet | AdapterNotDetectedWallet,
+    b: AdapterWallet | AdapterNotDetectedWallet
   ) => number;
   /** An optional function for sorting wallets that are NOT currently installed or loadable. */
   sortInstallableWallets?: (
     a: AdapterWallet | AdapterNotDetectedWallet,
-    b: AdapterWallet | AdapterNotDetectedWallet,
+    b: AdapterWallet | AdapterNotDetectedWallet
   ) => number;
+  /**
+   * A map of wallet names to fallback wallet names.
+   * If a wallet is not installed and has a fallback wallet that IS installed,
+   * the fallback wallet will be attached to the not-installed wallet and it will
+   * be moved to the available wallets list.
+   *
+   * @example
+   * ```ts
+   * // Override the default fallbacks
+   * fallbacks: { connections: { "Petra": "Petra Web", "OtherWallet": "OtherFallback" } }
+   * ```
+   */
+  fallbacks?: {
+    /** A map of wallet names to fallback wallet names. */
+    connections: Record<string | AvailableWallets, string | AvailableWallets>;
+    /** An optional array of wallets that are available but not intended for display. These wallets will only be shown if there is logic to explicitly show them (e.g. `fallbacks`) */
+    additionalFallbackWallets?: ReadonlyArray<AdapterWallet>;
+  };
 }
 
 /**
@@ -134,6 +185,8 @@ export interface WalletSortingOptions {
  *
  * `availableWallets` - Wallets that are currently installed or loadable by the client.
  *
+ * `availableWalletsWithFallbacks` - Wallets that are currently uninstalled that have a fallback wallet.
+ *
  * `installableWallets` - Wallets that are NOT current installed or loadable and
  * require the client to install a browser extension first.
  *
@@ -141,12 +194,54 @@ export interface WalletSortingOptions {
  */
 export function groupAndSortWallets(
   wallets: ReadonlyArray<AdapterWallet | AdapterNotDetectedWallet>,
-  options?: WalletSortingOptions,
+  options?: WalletSortingOptions
 ) {
+  const {
+    fallbacks: {
+      connections: fallbackConnections,
+      additionalFallbackWallets,
+    } = {},
+  } = options ?? {};
   const { aptosConnectWallets } = getAptosConnectWallets(wallets);
   const { otherWallets, petraWebWallets } = getPetraWebWallets(wallets);
   const { defaultWallets, moreWallets } = partitionWallets(otherWallets);
 
+  // Attach fallback wallets to not-installed wallets and move them to available wallets if the fallback is installed
+  // TODO: Deprecate this and combine this with `availableWallets` in the next major version.
+  const availableWalletsWithFallbacks: Array<
+    AdapterWallet | AdapterNotDetectedWallet
+  > = [];
+
+  if (fallbackConnections && Object.keys(fallbackConnections).length > 0) {
+    for (let i = moreWallets.length - 1; i >= 0; i--) {
+      const wallet = moreWallets[i];
+      const fallbackName = fallbackConnections[wallet.name];
+
+      if (fallbackName) {
+        const fallbackWallet = [
+          ...wallets,
+          ...(additionalFallbackWallets ?? []),
+        ].find((w) => w.name === fallbackName && isInstalledOrLoadable(w)) as
+          | AdapterWallet
+          | undefined;
+
+        // If we found an installed fallback, attach it and move to available wallets
+        if (fallbackWallet) {
+          const walletWithFallback: AdapterNotDetectedWallet = {
+            ...wallet,
+            fallbackWallet,
+          };
+
+          // Remove from installable wallets
+          moreWallets.splice(i, 1);
+
+          // Add to the list to be added to available wallets
+          availableWalletsWithFallbacks.push(walletWithFallback);
+        }
+      }
+    }
+  }
+
   if (options?.sortAptosConnectWallets) {
     aptosConnectWallets.sort(options.sortAptosConnectWallets);
   }
@@ -167,6 +262,8 @@ export function groupAndSortWallets(
     petraWebWallets,
     /** Wallets that are currently installed or loadable. */
     availableWallets: defaultWallets,
+    /** Wallets that are currently uninstalled that have a fallback wallet. */
+    availableWalletsWithFallbacks,
     /** Wallets that are NOT currently installed or loadable. */
     installableWallets: moreWallets,
   };

package/src/version.ts

@@ -1 +1 @@
-export const WALLET_ADAPTER_CORE_VERSION = "8.0.0-xchaininit2.0";
+export const WALLET_ADAPTER_CORE_VERSION = "8.0.0";

package/dist/CrossChainCore.d.ts

@@ -1,28 +0,0 @@
-import { SolanaWallet } from "@xlabs-libs/wallet-aggregator-solana";
-import { Eip6963Wallet } from "@xlabs-libs/wallet-aggregator-evm";
-import { routes } from "@wormhole-foundation/sdk";
-import { Wallet as WalletAggregator } from "@xlabs-libs/wallet-aggregator-core";
-import { Network } from "@aptos-labs/ts-sdk";
-export { SolanaWallet, Eip6963Wallet, WalletAggregator };
-export interface CrossChainDappConfig {
-    network: Network;
-    aptosGasStationKeys?: Partial<Record<Network, string>>;
-    disableTelemetry?: boolean;
-}
-export declare class CrossChainCore {
-    private _solana_wallets;
-    private _ethereum_wallets;
-    private _dappConfig;
-    private _cctpProviders;
-    private _originChainSelected;
-    private _connectedWallet;
-    constructor(args: {
-        dappConfig: CrossChainDappConfig;
-    });
-    private fetchSolanaWallets;
-    private fetchEthereumWallets;
-    get solanaWallets(): ReadonlyArray<SolanaWallet>;
-    get ethereumWallets(): ReadonlyArray<Eip6963Wallet>;
-    getWormholeCctpRoute(): Promise<routes.Route<"Mainnet" | "Testnet", routes.Options, routes.ValidatedTransferParams<routes.Options>, routes.Receipt<import("@wormhole-foundation/sdk/dist/cjs").AttestationReceipt<keyof import("@wormhole-foundation/sdk/dist/cjs").WormholeRegistry.ProtocolToInterfaceMapping<"Mainnet" | "Testnet" | "Devnet", "Ethereum" | "Solana" | "Aptos" | "Avalanche" | "Sepolia" | "Btc" | "Algorand" | "Sui" | "Near" | "Terra" | "Bsc" | "Polygon" | "Oasis" | "Aurora" | "Fantom" | "Karura" | "Acala" | "Klaytn" | "Celo" | "Moonbeam" | "Neon" | "Terra2" | "Injective" | "Osmosis" | "Arbitrum" | "Optimism" | "Gnosis" | "Pythnet" | "Xpla" | "Base" | "Sei" | "Rootstock" | "Scroll" | "Mantle" | "Blast" | "Xlayer" | "Linea" | "Berachain" | "Seievm" | "Snaxchain" | "Unichain" | "Worldchain" | "Ink" | "HyperEVM" | "Monad" | "Wormchain" | "Cosmoshub" | "Evmos" | "Kujira" | "Neutron" | "Celestia" | "Stargaze" | "Seda" | "Dymension" | "Provenance" | "Noble" | "ArbitrumSepolia" | "BaseSepolia" | "OptimismSepolia" | "Holesky" | "PolygonSepolia">>>>>;
-}
-//# sourceMappingURL=CrossChainCore.d.ts.map