@aptos-labs/wallet-adapter-core 5.4.1 → 5.4.2

package/dist/utils/helpers.d.ts

@@ -32,7 +32,7 @@ export declare const fetchDevnetChainId: () => Promise<number>;
  * as a string, this function converts the string to Uint8Array.
  */
 export declare const handlePublishPackageTransaction: (transactionInput: InputTransactionData) => {
-    metadataBytes: number | bigint | boolean | Uint8Array | import("@aptos-labs/ts-sdk/dist/common/accountAddress-5ltp27oM").g | import("@aptos-labs/ts-sdk").Bool | import("@aptos-labs/ts-sdk").U8 | import("@aptos-labs/ts-sdk").U16 | import("@aptos-labs/ts-sdk").U32 | import("@aptos-labs/ts-sdk").U64 | import("@aptos-labs/ts-sdk").U128 | import("@aptos-labs/ts-sdk").U256 | import("@aptos-labs/ts-sdk").MoveVector<import("@aptos-labs/ts-sdk").EntryFunctionArgumentTypes> | import("@aptos-labs/ts-sdk").MoveOption<import("@aptos-labs/ts-sdk").EntryFunctionArgumentTypes> | import("@aptos-labs/ts-sdk").MoveString | import("@aptos-labs/ts-sdk").FixedBytes | ArrayBuffer | (import("@aptos-labs/ts-sdk").EntryFunctionArgumentTypes | import("@aptos-labs/ts-sdk").SimpleEntryFunctionArgumentTypes)[] | import("@aptos-labs/ts-sdk").MoveVector<import("@aptos-labs/ts-sdk").ScriptFunctionArgumentTypes> | import("@aptos-labs/ts-sdk").Serialized | null | undefined;
+    metadataBytes: number | bigint | boolean | Uint8Array | import("@aptos-labs/ts-sdk/dist/common/accountAddress-D0xKX-UM").g | import("@aptos-labs/ts-sdk").Bool | import("@aptos-labs/ts-sdk").U8 | import("@aptos-labs/ts-sdk").U16 | import("@aptos-labs/ts-sdk").U32 | import("@aptos-labs/ts-sdk").U64 | import("@aptos-labs/ts-sdk").U128 | import("@aptos-labs/ts-sdk").U256 | import("@aptos-labs/ts-sdk").MoveVector<import("@aptos-labs/ts-sdk").EntryFunctionArgumentTypes> | import("@aptos-labs/ts-sdk").MoveOption<import("@aptos-labs/ts-sdk").EntryFunctionArgumentTypes> | import("@aptos-labs/ts-sdk").MoveString | import("@aptos-labs/ts-sdk").FixedBytes | ArrayBuffer | (import("@aptos-labs/ts-sdk").EntryFunctionArgumentTypes | import("@aptos-labs/ts-sdk").SimpleEntryFunctionArgumentTypes)[] | import("@aptos-labs/ts-sdk").MoveVector<import("@aptos-labs/ts-sdk").ScriptFunctionArgumentTypes> | import("@aptos-labs/ts-sdk").Serialized | null | undefined;
     byteCode: (import("@aptos-labs/ts-sdk").EntryFunctionArgumentTypes | import("@aptos-labs/ts-sdk").SimpleEntryFunctionArgumentTypes)[];
 };
 export declare function convertNetwork(networkInfo: NetworkInfo | null): Network;

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const WALLET_ADAPTER_CORE_VERSION = "5.4.1";
+export declare const WALLET_ADAPTER_CORE_VERSION = "5.4.2";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/wallet-adapter-core",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "description": "Aptos Wallet Adapter Core",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -50,7 +50,7 @@
     "tweetnacl": "^1.0.3"
   },
   "peerDependencies": {
-    "@aptos-labs/ts-sdk": "^1.38.0"
+    "@aptos-labs/ts-sdk": "^1.38.0 || ^2.0.0"
   },
   "files": [
     "dist",

package/src/WalletCore.ts

@@ -177,7 +177,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   constructor(
     optInWallets?: ReadonlyArray<AvailableWallets>,
     dappConfig?: DappConfig,
-    disableTelemetry?: boolean
+    disableTelemetry?: boolean,
   ) {
     super();
     this._optInWallets = optInWallets || [];
@@ -224,7 +224,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)) {
@@ -233,14 +233,14 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
       // Remove optional duplications in the _all_wallets array
       this._standard_wallets = this._standard_wallets.filter(
-        (item) => item.name !== wallet.name
+        (item) => item.name !== wallet.name,
       );
 
       const isValid = isWalletWithRequiredFeatureSet(wallet);
       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) {
@@ -280,7 +280,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     aptosStandardSupportedWalletList.map((supportedWallet) => {
       // 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
+        (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) {
@@ -334,7 +334,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;
@@ -349,7 +349,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;
@@ -500,7 +500,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) {
@@ -520,7 +520,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) return;
@@ -530,7 +530,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;
     }
 
@@ -563,7 +563,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) {
@@ -572,14 +572,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;
       }
 
@@ -605,7 +605,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;
@@ -656,7 +656,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @returns AptosSignAndSubmitTransactionOutput
    */
   async signAndSubmitTransaction(
-    transactionInput: InputTransactionData
+    transactionInput: InputTransactionData,
   ): Promise<AptosSignAndSubmitTransactionOutput> {
     try {
       if ("function" in transactionInput.data) {
@@ -698,7 +698,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
           });
 
           type AptosSignAndSubmitTransactionV1Method = (
-            transaction: AnyRawTransaction
+            transaction: AnyRawTransaction,
           ) => Promise<UserResponse<AptosSignAndSubmitTransactionOutput>>;
 
           const signAndSubmitTransactionMethod = this._wallet.features[
@@ -707,7 +707,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) {
@@ -800,7 +800,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")
@@ -836,7 +836,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")
@@ -862,7 +862,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")
@@ -889,7 +889,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @throws WalletSignMessageError
    */
   async signMessage(
-    message: AptosSignMessageInput
+    message: AptosSignMessageInput,
   ): Promise<AptosSignMessageOutput> {
     try {
       this.ensureWalletExists(this._wallet);
@@ -915,7 +915,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 {
@@ -961,7 +961,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);
@@ -982,7 +982,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);
@@ -1016,7 +1016,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")
@@ -1026,7 +1026,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);
@@ -1056,7 +1056,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/sdkWallets.ts

@@ -37,7 +37,7 @@ export function getSDKWallets(dappConfig?: DappConfig) {
           network: dappConfig.network as Network.MAINNET | Network.TESTNET,
           manifestURL: dappConfig.mizuwallet.manifestURL,
           appId: dappConfig.mizuwallet.appId,
-        })
+        }) as any // TODO: fix type mismatch
       );
     }
   }

