@aptos-labs/wallet-adapter-core 4.23.1 → 4.25.0

package/src/WalletCore.ts

@@ -174,7 +174,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     plugins: ReadonlyArray<Wallet>,
     optInWallets: ReadonlyArray<AvailableWallets>,
     dappConfig?: DappConfig,
-    disableTelemetry?: boolean
+    disableTelemetry?: boolean,
   ) {
     super();
 
@@ -207,7 +207,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       // new standard version installed. Pontem uses "Pontem" wallet name for previous versions and
       // "Pontem Wallet" with new version
       const existingStandardPontemWallet = this._standard_wallets.find(
-        (wallet) => wallet.name == "Pontem Wallet"
+        (wallet) => wallet.name == "Pontem Wallet",
       );
       if (wallet.name === "Pontem" && existingStandardPontemWallet) {
         return;
@@ -219,7 +219,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
        * include the plugin wallet (i.e npm package)
        */
       const existingWalletIndex = this._standard_wallets.findIndex(
-        (standardWallet) => standardWallet.name == wallet.name
+        (standardWallet) => standardWallet.name == wallet.name,
       );
       if (existingWalletIndex !== -1) return;
 
@@ -274,7 +274,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     aptosStandardSupportedWalletList.map((supportedWallet) => {
       // Check if we already have this wallet as an installed plugin
       const existingPluginWalletIndex = this.wallets.findIndex(
-        (wallet) => wallet.name === supportedWallet.name
+        (wallet) => wallet.name === supportedWallet.name,
       );
 
       // If the plugin wallet is installed, dont append and dont show it on the selector modal
@@ -285,7 +285,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       // new standard version installed. Pontem uses "Pontem" wallet name for previous versions and
       // "Pontem Wallet" with new version
       const existingStandardPontemWallet = this.wallets.find(
-        (wallet) => wallet.name == "Pontem"
+        (wallet) => wallet.name == "Pontem",
       );
       if (
         supportedWallet.name === "Pontem Wallet" &&
@@ -296,7 +296,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
       // Check if we already have this wallet as a AIP-62 wallet standard
       const existingStandardWallet = this._standard_wallets.find(
-        (wallet) => wallet.name == supportedWallet.name
+        (wallet) => wallet.name == supportedWallet.name,
       );
 
       // If AIP-62 wallet detected but it is excluded by the dapp, dont add it to the wallets array
@@ -334,7 +334,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     // Twallet SDK fires a register event so the adapter assumes it is an extension wallet
     // so filter out t wallet, remove it when twallet fixes it
     const wallets = extensionwWallets.filter(
-      (wallet) => wallet.name !== "Dev T wallet" && wallet.name !== "T wallet"
+      (wallet) => wallet.name !== "Dev T wallet" && wallet.name !== "T wallet",
     );
 
     wallets.map((wallet: AptosStandardWallet) => {
@@ -392,7 +392,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @param standardWallet An AIP-62 standard compatible wallet
    */
   private standardizeStandardWalletToPluginWalletType = (
-    standardWallet: AptosStandardWallet
+    standardWallet: AptosStandardWallet,
   ) => {
     let standardWalletConvertedToWallet: Wallet = {
       name: standardWallet.name as WalletName,
@@ -425,7 +425,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
     // Remove optional duplications in the _all_wallets array
     this._all_wallets = this._all_wallets.filter(
-      (item) => item.name !== standardWalletConvertedToWallet.name
+      (item) => item.name !== standardWalletConvertedToWallet.name,
     );
     this._all_wallets.push(standardWalletConvertedToWallet);
 
@@ -467,7 +467,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;
@@ -553,7 +553,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       | AccountInfo
       | StandardAccountInfo
       | UserResponse<StandardAccountInfo>
-      | null
+      | null,
   ): void {
     if (account === null) {
       this._account = null;
@@ -722,7 +722,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     const allDetectedWallets = this._all_wallets as Array<Wallet>;
 
     const selectedWallet = allDetectedWallets.find(
-      (wallet: Wallet) => wallet.name === walletName
+      (wallet: Wallet) => wallet.name === walletName,
     );
     if (!selectedWallet) return;
 
@@ -731,7 +731,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;
     }
 
@@ -741,11 +741,24 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       isRedirectable() &&
       selectedWallet.readyState !== WalletReadyState.Installed
     ) {
-      // use wallet deep link
-      if (selectedWallet.isAIP62Standard && selectedWallet.openInMobileApp) {
-        selectedWallet.openInMobileApp();
-        return;
+      // If wallet is AIP-62 compatible
+      if (selectedWallet.isAIP62Standard) {
+        // If wallet has a openInMobileApp method, use it
+        if (selectedWallet.openInMobileApp) {
+          selectedWallet.openInMobileApp();
+          return;
+        }
+        // If wallet has a deeplinkProvider property, i.e wallet is on the internal registry, use it
+        const uninstalledWallet =
+          selectedWallet as AptosStandardSupportedWallet;
+        if (uninstalledWallet.deeplinkProvider) {
+          const url = encodeURIComponent(window.location.href);
+          const location = uninstalledWallet.deeplinkProvider.concat(url);
+          window.location.href = location;
+          return;
+        }
       }
+      // Wallet is on the old standard, check if it has a deeplinkProvider method property
       if (selectedWallet.deeplinkProvider) {
         const url = encodeURIComponent(window.location.href);
         const location = selectedWallet.deeplinkProvider({ url });
@@ -830,7 +843,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @returns The pending transaction hash (V1 output) | PendingTransactionResponse (V2 output)
    */
   async signAndSubmitTransaction(
-    transactionInput: InputTransactionData
+    transactionInput: InputTransactionData,
   ): Promise<
     { hash: Types.HexEncodedBytes; output?: any } | PendingTransactionResponse
   > {
@@ -872,7 +885,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
               aptos,
               this._account,
               this._wallet,
-              this._standard_wallets
+              this._standard_wallets,
             );
           return { hash, output };
         } else {
@@ -883,7 +896,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
               this._network,
               this._wallet,
               transactionInput,
-              this._dappConfig
+              this._dappConfig,
             );
           return { hash, output };
         }
@@ -924,7 +937,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   async signTransaction(
     transactionOrPayload: AnyRawTransaction | Types.TransactionPayload,
     asFeePayer?: boolean,
-    options?: InputGenerateTransactionOptions
+    options?: InputGenerateTransactionOptions,
   ): Promise<AccountAuthenticator> {
     try {
       this.ensureWalletExists(this._wallet);
@@ -941,7 +954,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
             return await this.walletStandardCore.signTransaction(
               transactionOrPayload,
               this._wallet,
-              asFeePayer
+              asFeePayer,
             );
           } else if (this._wallet.isSignTransactionV1_1) {
             // This wallet is AIP-62 compliant and supports transaction inputs
@@ -966,7 +979,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
                     ? { address: AccountAddress.from(optionsV1.sender) }
                     : undefined,
                 },
-                this._wallet
+                this._wallet,
               );
             return authenticator;
           } else {
@@ -975,7 +988,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
             const sender = this._account.address;
             const payload = await generateTransactionPayloadFromV1Input(
               aptosConfig,
-              transactionOrPayload
+              transactionOrPayload,
             );
             const optionsV1 = options as CompatibleTransactionOptions;
             const optionsV2 = {
@@ -996,7 +1009,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
             return await this.walletStandardCore.signTransaction(
               new SimpleTransaction(rawTransaction),
               this._wallet,
-              false
+              false,
             );
           }
         }
@@ -1007,7 +1020,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
         if ("rawTransaction" in transactionOrPayload) {
           const accountAuthenticator = (await this._wallet.signTransaction(
             transactionOrPayload,
-            asFeePayer
+            asFeePayer,
           )) as AccountAuthenticator;
 
           return accountAuthenticator;
@@ -1022,7 +1035,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
               gas_unit_price: options?.gasUnitPrice
                 ? BigInt(options?.gasUnitPrice)
                 : undefined,
-            }
+            },
           );
 
           if (!response) {
@@ -1041,7 +1054,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
           const accountAuthenticator = new AccountAuthenticatorEd25519(
             new Ed25519PublicKey(publicKey),
-            new Ed25519Signature(signature)
+            new Ed25519Signature(signature),
           );
           return accountAuthenticator;
         }
@@ -1049,7 +1062,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
       // If we are here it means this wallet does not support signTransaction
       throw new WalletNotSupportedMethod(
-        `Sign Transaction is not supported by ${this.wallet?.name}`
+        `Sign Transaction is not supported by ${this.wallet?.name}`,
       ).message;
     } catch (error: any) {
       const errMsg = generalizedErrorMessage(error);
@@ -1086,7 +1099,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @returns PendingTransactionResponse
    */
   async submitTransaction(
-    transaction: InputSubmitTransactionData
+    transaction: InputSubmitTransactionData,
   ): Promise<PendingTransactionResponse> {
     try {
       this.ensureWalletExists(this._wallet);
@@ -1139,7 +1152,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);
@@ -1160,7 +1173,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);
@@ -1198,7 +1211,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
         return response.args;
       }
       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);
@@ -1220,14 +1233,14 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       if (this._wallet.isAIP62Standard) {
         return this.walletStandardCore.signMessageAndVerify(
           message,
-          this._wallet
+          this._wallet,
         );
       }
 
       return await this.walletCoreV1.signMessageAndVerify(
         message,
         this._wallet,
-        this._account
+        this._account,
       );
     } catch (error: any) {
       const errMsg = generalizedErrorMessage(error);

package/src/ga/index.ts

@@ -21,7 +21,7 @@ export class GA4 {
 
     myScript.setAttribute(
       "src",
-      `https://www.googletagmanager.com/gtag/js?id=${gaID}`
+      `https://www.googletagmanager.com/gtag/js?id=${gaID}`,
     );
 
     const that = this;

package/src/utils/helpers.ts

@@ -19,17 +19,17 @@ import { WalletSignAndSubmitMessageError } from "../error";
 
 export function isMobile(): boolean {
   return /Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-Accelerated|(hpw|web)OS|Fennec|Minimo|Opera M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune/i.test(
-    navigator.userAgent
+    navigator.userAgent,
   );
 }
 
 export function isInAppBrowser(): boolean {
   const isIphone = /(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(
-    navigator.userAgent
+    navigator.userAgent,
   );
 
   const isAndroid = /(Android).*Version\/[\d.]+.*Chrome\/[^\s]+ Mobile/i.test(
-    navigator.userAgent
+    navigator.userAgent,
   );
 
   return isIphone || isAndroid;
@@ -55,14 +55,14 @@ export function generalizedErrorMessage(error: any): string {
 // Serializable, so if each argument is of an instance of a class
 // the extends Serializable - we know these are BCS arguments
 export const areBCSArguments = (
-  args: Array<EntryFunctionArgumentTypes | SimpleEntryFunctionArgumentTypes>
+  args: Array<EntryFunctionArgumentTypes | SimpleEntryFunctionArgumentTypes>,
 ): boolean => {
   // `every` returns true if the array is empty, so
   // first check the array length
   if (args.length === 0) return false;
   return args.every(
     (arg: EntryFunctionArgumentTypes | SimpleEntryFunctionArgumentTypes) =>
-      arg instanceof Serializable
+      arg instanceof Serializable,
   );
 };
 
@@ -75,7 +75,7 @@ export const areBCSArguments = (
  */
 export const getAptosConfig = (
   networkInfo: NetworkInfo | StandardNetworkInfo | null,
-  dappConfig: DappConfig | undefined
+  dappConfig: DappConfig | undefined,
 ): AptosConfig => {
   if (!networkInfo) {
     throw new Error("Undefined network");
@@ -97,10 +97,10 @@ export const getAptosConfig = (
     });
   }
 
-  return new AptosConfig({
-    network: Network.CUSTOM,
-    fullnode: networkInfo.url,
-  });
+  // Custom networks are not supported, please ensure that the wallet is returning the appropriate network Mainnet, Testnet, Devnet, Local
+  throw new Error(
+    "Invalid network, custom network not supported with Aptos wallet adapter to prevent user from using an unexpected network.",
+  );
 };
 
 /**
@@ -110,7 +110,7 @@ export const getAptosConfig = (
  * @returns boolean
  */
 export const isAptosNetwork = (
-  networkInfo: NetworkInfo | StandardNetworkInfo | null
+  networkInfo: NetworkInfo | StandardNetworkInfo | null,
 ): boolean => {
   if (!networkInfo) {
     throw new Error("Undefined network");
@@ -140,7 +140,7 @@ export const fetchDevnetChainId = async (): Promise<number> => {
  * as a string, this function converts the string to Uint8Array.
  */
 export const handlePublishPackageTransaction = (
-  transactionInput: InputTransactionData
+  transactionInput: InputTransactionData,
 ) => {
   // convert the first argument, metadataBytes, to uint8array if is a string
   let metadataBytes = transactionInput.data.functionArguments[0];
@@ -159,7 +159,7 @@ export const handlePublishPackageTransaction = (
     });
   } else {
     throw new WalletSignAndSubmitMessageError(
-      "The bytecode argument must be an array."
+      "The bytecode argument must be an array.",
     ).message;
   }
 

package/src/utils/scopePollingDetectionStrategy.ts

@@ -28,7 +28,7 @@ export function scopePollingDetectionStrategy(detect: () => boolean): void {
       once: true,
     });
     disposers.push(() =>
-      document.removeEventListener("DOMContentLoaded", detectAndDispose)
+      document.removeEventListener("DOMContentLoaded", detectAndDispose),
     );
   }
 

package/src/utils/walletSelector.ts

@@ -11,7 +11,9 @@ import { isRedirectable } from "./helpers";
  */
 export function partitionWallets(
   wallets: ReadonlyArray<AnyAptosWallet>,
-  partitionFunction: (wallet: AnyAptosWallet) => boolean = isInstalledOrLoadable
+  partitionFunction: (
+    wallet: AnyAptosWallet,
+  ) => boolean = isInstalledOrLoadable,
 ) {
   const defaultWallets: Array<AnyAptosWallet> = [];
   const moreWallets: Array<AnyAptosWallet> = [];
@@ -51,7 +53,7 @@ export function truncateAddress(address: string | undefined) {
 
 /** Returns `true` if the provided wallet is an Aptos Connect wallet. */
 export function isAptosConnectWallet(
-  wallet: WalletInfo | AnyAptosWallet | AptosStandardWallet
+  wallet: WalletInfo | AnyAptosWallet | AptosStandardWallet,
 ) {
   if (!wallet.url) return false;
   return wallet.url.startsWith(APTOS_CONNECT_BASE_URL);
@@ -64,7 +66,7 @@ export function isAptosConnectWallet(
 export function getAptosConnectWallets(wallets: ReadonlyArray<AnyAptosWallet>) {
   const { defaultWallets, moreWallets } = partitionWallets(
     wallets,
-    isAptosConnectWallet
+    isAptosConnectWallet,
   );
   return { aptosConnectWallets: defaultWallets, otherWallets: moreWallets };
 }
@@ -93,7 +95,7 @@ export interface WalletSortingOptions {
  */
 export function groupAndSortWallets(
   wallets: ReadonlyArray<AnyAptosWallet>,
-  options?: WalletSortingOptions
+  options?: WalletSortingOptions,
 ) {
   const { aptosConnectWallets, otherWallets } = getAptosConnectWallets(wallets);
   const { defaultWallets, moreWallets } = partitionWallets(otherWallets);

package/src/version.ts

@@ -1 +1 @@
-export const WALLET_ADAPTER_CORE_VERSION = "4.23.1";
+export const WALLET_ADAPTER_CORE_VERSION = "4.25.0";