package/src/utils/helpers.ts

@@ -16,17 +16,17 @@ import { InputTransactionData } from "./types";
 
 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;
@@ -56,7 +56,7 @@ export function generalizedErrorMessage(error: any): string {
  */
 export const getAptosConfig = (
   networkInfo: NetworkInfo | null,
-  dappConfig: DappConfig | undefined
+  dappConfig: DappConfig | undefined,
 ): AptosConfig => {
   if (!networkInfo) {
     throw new Error("Undefined network");
@@ -84,7 +84,7 @@ export const getAptosConfig = (
 
   if (networkInfo.url) {
     const isKnownNetwork = Object.values(knownNetworks).includes(
-      networkInfo.url
+      networkInfo.url,
     );
 
     if (isKnownNetwork) {
@@ -97,7 +97,7 @@ export const getAptosConfig = (
 
   // Custom networks are not supported, please ensure that the wallet is returning the appropriate network Mainnet, Testnet, Devnet, Local
   throw new Error(
-    `Invalid network, network ${networkInfo.name} not supported with Aptos wallet adapter to prevent user from using an unexpected network.`
+    `Invalid network, network ${networkInfo.name} not supported with Aptos wallet adapter to prevent user from using an unexpected network.`,
   );
 };
 
@@ -108,7 +108,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");
@@ -138,7 +138,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];
@@ -157,7 +157,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/walletSelector.ts

@@ -11,8 +11,8 @@ 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> = [];
@@ -27,7 +27,7 @@ export function partitionWallets(
 
 /** Returns true if the wallet is installed or loadable. */
 export function isInstalledOrLoadable(
-  wallet: AdapterWallet | AdapterNotDetectedWallet
+  wallet: AdapterWallet | AdapterNotDetectedWallet,
 ) {
   return wallet.readyState === WalletReadyState.Installed;
 }
@@ -37,7 +37,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();
@@ -62,11 +62,11 @@ export function isAptosConnectWallet(wallet: WalletInfo | AdapterWallet) {
  * Aptos Connect is a web wallet that uses social login to create accounts on the blockchain.
  */
 export function getAptosConnectWallets(
-  wallets: ReadonlyArray<AdapterWallet | AdapterNotDetectedWallet>
+  wallets: ReadonlyArray<AdapterWallet | AdapterNotDetectedWallet>,
 ) {
   const { defaultWallets, moreWallets } = partitionWallets(
     wallets,
-    isAptosConnectWallet
+    isAptosConnectWallet,
   );
   return { aptosConnectWallets: defaultWallets, otherWallets: moreWallets };
 }
@@ -77,12 +77,12 @@ 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;
 }
 
@@ -101,7 +101,7 @@ export interface WalletSortingOptions {
  */
 export function groupAndSortWallets(
   wallets: ReadonlyArray<AdapterWallet | AdapterNotDetectedWallet>,
-  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 = "5.4.1";
+export const WALLET_ADAPTER_CORE_VERSION = "5.4.2";